diff --git a/addons/account/account.py b/addons/account/account.py
index 33b52b643ed..3a5e2f12cfc 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
@@ -3067,6 +3070,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
res.update({'company_id': self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0].company_id.id})
if 'currency_id' in fields:
company_id = res.get('company_id') or False
+
if company_id:
company_obj = self.pool.get('res.company')
country_id = company_obj.browse(cr, uid, company_id, context=context).country_id.id
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index b03babc63ac..79557b3f406 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -51,6 +51,6 @@
3
automatic
-
+
diff --git a/addons/l10n_ar/l10n_ar_wizard.xml b/addons/l10n_ar/l10n_ar_wizard.xml
index 82e7671b4d3..f21b5cd8c11 100644
--- a/addons/l10n_ar/l10n_ar_wizard.xml
+++ b/addons/l10n_ar/l10n_ar_wizard.xml
@@ -2,9 +2,13 @@
-
- open
-
+
+ open
+
+
+
+ done
+
diff --git a/addons/l10n_at/l10n_chart_at_wizard.xml b/addons/l10n_at/l10n_chart_at_wizard.xml
index 19d27fb47c7..350ea995edc 100644
--- a/addons/l10n_at/l10n_chart_at_wizard.xml
+++ b/addons/l10n_at/l10n_chart_at_wizard.xml
@@ -1,9 +1,13 @@
-
- open
-
+
+ open
+
+
+
+ done
+
diff --git a/addons/l10n_be/wizard/account_wizard.xml b/addons/l10n_be/wizard/account_wizard.xml
index dde7a77516a..27785c1b6cf 100644
--- a/addons/l10n_be/wizard/account_wizard.xml
+++ b/addons/l10n_be/wizard/account_wizard.xml
@@ -1,7 +1,13 @@
-
- open
-
+
+
+ open
+
+
+
+ done
+
+
diff --git a/addons/l10n_bo/l10n_bo_wizard.xml b/addons/l10n_bo/l10n_bo_wizard.xml
index 4de61247b90..cc2f17058ff 100644
--- a/addons/l10n_bo/l10n_bo_wizard.xml
+++ b/addons/l10n_bo/l10n_bo_wizard.xml
@@ -2,9 +2,13 @@
-
- open
-
+
+ open
+
+
+
+ done
+
diff --git a/addons/l10n_br/l10n_br_wizard.xml b/addons/l10n_br/l10n_br_wizard.xml
index 748b8913660..5988a2ccd40 100644
--- a/addons/l10n_br/l10n_br_wizard.xml
+++ b/addons/l10n_br/l10n_br_wizard.xml
@@ -1,8 +1,14 @@
-
- open
-
+
+
+ open
+
+
+
+ done
+
+
\ No newline at end of file
diff --git a/addons/l10n_ca/l10n_ca_wizard.xml b/addons/l10n_ca/l10n_ca_wizard.xml
index 19d27fb47c7..007f2badc7a 100644
--- a/addons/l10n_ca/l10n_ca_wizard.xml
+++ b/addons/l10n_ca/l10n_ca_wizard.xml
@@ -4,6 +4,10 @@
open
-
+
+
+ done
+
+
diff --git a/addons/l10n_ch/wizard.xml b/addons/l10n_ch/wizard.xml
index dde7a77516a..8247cf51cc0 100644
--- a/addons/l10n_ch/wizard.xml
+++ b/addons/l10n_ch/wizard.xml
@@ -1,7 +1,13 @@
+
open
+
+
+ done
+
+
diff --git a/addons/l10n_cl/l10n_cl_wizard.xml b/addons/l10n_cl/l10n_cl_wizard.xml
index 704ac4daf38..f05a8d4d664 100644
--- a/addons/l10n_cl/l10n_cl_wizard.xml
+++ b/addons/l10n_cl/l10n_cl_wizard.xml
@@ -1,9 +1,14 @@
+
open
-
+
+
+ done
+
+
diff --git a/addons/l10n_cn/l10n_chart_cn_wizard.xml b/addons/l10n_cn/l10n_chart_cn_wizard.xml
index 52aaa88fdab..d93d83a37aa 100644
--- a/addons/l10n_cn/l10n_chart_cn_wizard.xml
+++ b/addons/l10n_cn/l10n_chart_cn_wizard.xml
@@ -1,8 +1,13 @@
+
open
-
+
+
+ done
+
+
diff --git a/addons/l10n_co/data/l10n_chart_mx_wizard.xml b/addons/l10n_co/data/l10n_chart_mx_wizard.xml
index e73c75c3506..c6f013cbdb3 100644
--- a/addons/l10n_co/data/l10n_chart_mx_wizard.xml
+++ b/addons/l10n_co/data/l10n_chart_mx_wizard.xml
@@ -1,8 +1,14 @@
+
open
+
+
+ done
+
+
diff --git a/addons/l10n_cr/l10n_wizard.xml b/addons/l10n_cr/l10n_wizard.xml
index 6919eb199b6..2199faa9366 100644
--- a/addons/l10n_cr/l10n_wizard.xml
+++ b/addons/l10n_cr/l10n_wizard.xml
@@ -1,8 +1,13 @@
+
open
-
+
+
+ done
+
+
diff --git a/addons/l10n_de/l10n_de_wizard.xml b/addons/l10n_de/l10n_de_wizard.xml
index 19d27fb47c7..007f2badc7a 100644
--- a/addons/l10n_de/l10n_de_wizard.xml
+++ b/addons/l10n_de/l10n_de_wizard.xml
@@ -4,6 +4,10 @@
open
-
+
+
+ done
+
+
diff --git a/addons/l10n_ec/l10n_chart_ec_wizard.xml b/addons/l10n_ec/l10n_chart_ec_wizard.xml
index 52aaa88fdab..71b98ed174b 100644
--- a/addons/l10n_ec/l10n_chart_ec_wizard.xml
+++ b/addons/l10n_ec/l10n_chart_ec_wizard.xml
@@ -1,8 +1,13 @@
+
open
-
+
+
+ done
+
+
diff --git a/addons/l10n_es/l10n_es_wizard.xml b/addons/l10n_es/l10n_es_wizard.xml
index 52aaa88fdab..22953449166 100644
--- a/addons/l10n_es/l10n_es_wizard.xml
+++ b/addons/l10n_es/l10n_es_wizard.xml
@@ -1,8 +1,13 @@
+
open
+
+ done
+
+
diff --git a/addons/l10n_et/l10n_et_wizard.xml b/addons/l10n_et/l10n_et_wizard.xml
index cbbb56b7989..1027cc5874f 100644
--- a/addons/l10n_et/l10n_et_wizard.xml
+++ b/addons/l10n_et/l10n_et_wizard.xml
@@ -1,8 +1,14 @@
+
open
+
+
+ done
+
+
diff --git a/addons/l10n_fr/l10n_fr_wizard.xml b/addons/l10n_fr/l10n_fr_wizard.xml
index 704ac4daf38..193de99eeb4 100644
--- a/addons/l10n_fr/l10n_fr_wizard.xml
+++ b/addons/l10n_fr/l10n_fr_wizard.xml
@@ -1,9 +1,14 @@
+
open
+
+ done
+
+
diff --git a/addons/l10n_gr/l10n_gr_wizard.xml b/addons/l10n_gr/l10n_gr_wizard.xml
index 52aaa88fdab..71b98ed174b 100644
--- a/addons/l10n_gr/l10n_gr_wizard.xml
+++ b/addons/l10n_gr/l10n_gr_wizard.xml
@@ -1,8 +1,13 @@
+
open
-
+
+
+ done
+
+
diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/l10n_gt_base.xml
index 8caf6ebe48c..ddce9748193 100644
--- a/addons/l10n_gt/l10n_gt_base.xml
+++ b/addons/l10n_gt/l10n_gt_base.xml
@@ -4,6 +4,10 @@
open
+
+
+ done
+
diff --git a/addons/l10n_hn/l10n_hn_base.xml b/addons/l10n_hn/l10n_hn_base.xml
index b8b85c3f2a7..63cf79a441f 100644
--- a/addons/l10n_hn/l10n_hn_base.xml
+++ b/addons/l10n_hn/l10n_hn_base.xml
@@ -5,6 +5,10 @@
open
+
+
+ done
+
diff --git a/addons/l10n_hr/l10n_hr_wizard.xml b/addons/l10n_hr/l10n_hr_wizard.xml
index b736f241607..25cc74eb4a6 100644
--- a/addons/l10n_hr/l10n_hr_wizard.xml
+++ b/addons/l10n_hr/l10n_hr_wizard.xml
@@ -1,8 +1,14 @@
+
open
+
+
+ done
+
+
diff --git a/addons/l10n_in/l10n_in_wizard.xml b/addons/l10n_in/l10n_in_wizard.xml
index 704ac4daf38..193de99eeb4 100644
--- a/addons/l10n_in/l10n_in_wizard.xml
+++ b/addons/l10n_in/l10n_in_wizard.xml
@@ -1,9 +1,14 @@
+
open
+
+ done
+
+
diff --git a/addons/l10n_it/l10n_chart_it_generic.xml b/addons/l10n_it/l10n_chart_it_generic.xml
index dde7a77516a..71b98ed174b 100644
--- a/addons/l10n_it/l10n_chart_it_generic.xml
+++ b/addons/l10n_it/l10n_chart_it_generic.xml
@@ -1,7 +1,13 @@
+
open
+
+
+ done
+
+
diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml
index 52aaa88fdab..22953449166 100644
--- a/addons/l10n_lu/l10n_lu_wizard.xml
+++ b/addons/l10n_lu/l10n_lu_wizard.xml
@@ -1,8 +1,13 @@
+
open
+
+ done
+
+
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 @@
-
+
+
diff --git a/addons/l10n_ma/l10n_ma_wizard.xml b/addons/l10n_ma/l10n_ma_wizard.xml
index 52aaa88fdab..22953449166 100644
--- a/addons/l10n_ma/l10n_ma_wizard.xml
+++ b/addons/l10n_ma/l10n_ma_wizard.xml
@@ -1,8 +1,13 @@
+
open
+
+ done
+
+
diff --git a/addons/l10n_mx/data/l10n_chart_mx_wizard.xml b/addons/l10n_mx/data/l10n_chart_mx_wizard.xml
index e73c75c3506..baf1a49fc54 100644
--- a/addons/l10n_mx/data/l10n_chart_mx_wizard.xml
+++ b/addons/l10n_mx/data/l10n_chart_mx_wizard.xml
@@ -1,8 +1,14 @@
-
- open
-
+
+
+ open
+
+
+
+ done
+
+
diff --git a/addons/l10n_nl/l10n_nl_wizard.xml b/addons/l10n_nl/l10n_nl_wizard.xml
index 52aaa88fdab..3b11bd90c90 100644
--- a/addons/l10n_nl/l10n_nl_wizard.xml
+++ b/addons/l10n_nl/l10n_nl_wizard.xml
@@ -1,8 +1,13 @@
+
open
-
+
+
+ done
+
+
diff --git a/addons/l10n_pa/l10n_pa_wizard.xml b/addons/l10n_pa/l10n_pa_wizard.xml
index 4de61247b90..8acb61d7edf 100644
--- a/addons/l10n_pa/l10n_pa_wizard.xml
+++ b/addons/l10n_pa/l10n_pa_wizard.xml
@@ -6,5 +6,9 @@
open
+
+ done
+
+
diff --git a/addons/l10n_pe/l10n_pe_wizard.xml b/addons/l10n_pe/l10n_pe_wizard.xml
index 82e7671b4d3..b18ee6e26ca 100644
--- a/addons/l10n_pe/l10n_pe_wizard.xml
+++ b/addons/l10n_pe/l10n_pe_wizard.xml
@@ -6,5 +6,9 @@
open
+
+ done
+
+
diff --git a/addons/l10n_pl/l10n_chart_pl_wizard.xml b/addons/l10n_pl/l10n_chart_pl_wizard.xml
index 52aaa88fdab..22953449166 100644
--- a/addons/l10n_pl/l10n_chart_pl_wizard.xml
+++ b/addons/l10n_pl/l10n_chart_pl_wizard.xml
@@ -1,8 +1,13 @@
+
open
+
+ done
+
+
diff --git a/addons/l10n_pt/l10n_chart_pt_wizard.xml b/addons/l10n_pt/l10n_chart_pt_wizard.xml
index 52aaa88fdab..22953449166 100644
--- a/addons/l10n_pt/l10n_chart_pt_wizard.xml
+++ b/addons/l10n_pt/l10n_chart_pt_wizard.xml
@@ -1,8 +1,13 @@
+
open
+
+ done
+
+
diff --git a/addons/l10n_ro/l10n_chart_ro_wizard.xml b/addons/l10n_ro/l10n_chart_ro_wizard.xml
index 52aaa88fdab..22953449166 100644
--- a/addons/l10n_ro/l10n_chart_ro_wizard.xml
+++ b/addons/l10n_ro/l10n_chart_ro_wizard.xml
@@ -1,8 +1,13 @@
+
open
+
+ done
+
+
diff --git a/addons/l10n_si/l10n_si_wizard.xml b/addons/l10n_si/l10n_si_wizard.xml
index 5a4b51a01e9..65e60217eb3 100644
--- a/addons/l10n_si/l10n_si_wizard.xml
+++ b/addons/l10n_si/l10n_si_wizard.xml
@@ -1,8 +1,14 @@
+
open
+
+
+ done
+
+
diff --git a/addons/l10n_syscohada/l10n_syscohada_wizard.xml b/addons/l10n_syscohada/l10n_syscohada_wizard.xml
index dde7a77516a..2f815a22ff6 100644
--- a/addons/l10n_syscohada/l10n_syscohada_wizard.xml
+++ b/addons/l10n_syscohada/l10n_syscohada_wizard.xml
@@ -1,7 +1,13 @@
+
open
+
+
+ done
+
+
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index 9ae3d9e3364..5df58bc3867 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -645,8 +645,14 @@
+
open
+
+
+ done
+
+
diff --git a/addons/l10n_tr/l10n_tr_wizard.xml b/addons/l10n_tr/l10n_tr_wizard.xml
index 66b9d37221b..a2c8c45c2de 100644
--- a/addons/l10n_tr/l10n_tr_wizard.xml
+++ b/addons/l10n_tr/l10n_tr_wizard.xml
@@ -1,8 +1,14 @@
+
open
+
+
+ done
+
+
diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml
index 8a6f1a5a83c..b488b5b53f0 100644
--- a/addons/l10n_uk/l10n_uk_wizard.xml
+++ b/addons/l10n_uk/l10n_uk_wizard.xml
@@ -1,9 +1,14 @@
+
open
+
+ done
+
+
diff --git a/addons/l10n_us/__openerp__.py b/addons/l10n_us/__openerp__.py
index 90c0e6fd4ad..cc0de9350f2 100644
--- a/addons/l10n_us/__openerp__.py
+++ b/addons/l10n_us/__openerp__.py
@@ -36,7 +36,8 @@ United States - Chart of accounts.
'account_tax_code_template.xml',
'account_tax_template.xml',
'account_chart_template_after.xml',
- 'l10n_us_wizard.xml'
+ 'l10n_us_wizard.xml',
+ 'account_chart_template_set_accounts.xml'
],
'demo': [],
'test': [],
diff --git a/addons/l10n_us/l10n_us_wizard.xml b/addons/l10n_us/l10n_us_wizard.xml
index 52aaa88fdab..7d53a61910c 100644
--- a/addons/l10n_us/l10n_us_wizard.xml
+++ b/addons/l10n_us/l10n_us_wizard.xml
@@ -1,8 +1,17 @@
+
+
+ {'default_currency_id': "USD"}
+
+
open
-
+
+
+ done
+
+
diff --git a/addons/l10n_uy/l10n_uy_wizard.xml b/addons/l10n_uy/l10n_uy_wizard.xml
index 3dea57dc5c2..4a82f72ca23 100644
--- a/addons/l10n_uy/l10n_uy_wizard.xml
+++ b/addons/l10n_uy/l10n_uy_wizard.xml
@@ -4,5 +4,10 @@
open
+
+
+ done
+
+
diff --git a/addons/l10n_ve/data/account_tax.xml b/addons/l10n_ve/data/account_tax.xml
index d28b0d1d8f3..915761fc92a 100644
--- a/addons/l10n_ve/data/account_tax.xml
+++ b/addons/l10n_ve/data/account_tax.xml
@@ -1,12 +1,12 @@
-
+
Exento
0.00000
percent
- sale
+ all
@@ -14,7 +14,6 @@
-
IVA (12.0%) ventas
@@ -54,19 +53,6 @@
-
-
- Exento
- 0.00000
- percent
- purchase
-
-
-
-
-
-
-
IVA (12.0%) compras
diff --git a/addons/l10n_ve/data/l10n_chart_ve_wizard.xml b/addons/l10n_ve/data/l10n_chart_ve_wizard.xml
index dde7a77516a..e772699014f 100644
--- a/addons/l10n_ve/data/l10n_chart_ve_wizard.xml
+++ b/addons/l10n_ve/data/l10n_chart_ve_wizard.xml
@@ -3,5 +3,10 @@
open
+
+
+ done
+
+
diff --git a/addons/l10n_vn/l10n_vn_wizard.xml b/addons/l10n_vn/l10n_vn_wizard.xml
index 368a3cbd8b3..f84b8d654e4 100755
--- a/addons/l10n_vn/l10n_vn_wizard.xml
+++ b/addons/l10n_vn/l10n_vn_wizard.xml
@@ -5,6 +5,10 @@
open
+
+
+ done
+
\ No newline at end of file