diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-09-12 15:15:46 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-09-12 15:15:46 +0200 |
| commit | eaba6bffb765828bbb36c54e40fd012cfdfd8b7e (patch) | |
| tree | 61ca018b00ecec2fdf1a7cc5a8dcd1ba51b47ba9 | |
| parent | ab7d8c4ccfa22e148a50c58dcae35fda48db5425 (diff) | |
| parent | 546a191f0a790415317c55f41e30ced88bfc143b (diff) | |
[FORWARD] Forward port of saas-1 branch until revision 8773 revid tde@openerp.com-20130912121059-k840pi4rwdzpez8g
Most of 7.0 commit about COAs (9434) has been discarded, because another fix has been implemented
for the trunk branch. This new fix will be merged right after this forward port
of 7.0 / saas-1 branch.
bzr revid: tde@openerp.com-20130912131546-2f8p23bwwcc7930c
| -rw-r--r-- | addons/account/account.py | 6 | ||||
| -rw-r--r-- | addons/account/account_view.xml | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/addons/account/account.py b/addons/account/account.py index 82957fc93d3..49bacbe13ee 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -3043,12 +3043,6 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete'), } - def onchange_company_id(self, cr, uid, ids, company_id, context=None): - currency_id = False - if company_id: - currency_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.id - return {'value': {'currency_id': currency_id}} - def onchange_tax_rate(self, cr, uid, ids, rate=False, context=None): return {'value': {'purchase_tax_rate': rate or False}} diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 4fae65917bf..ed2d88b7386 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2120,7 +2120,7 @@ <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/> </group> <group> - <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it --> + <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it --> <field name="currency_id" class="oe_inline"/> <field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/> <label for="sale_tax_rate" string="Sale Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/> |