diff --git a/addons/account/account.py b/addons/account/account.py
index 49bacbe13ee..8222f9e9575 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2788,6 +2788,7 @@ class account_chart_template(osv.osv):
'parent_id': fields.many2one('account.chart.template', 'Parent Chart Template'),
'code_digits': fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
'visible': fields.boolean('Can be Visible?', help="Set this to False if you don't want this template to be used actively in the wizard that generate Chart of Accounts from templates, this is useful when you want to generate accounts of this template only when loading its child template."),
+ 'currency_id': fields.many2one('res.currency', 'Currency'),
'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 sale and purchase rates or choose from list of taxes. This last choice assumes that the set of tax defined on this template is complete'),
'account_root_id': fields.many2one('account.account.template', 'Root Account', domain=[('parent_id','=',False)]),
'tax_code_root_id': fields.many2one('account.tax.code.template', 'Root Tax Code', domain=[('parent_id','=',False)]),
@@ -3052,7 +3053,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
res['value'] = {'complete_tax_set': False, 'sale_tax': False, 'purchase_tax': False}
if chart_template_id:
data = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
- res['value'].update({'complete_tax_set': data.complete_tax_set})
+ currency_id = data.currency_id and data.currency_id.id or self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
+ res['value'].update({'complete_tax_set': data.complete_tax_set, 'currency_id': currency_id})
if data.complete_tax_set:
# default tax is given by the lowest sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account
sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
@@ -3084,7 +3086,11 @@ class wizard_multi_charts_accounts(osv.osv_memory):
ids = self.pool.get('account.chart.template').search(cr, uid, [('visible', '=', True)], context=context)
if ids:
if 'chart_template_id' in fields:
- res.update({'only_one_chart_template': len(ids) == 1, 'chart_template_id': ids[0]})
+ #in order to get set default chart which was last created set max of ids.
+ chart_id = max(ids)
+ if context.get("default_charts"):
+ chart_id = self.pool.get('ir.model.data').search_read(cr, uid, [('model','=','account.chart.template'),('module','=',context.get("default_charts"))], ['res_id'], context=context)[0]['res_id']
+ res.update({'only_one_chart_template': len(ids) == 1, 'chart_template_id': chart_id})
if 'sale_tax' in fields:
sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
, "=", ids[0]), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index b03babc63ac..8d1b25b299f 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -10,7 +10,7 @@
diff --git a/addons/l10n_ar/l10n_ar_chart.xml b/addons/l10n_ar/l10n_ar_chart.xml
index 062697d5aa6..02b2f3e97bf 100644
--- a/addons/l10n_ar/l10n_ar_chart.xml
+++ b/addons/l10n_ar/l10n_ar_chart.xml
@@ -252,6 +252,7 @@
+
diff --git a/addons/l10n_at/account_chart.xml b/addons/l10n_at/account_chart.xml
index 51d0c9a85a8..eca220994e6 100644
--- a/addons/l10n_at/account_chart.xml
+++ b/addons/l10n_at/account_chart.xml
@@ -2518,6 +2518,7 @@
+
diff --git a/addons/l10n_be/account_chart_template.xml b/addons/l10n_be/account_chart_template.xml
index 55726fdc335..48e506ded79 100644
--- a/addons/l10n_be/account_chart_template.xml
+++ b/addons/l10n_be/account_chart_template.xml
@@ -13,6 +13,7 @@
+
diff --git a/addons/l10n_bo/l10n_bo_chart.xml b/addons/l10n_bo/l10n_bo_chart.xml
index dc9e9598909..3d7e5cc1935 100644
--- a/addons/l10n_bo/l10n_bo_chart.xml
+++ b/addons/l10n_bo/l10n_bo_chart.xml
@@ -249,6 +249,7 @@
+
diff --git a/addons/l10n_br/data/account_chart_template.xml b/addons/l10n_br/data/account_chart_template.xml
index c99bbd03d2f..598c3191cba 100644
--- a/addons/l10n_br/data/account_chart_template.xml
+++ b/addons/l10n_br/data/account_chart_template.xml
@@ -11,6 +11,7 @@
+
diff --git a/addons/l10n_ca/account_chart_template_en.xml b/addons/l10n_ca/account_chart_template_en.xml
index 635fa7b8bb1..64e0632382e 100644
--- a/addons/l10n_ca/account_chart_template_en.xml
+++ b/addons/l10n_ca/account_chart_template_en.xml
@@ -13,6 +13,7 @@
+
diff --git a/addons/l10n_ca/account_chart_template_fr.xml b/addons/l10n_ca/account_chart_template_fr.xml
index 7d1cc0a9ae2..510153200c6 100644
--- a/addons/l10n_ca/account_chart_template_fr.xml
+++ b/addons/l10n_ca/account_chart_template_fr.xml
@@ -12,6 +12,7 @@
+
diff --git a/addons/l10n_ch/sterchi_chart/account.xml b/addons/l10n_ch/sterchi_chart/account.xml
index ddad62946ae..acee99cad4a 100644
--- a/addons/l10n_ch/sterchi_chart/account.xml
+++ b/addons/l10n_ch/sterchi_chart/account.xml
@@ -11812,6 +11812,7 @@
+
diff --git a/addons/l10n_cl/l10n_cl_chart.xml b/addons/l10n_cl/l10n_cl_chart.xml
index 8bc4272c2eb..2e2339f212e 100644
--- a/addons/l10n_cl/l10n_cl_chart.xml
+++ b/addons/l10n_cl/l10n_cl_chart.xml
@@ -248,6 +248,7 @@
+
diff --git a/addons/l10n_cn/account_chart.xml b/addons/l10n_cn/account_chart.xml
index afcb3e04b0c..fe4690e306c 100644
--- a/addons/l10n_cn/account_chart.xml
+++ b/addons/l10n_cn/account_chart.xml
@@ -957,6 +957,7 @@
+
diff --git a/addons/l10n_co/data/account_chart.xml b/addons/l10n_co/data/account_chart.xml
index 2fe4ac9a1b9..06d6d471e1e 100644
--- a/addons/l10n_co/data/account_chart.xml
+++ b/addons/l10n_co/data/account_chart.xml
@@ -103348,6 +103348,7 @@ participacion, de conformidad con las disposiciones legales vigentes.
+
diff --git a/addons/l10n_cr/data/account_chart_template.xml b/addons/l10n_cr/data/account_chart_template.xml
index e84ea73fbed..a8a08647c00 100644
--- a/addons/l10n_cr/data/account_chart_template.xml
+++ b/addons/l10n_cr/data/account_chart_template.xml
@@ -16,6 +16,7 @@
+
Costa Rica - Company 1
@@ -28,6 +29,7 @@
+
diff --git a/addons/l10n_de/account_chart_template_skr03.xml b/addons/l10n_de/account_chart_template_skr03.xml
index 058424188f6..ea3c0cff3d7 100644
--- a/addons/l10n_de/account_chart_template_skr03.xml
+++ b/addons/l10n_de/account_chart_template_skr03.xml
@@ -12,6 +12,7 @@
+
diff --git a/addons/l10n_de/account_chart_template_skr04.xml b/addons/l10n_de/account_chart_template_skr04.xml
index c33c0d415eb..fee680af379 100644
--- a/addons/l10n_de/account_chart_template_skr04.xml
+++ b/addons/l10n_de/account_chart_template_skr04.xml
@@ -12,6 +12,7 @@
+
diff --git a/addons/l10n_ec/account_chart.xml b/addons/l10n_ec/account_chart.xml
index 17f1b71d047..afa847ea5a9 100644
--- a/addons/l10n_ec/account_chart.xml
+++ b/addons/l10n_ec/account_chart.xml
@@ -4202,7 +4202,8 @@
-
+
+
diff --git a/addons/l10n_es/account_chart.xml b/addons/l10n_es/account_chart.xml
index 1bc63f6419f..8260a76dca1 100644
--- a/addons/l10n_es/account_chart.xml
+++ b/addons/l10n_es/account_chart.xml
@@ -13333,6 +13333,7 @@
+
diff --git a/addons/l10n_es/account_chart_assoc.xml b/addons/l10n_es/account_chart_assoc.xml
index 670eed53c9b..105be447ca8 100644
--- a/addons/l10n_es/account_chart_assoc.xml
+++ b/addons/l10n_es/account_chart_assoc.xml
@@ -12420,6 +12420,7 @@
+
diff --git a/addons/l10n_es/account_chart_pymes.xml b/addons/l10n_es/account_chart_pymes.xml
index 223d80e3193..1986a532a66 100644
--- a/addons/l10n_es/account_chart_pymes.xml
+++ b/addons/l10n_es/account_chart_pymes.xml
@@ -11464,6 +11464,7 @@
+
diff --git a/addons/l10n_fr/fr_pcg_taxes.xml b/addons/l10n_fr/fr_pcg_taxes.xml
index 78b34f2d696..2279b077383 100644
--- a/addons/l10n_fr/fr_pcg_taxes.xml
+++ b/addons/l10n_fr/fr_pcg_taxes.xml
@@ -441,6 +441,7 @@
+
diff --git a/addons/l10n_gr/account_tax.xml b/addons/l10n_gr/account_tax.xml
index c3de033869b..36148f49a9b 100644
--- a/addons/l10n_gr/account_tax.xml
+++ b/addons/l10n_gr/account_tax.xml
@@ -21,6 +21,7 @@
+
diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/l10n_gt_base.xml
index 8caf6ebe48c..bfc91ddb83e 100644
--- a/addons/l10n_gt/l10n_gt_base.xml
+++ b/addons/l10n_gt/l10n_gt_base.xml
@@ -31,6 +31,7 @@
+
diff --git a/addons/l10n_hn/l10n_hn_base.xml b/addons/l10n_hn/l10n_hn_base.xml
index b8b85c3f2a7..8b9acf5c50a 100644
--- a/addons/l10n_hn/l10n_hn_base.xml
+++ b/addons/l10n_hn/l10n_hn_base.xml
@@ -17,6 +17,7 @@
+
diff --git a/addons/l10n_hr/l10n_hr_chart_template.xml b/addons/l10n_hr/l10n_hr_chart_template.xml
index d9a7db5710c..1cd998115c6 100644
--- a/addons/l10n_hr/l10n_hr_chart_template.xml
+++ b/addons/l10n_hr/l10n_hr_chart_template.xml
@@ -15,6 +15,7 @@
+
diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml
index 4b8e4be55bf..efaa9844416 100644
--- a/addons/l10n_in/l10n_in_private_chart.xml
+++ b/addons/l10n_in/l10n_in_private_chart.xml
@@ -550,6 +550,7 @@
+
diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml
index 91d285408d5..18633af054f 100644
--- a/addons/l10n_in/l10n_in_public_chart.xml
+++ b/addons/l10n_in/l10n_in_public_chart.xml
@@ -988,6 +988,7 @@
+
diff --git a/addons/l10n_it/account_chart.xml b/addons/l10n_it/account_chart.xml
index 6dd7b539b49..ca64348d482 100644
--- a/addons/l10n_it/account_chart.xml
+++ b/addons/l10n_it/account_chart.xml
@@ -11,6 +11,7 @@
+
diff --git a/addons/l10n_lu/account_chart_template.xml b/addons/l10n_lu/account_chart_template.xml
index f0986277343..254feaa932e 100644
--- a/addons/l10n_lu/account_chart_template.xml
+++ b/addons/l10n_lu/account_chart_template.xml
@@ -13,6 +13,7 @@
+
diff --git a/addons/l10n_ma/l10n_ma_tax.xml b/addons/l10n_ma/l10n_ma_tax.xml
index 070d2d4fc9b..5bc59035861 100644
--- a/addons/l10n_ma/l10n_ma_tax.xml
+++ b/addons/l10n_ma/l10n_ma_tax.xml
@@ -742,7 +742,9 @@
-
+
+
+
diff --git a/addons/l10n_mx/data/account_chart.xml b/addons/l10n_mx/data/account_chart.xml
index 491942e4b72..daa564fd10e 100644
--- a/addons/l10n_mx/data/account_chart.xml
+++ b/addons/l10n_mx/data/account_chart.xml
@@ -3695,6 +3695,7 @@ Cuentas del plan
+
diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml
index c7eefb42cde..03d9879a100 100644
--- a/addons/l10n_nl/account_chart_netherlands.xml
+++ b/addons/l10n_nl/account_chart_netherlands.xml
@@ -4102,6 +4102,7 @@
+
-
+
diff --git a/addons/l10n_syscohada/l10n_syscohada_data.xml b/addons/l10n_syscohada/l10n_syscohada_data.xml
index d90988e00e3..d4be067bfa2 100644
--- a/addons/l10n_syscohada/l10n_syscohada_data.xml
+++ b/addons/l10n_syscohada/l10n_syscohada_data.xml
@@ -1850,6 +1850,7 @@
+
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index 9ae3d9e3364..a6de0ced477 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -477,6 +477,7 @@
+
diff --git a/addons/l10n_tr/account_chart_template.xml b/addons/l10n_tr/account_chart_template.xml
index 3e10353298e..a15af467932 100644
--- a/addons/l10n_tr/account_chart_template.xml
+++ b/addons/l10n_tr/account_chart_template.xml
@@ -12,6 +12,7 @@
+
diff --git a/addons/l10n_us/account_chart_template.xml b/addons/l10n_us/account_chart_template.xml
index 0863680981f..704afbad152 100644
--- a/addons/l10n_us/account_chart_template.xml
+++ b/addons/l10n_us/account_chart_template.xml
@@ -6,6 +6,7 @@
Basic Chart of Account
+
@@ -13,45 +14,53 @@
+
Advertising
+
Agriculture
+
Construction Trades (Plumber, Electrician, HVAC, etc.)
+
Financial Services other than Accounting or Bookkeeping
+
General Service-Based Business
+
Legal Services
+
General Product-Based Business
+
diff --git a/addons/l10n_us/account_chart_template_after.xml b/addons/l10n_us/account_chart_template_after.xml
index 5ca3a169aba..4cd1472773d 100644
--- a/addons/l10n_us/account_chart_template_after.xml
+++ b/addons/l10n_us/account_chart_template_after.xml
@@ -6,33 +6,43 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/l10n_us/l10n_us_wizard.xml b/addons/l10n_us/l10n_us_wizard.xml
index 52aaa88fdab..19d27fb47c7 100644
--- a/addons/l10n_us/l10n_us_wizard.xml
+++ b/addons/l10n_us/l10n_us_wizard.xml
@@ -1,5 +1,6 @@
+
open
diff --git a/addons/l10n_uy/account_chart_template.xml b/addons/l10n_uy/account_chart_template.xml
index 4ce35184967..2e800e4c5cb 100644
--- a/addons/l10n_uy/account_chart_template.xml
+++ b/addons/l10n_uy/account_chart_template.xml
@@ -1895,6 +1895,7 @@
+
diff --git a/addons/l10n_ve/data/account_chart.xml b/addons/l10n_ve/data/account_chart.xml
index 05645805a84..2dba15f1b18 100644
--- a/addons/l10n_ve/data/account_chart.xml
+++ b/addons/l10n_ve/data/account_chart.xml
@@ -3315,6 +3315,7 @@
+
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 @@
-
+
Exento
0.00000
percent
- sale
+ all
@@ -54,19 +54,6 @@
-
-
- Exento
- 0.00000
- percent
- purchase
-
-
-
-
-
-
-
IVA (12.0%) compras
diff --git a/addons/l10n_vn/account_chart.xml b/addons/l10n_vn/account_chart.xml
index c7d3f6a9ee3..4f7a5d90a49 100755
--- a/addons/l10n_vn/account_chart.xml
+++ b/addons/l10n_vn/account_chart.xml
@@ -2015,7 +2015,7 @@
-
+