diff options
| author | Turkesh Patel (Open ERP) <tpa@tinyerp.com> | 2013-09-02 16:28:24 +0530 |
|---|---|---|
| committer | Turkesh Patel (Open ERP) <tpa@tinyerp.com> | 2013-09-02 16:28:24 +0530 |
| commit | f4da7af78c2909cd09fbc534267a0aee89c3bb10 (patch) | |
| tree | 9080db14885cd178cce3926840775befc4e907f0 | |
| parent | 00711ec5bdd7df523196f3f5a2d712f47ccace9a (diff) | |
| parent | 4bc4547cb90f158d80ffb3275ae47fe2ead66192 (diff) | |
[MRG] l10n_us:solved issues of cot currency,l10n_ve: error at installation time,l10n_ma: default accunt issue from lp:~openerp-dev/openobject-addons/trunk-coa-issues-bde
bzr revid: tpa@tinyerp.com-20130902105824-xl1pmd3w7h2pernw
| -rw-r--r-- | addons/account/account.py | 3 | ||||
| -rw-r--r-- | addons/l10n_ma/l10n_ma_tax.xml | 3 | ||||
| -rw-r--r-- | addons/l10n_us/l10n_us_wizard.xml | 7 | ||||
| -rw-r--r-- | addons/l10n_ve/data/account_tax.xml | 17 |
4 files changed, 13 insertions, 17 deletions
diff --git a/addons/account/account.py b/addons/account/account.py index 4773547df30..c298a15646b 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -3030,6 +3030,9 @@ class wizard_multi_charts_accounts(osv.osv_memory): } def onchange_company_id(self, cr, uid, ids, company_id, context=None): + if context.get('default_currency_id', False): + dummy, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', context.get('default_currency_id')) + return {'value': {'currency_id': view_id}} currency_id = False if company_id: currency_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.id diff --git a/addons/l10n_ma/l10n_ma_tax.xml b/addons/l10n_ma/l10n_ma_tax.xml index 070d2d4fc9b..f296b22edca 100644 --- a/addons/l10n_ma/l10n_ma_tax.xml +++ b/addons/l10n_ma/l10n_ma_tax.xml @@ -742,7 +742,8 @@ <field name="account_root_id" ref="pcg_0"/> <field name="tax_code_root_id" ref="vat_ma_tax_root"/> <field name="bank_account_view_id" ref="pcg_514"/> - + <field name="property_account_receivable" ref="pcg_3488"/> + <field name="property_account_payable" ref="pcg_4488"/> </record> <record model="account.tax.template" id="tva_exo"> diff --git a/addons/l10n_us/l10n_us_wizard.xml b/addons/l10n_us/l10n_us_wizard.xml index 52aaa88fdab..9373935b22c 100644 --- a/addons/l10n_us/l10n_us_wizard.xml +++ b/addons/l10n_us/l10n_us_wizard.xml @@ -1,8 +1,13 @@ <openerp> <data noupdate="1"> + + <record id="account.action_wizard_multi_chart" model="ir.actions.act_window"> + <field name="context">{'default_currency_id': "USD"}</field> + </record> + <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo"> <field name="state">open</field> </record> - + </data> </openerp> diff --git a/addons/l10n_ve/data/account_tax.xml b/addons/l10n_ve/data/account_tax.xml index d28b0d1d8f3..7acbda3e2af 100644 --- a/addons/l10n_ve/data/account_tax.xml +++ b/addons/l10n_ve/data/account_tax.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data noupdate="1"> - <record id="tax0sale" model="account.tax.template"> + <record id="tax0all" model="account.tax.template"> <field name="chart_template_id" ref="ve_chart_template_amd"/> <field name="name">Exento</field> <field name="amount">0.00000</field> <field name="type">percent</field> - <field name="type_tax_use">sale</field> + <field name="type_tax_use">all</field> <field name="collected_id" ref="account_activa_account_2172003"/> <field name="paid_id" ref="account_activa_account_2172003"/> <field name="base_code_id" ref="vat_code_base_due"/> @@ -54,19 +54,6 @@ <field name="ref_base_code_id" ref="vat_code_receivable_net"/> <field name="ref_tax_code_id" ref="vat_code_payable"/> </record> - <record id="tax0purchase" model="account.tax.template"> - <field name="chart_template_id" ref="ve_chart_template_amd"/> - <field name="name">Exento</field> - <field name="amount">0.00000</field> - <field name="type">percent</field> - <field name="type_tax_use">purchase</field> - <field name="collected_id" ref="account_activa_account_2172003"/> - <field name="paid_id" ref="account_activa_account_2172003"/> - <field name="base_code_id" ref="vat_code_base_due"/> - <field name="tax_code_id" ref="vat_code_due_tva"/> - <field name="ref_base_code_id" ref="vat_code_receivable_net"/> - <field name="ref_tax_code_id" ref="vat_code_payable"/> - </record> <record id="tax1purchase" model="account.tax.template"> <field name="chart_template_id" ref="ve_chart_template_amd"/> <field name="name">IVA (12.0%) compras</field> |