Xavier Morel
9ebbfdac73
Fixes a large number of cases where strings are translated then
formatted, instead of letting `_()` do the formatting internally,
which allows it to recover from incorrect translations (missing,
broken, or extra placeholders).
Also
- removes translation markers entirely when there's nothing to
translate e.g. `_("%s - %s")` is not useful
- fixes a few messes which lead to only partial translatability
(DRY is generally a bad idea when translations are involved, even
more so when you don't make the variable part translatable)
- fixes a few nearby issues noticed at the same time
- replaces a few `"%s"` by `%r`, which should automatically quote
strings relatively appropriately
- fixes translated strings which use `\` to escape a newline (in order
to fill-paragraph): `\` escapes only the newline, if the
continuation string is indented this results in a bunch of spaces
ending in the string to translate, which is pretty garbage for the
translator, using implicit concatenation works much better
Note: some of the updates revert f-string parameters to %, because
babel (2.9) apparently has trouble with f-strings and blows up trying
to extract them.
Not in scope:
Helping translators fix translatable strings e.g. any translation
string with more than one placeholder probably should use keyword
placeholders
- Provides more context / data to the translator to make sense of the
sentence.
- Allows reordering the translated terms, which can be necessary
depending on the sentence and language.
closes odoo/odoo#139314
Related: odoo/enterprise#49311
Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
62 lines
3.5 KiB
Python
62 lines
3.5 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from odoo import models, fields, _
|
|
from odoo.tools.safe_eval import safe_eval
|
|
from odoo.exceptions import UserError
|
|
|
|
|
|
class AccountTaxPython(models.Model):
|
|
_inherit = "account.tax"
|
|
|
|
amount_type = fields.Selection(selection_add=[
|
|
('code', 'Python Code')
|
|
], ondelete={'code': lambda recs: recs.write({'amount_type': 'percent', 'active': False})})
|
|
|
|
python_compute = fields.Text(string='Python Code', default="result = price_unit * 0.10",
|
|
help="Compute the amount of the tax by setting the variable 'result'.\n\n"
|
|
":param base_amount: float, actual amount on which the tax is applied\n"
|
|
":param price_unit: float\n"
|
|
":param quantity: float\n"
|
|
":param company: res.company recordset singleton\n"
|
|
":param product: product.product recordset singleton or None\n"
|
|
":param partner: res.partner recordset singleton or None")
|
|
python_applicable = fields.Text(string='Applicable Code', default="result = True",
|
|
help="Determine if the tax will be applied by setting the variable 'result' to True or False.\n\n"
|
|
":param price_unit: float\n"
|
|
":param quantity: float\n"
|
|
":param company: res.company recordset singleton\n"
|
|
":param product: product.product recordset singleton or None\n"
|
|
":param partner: res.partner recordset singleton or None")
|
|
|
|
def _compute_amount(self, base_amount, price_unit, quantity=1.0, product=None, partner=None, fixed_multiplicator=1):
|
|
self.ensure_one()
|
|
if product and product._name == 'product.template':
|
|
product = product.product_variant_id
|
|
if self.amount_type == 'code':
|
|
company = self.env.company
|
|
localdict = {'base_amount': base_amount, 'price_unit':price_unit, 'quantity': quantity, 'product':product, 'partner':partner, 'company': company}
|
|
try:
|
|
safe_eval(self.python_compute, localdict, mode="exec", nocopy=True)
|
|
except Exception as e:
|
|
raise UserError(_("You entered invalid code %r in %r taxes\n\nError : %s", self.python_compute, self.name, e)) from e
|
|
return localdict['result']
|
|
return super(AccountTaxPython, self)._compute_amount(base_amount, price_unit, quantity, product, partner, fixed_multiplicator)
|
|
|
|
def compute_all(self, price_unit, currency=None, quantity=1.0, product=None, partner=None, is_refund=False, handle_price_include=True, include_caba_tags=False, fixed_multiplicator=1):
|
|
if product and product._name == 'product.template':
|
|
product = product.product_variant_id
|
|
|
|
def is_applicable_tax(tax, company=self.env.company):
|
|
if tax.amount_type == 'code':
|
|
localdict = {'price_unit': price_unit, 'quantity': quantity, 'product': product, 'partner': partner, 'company': company}
|
|
try:
|
|
safe_eval(tax.python_applicable, localdict, mode="exec", nocopy=True)
|
|
except Exception as e:
|
|
raise UserError(_("You entered invalid code %r in %r taxes\n\nError : %s", tax.python_applicable, tax.name, e)) from e
|
|
return localdict.get('result', False)
|
|
|
|
return True
|
|
|
|
return super(AccountTaxPython, self.filtered(is_applicable_tax)).compute_all(price_unit, currency, quantity, product, partner, is_refund=is_refund, handle_price_include=handle_price_include, include_caba_tags=include_caba_tags, fixed_multiplicator=fixed_multiplicator)
|