diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-07-22 16:29:42 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-07-22 16:29:42 +0200 |
| commit | 67366dfb5e31eba8bc883069eb59cc311d9e25c3 (patch) | |
| tree | d5eca575ce087c5cb57401fc2b5b4521522a9590 /addons/account_tax_python | |
| parent | 2cf91d16a5f844a2a3d5d22c025c180a6615bab8 (diff) | |
| parent | 8ac40acb0d9a234eb59e55c3bc8f1a9a75bc4469 (diff) | |
[MERGE] merge upstream branch.
Forward ports generates a lot of conflicts to resolve. Rebasing
(even with rerere) will force me to re-resolve most of the conflicts.
Diffstat (limited to 'addons/account_tax_python')
| -rw-r--r-- | addons/account_tax_python/account_tax_python.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/account_tax_python/account_tax_python.xml b/addons/account_tax_python/account_tax_python.xml index eaeabedfb11..94cb367fad4 100644 --- a/addons/account_tax_python/account_tax_python.xml +++ b/addons/account_tax_python/account_tax_python.xml @@ -7,7 +7,7 @@ <field name="inherit_id" ref="account.view_tax_form" /> <field name="arch" type="xml"> <xpath expr="//field[@name='children_tax_ids']" position="before"> - <group string="Tax Computation By Python Code" attrs="{'invisible': [('amount_type','!=','code')]}"> + <group attrs="{'invisible': [('amount_type','!=','code')]}"> <group> <field name="python_compute" attrs="{'required':[('amount_type','=','code')]}" /> </group> |