diff options
| author | fwi-odoo <fwi@odoo.com> | 2016-07-19 11:09:48 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2016-08-03 11:18:48 +0200 |
| commit | 3121ced650d7a45850ab24975085aad90f988841 (patch) | |
| tree | bb497d17d6fcee3f17aafe5ce2d298eaa698f552 /addons/account_tax_python | |
| parent | aeafbb75aa3e87259043d9117250547cea6f178b (diff) | |
[MIG] account_tax_python: remove openerp tag, add license, clean imports and lint spaces
Diffstat (limited to 'addons/account_tax_python')
| -rw-r--r-- | addons/account_tax_python/__init__.py | 2 | ||||
| -rw-r--r-- | addons/account_tax_python/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/account_tax_python/models/account_tax.py | 10 | ||||
| -rw-r--r-- | addons/account_tax_python/views/account_tax_views.xml | 6 |
4 files changed, 12 insertions, 8 deletions
diff --git a/addons/account_tax_python/__init__.py b/addons/account_tax_python/__init__.py index 89d26e2f597..81fc81d29c9 100644 --- a/addons/account_tax_python/__init__.py +++ b/addons/account_tax_python/__init__.py @@ -1,2 +1,4 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import models diff --git a/addons/account_tax_python/__openerp__.py b/addons/account_tax_python/__openerp__.py index a42f2ae97ec..7bf983c4cc4 100644 --- a/addons/account_tax_python/__openerp__.py +++ b/addons/account_tax_python/__openerp__.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + { 'name': "Define Taxes as Python Code", 'summary': """ diff --git a/addons/account_tax_python/models/account_tax.py b/addons/account_tax_python/models/account_tax.py index 57527de81f8..286d0e27969 100644 --- a/addons/account_tax_python/models/account_tax.py +++ b/addons/account_tax_python/models/account_tax.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import models, fields, api +from odoo.tools.safe_eval import safe_eval -from openerp import models, fields, api -from openerp.tools.safe_eval import safe_eval class AccountTaxPython(models.Model): _inherit = "account.tax" @@ -24,7 +26,6 @@ class AccountTaxPython(models.Model): ":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): self.ensure_one() if self.amount_type == 'code': @@ -39,7 +40,7 @@ class AccountTaxPython(models.Model): taxes = self.env['account.tax'] company = self.env.user.company_id for tax in self: - localdict = {'price_unit':price_unit, 'quantity': quantity, 'product':product, 'partner':partner, 'company': company} + localdict = {'price_unit': price_unit, 'quantity': quantity, 'product': product, 'partner': partner, 'company': company} safe_eval(tax.python_applicable, localdict, mode="exec", nocopy=True) if localdict.get('result', False): taxes += tax @@ -54,6 +55,7 @@ class AccountTaxPython(models.Model): recs = self.browse(cr, uid, ids, context=context) return AccountTaxPython.compute_all(recs, price_unit, currency, quantity, product, partner) + class AccountTaxTemplatePython(models.Model): _inherit = 'account.tax.template' diff --git a/addons/account_tax_python/views/account_tax_views.xml b/addons/account_tax_python/views/account_tax_views.xml index 94cb367fad4..7b9c70dcd64 100644 --- a/addons/account_tax_python/views/account_tax_views.xml +++ b/addons/account_tax_python/views/account_tax_views.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<openerp> - <data> +<odoo> <record id="view_tax_form_inherited" model="ir.ui.view"> <field name="name">account.tax.form.inherited</field> <field name="model">account.tax</field> @@ -18,5 +17,4 @@ </xpath> </field> </record> - </data> -</openerp> +</odoo> |