diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-09-12 13:32:47 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-09-12 13:32:47 +0200 |
| commit | 6df4eaacd560c8fadae2963a8c8d7b9b490dc5e7 (patch) | |
| tree | d8ae25aeb749eef088ee0c6fbf3cd3d951959732 /addons | |
| parent | a71caa14d6c907ad201fc6e9addecc022fe8a454 (diff) | |
| parent | 2003332c63f11eda045ce869a94f8bad9b967000 (diff) | |
[MERGE] [FIX] charts of account: fixed currency not selected on COA, added some missing default values (US/MA/VE).
Currency is found by adding values in ir.values and retrieving it when installing the COA.
In trunk/8.0, a new currency_id field will be added allowing to retrieve directly the currency.
bzr revid: tde@openerp.com-20130912113247-esuwq1zppcq2gakk
Diffstat (limited to 'addons')
47 files changed, 398 insertions, 33 deletions
diff --git a/addons/account/account.py b/addons/account/account.py index da2a74f5353..0bf8a6ef713 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -3070,22 +3070,23 @@ 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}} def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None): res = {} tax_templ_obj = self.pool.get('account.tax.template') + ir_values = self.pool.get('ir.values') 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}) + #set currecy_id based on selected COA template using ir.vaalues else current users company's currency + value_id = ir_values.search(cr, uid, [('model', '=', 'account.chart.template'), ('res_id', '=', chart_template_id)], limit=1, context=context) + if value_id: + currency_id = int(ir_values.browse(cr, uid, value_id[0], context=context).value) + else: + currency_id = 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" @@ -3101,6 +3102,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): def default_get(self, cr, uid, fields, context=None): res = super(wizard_multi_charts_accounts, self).default_get(cr, uid, fields, context=context) tax_templ_obj = self.pool.get('account.tax.template') + data_obj = self.pool.get('ir.model.data') if 'bank_accounts_id' in fields: res.update({'bank_accounts_id': [{'acc_name': _('Cash'), 'account_type': 'cash'},{'acc_name': _('Bank'), 'account_type': 'bank'}]}) @@ -3117,7 +3119,12 @@ 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 set default chart which was last created set max of ids. + chart_id = max(ids) + if context.get("default_charts"): + data_id = data_obj.search(cr, uid, [('model', '=', 'account.chart.template'), ('module', '=', context.get("default_charts"))], context=context) + chart_id = data_obj.browse(cr, uid, data_id[0], context=context).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 @@ </form> <footer position="replace"> <footer> - <button name="action_next" type="object" string="Continue" class="oe_highlight"/> + <button name="action_next" context="{'default_charts':charts}" type="object" string="Continue" class="oe_highlight"/> </footer> </footer> <separator string="title" position="replace"> diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 10d9bf786f7..16ba8f4a8dd 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2125,7 +2125,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)]}"/> diff --git a/addons/l10n_ar/l10n_ar_chart.xml b/addons/l10n_ar/l10n_ar_chart.xml index 062697d5aa6..bb427a1e1d4 100644 --- a/addons/l10n_ar/l10n_ar_chart.xml +++ b/addons/l10n_ar/l10n_ar_chart.xml @@ -254,6 +254,13 @@ <field name="property_account_income_categ" ref="411_01"/> </record> + <record id="ar_chart_template_value" model="ir.values"> + <field name="name">Argentina - Plan de Cuentas</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="ar_chart_template"/> + <field name="value" ref="base.ARS"/> + </record> </data> diff --git a/addons/l10n_at/account_chart.xml b/addons/l10n_at/account_chart.xml index 51d0c9a85a8..3d17cd20c86 100644 --- a/addons/l10n_at/account_chart.xml +++ b/addons/l10n_at/account_chart.xml @@ -2519,6 +2519,13 @@ <field name="property_account_expense" ref="chart5000"/> <field name="property_account_income" ref="chart4000"/> </record> + <record id="austria_chart_template_value" model="ir.values"> + <field name="name">Austria - Chart of Accounts</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="austria_chart_template"/> + <field name="value" ref="base.EUR"/> + </record> </data> diff --git a/addons/l10n_be/account_chart_template.xml b/addons/l10n_be/account_chart_template.xml index 55726fdc335..47f7fc0986e 100644 --- a/addons/l10n_be/account_chart_template.xml +++ b/addons/l10n_be/account_chart_template.xml @@ -14,6 +14,13 @@ <field name="property_account_income_categ" ref="a_sale"/> <field name="spoken_languages" eval="'nl_BE'"/> </record> + <record id="l10nbe_chart_template_value" model="ir.values"> + <field name="name">Belgian PCMN</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="l10nbe_chart_template"/> + <field name="value" ref="base.EUR"/> + </record> </data> diff --git a/addons/l10n_bo/l10n_bo_chart.xml b/addons/l10n_bo/l10n_bo_chart.xml index dc9e9598909..c3102094103 100644 --- a/addons/l10n_bo/l10n_bo_chart.xml +++ b/addons/l10n_bo/l10n_bo_chart.xml @@ -251,6 +251,13 @@ <field name="property_account_income_categ" ref="411_01"/> </record> + <record id="bo_chart_template_value" model="ir.values"> + <field name="name">Bolivia - Plan de Cuentas</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="bo_chart_template"/> + <field name="value" ref="base.BOB"/> + </record> </data> diff --git a/addons/l10n_br/data/account_chart_template.xml b/addons/l10n_br/data/account_chart_template.xml index c99bbd03d2f..5e47f2ed136 100644 --- a/addons/l10n_br/data/account_chart_template.xml +++ b/addons/l10n_br/data/account_chart_template.xml @@ -12,6 +12,14 @@ <field name="property_account_expense_categ" ref="account_template_3010103010000" /> <field name="property_account_income_categ" ref="account_template_3010101010200" /> </record> + + <record id="l10n_br_account_chart_template_value" model="ir.values"> + <field name="name">Planilha de Contas Brasileira</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="l10n_br_account_chart_template"/> + <field name="value" ref="base.BRL"/> + </record> </data> </openerp> diff --git a/addons/l10n_ca/account_chart_template_en.xml b/addons/l10n_ca/account_chart_template_en.xml index 635fa7b8bb1..c0deebfce6b 100644 --- a/addons/l10n_ca/account_chart_template_en.xml +++ b/addons/l10n_ca/account_chart_template_en.xml @@ -14,6 +14,13 @@ <field name="property_account_income_categ" ref="chart411_en"/> <field name="property_account_expense_categ" ref="chart5111_en"/> </record> + <record id="ca_en_chart_template_en_value" model="ir.values"> + <field name="name">Canada - Chart of Accounts for english-speaking provinces</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="ca_en_chart_template_en"/> + <field name="value" ref="base.CAD"/> + </record> <record id="stock.property_stock_account_input_categ" model="ir.property"> <field eval="'account.account,'+str(ref('chart2141_en'))" model="account.account" name="value"/> diff --git a/addons/l10n_ca/account_chart_template_fr.xml b/addons/l10n_ca/account_chart_template_fr.xml index 7d1cc0a9ae2..71b1eb8ba32 100644 --- a/addons/l10n_ca/account_chart_template_fr.xml +++ b/addons/l10n_ca/account_chart_template_fr.xml @@ -13,6 +13,14 @@ <field name="property_account_income_categ" ref="chart411_fr"/> <field name="property_account_expense_categ" ref="chart5111_fr"/> </record> + + <record id="ca_fr_chart_template_fr_value" model="ir.values"> + <field name="name">Canada - Plan comptable pour les provinces francophones</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="ca_fr_chart_template_fr"/> + <field name="value" ref="base.CAD"/> + </record> <record id="stock.property_stock_account_input_categ" model="ir.property"> <field eval="'account.account,'+str(ref('chart2171_fr'))" model="account.account" name="value"/> diff --git a/addons/l10n_ch/sterchi_chart/account.xml b/addons/l10n_ch/sterchi_chart/account.xml index ddad62946ae..f5f5c09bf55 100644 --- a/addons/l10n_ch/sterchi_chart/account.xml +++ b/addons/l10n_ch/sterchi_chart/account.xml @@ -11813,5 +11813,12 @@ <field name="code_digits" eval="0"/> <field name="spoken_languages" eval="'it_IT;de_DE'"/> </record> + <record id="l10nch_chart_template_value" model="ir.values"> + <field name="name">Plan comptable STERCHI</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="l10nch_chart_template"/> + <field name="value" ref="base.CHF"/> + </record> </data> </openerp> diff --git a/addons/l10n_cl/l10n_cl_chart.xml b/addons/l10n_cl/l10n_cl_chart.xml index 8bc4272c2eb..82d45b1c701 100644 --- a/addons/l10n_cl/l10n_cl_chart.xml +++ b/addons/l10n_cl/l10n_cl_chart.xml @@ -249,7 +249,13 @@ <field name="property_account_expense_categ" ref="61_01"/> <field name="property_account_income_categ" ref="411_01"/> </record> - + <record id="cl_chart_template_value" model="ir.values"> + <field name="name">Chile - Plan de Cuentas</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="cl_chart_template"/> + <field name="value" ref="base.AUD"/> + </record> </data> diff --git a/addons/l10n_cn/account_chart.xml b/addons/l10n_cn/account_chart.xml index afcb3e04b0c..78e3550d1e4 100644 --- a/addons/l10n_cn/account_chart.xml +++ b/addons/l10n_cn/account_chart.xml @@ -958,6 +958,13 @@ <field name="property_account_expense_categ" ref="chart1401"/>
<field name="property_account_income_categ" ref="chart6001"/>
</record>
+ <record id="l10n_chart_china_value" model="ir.values">
+ <field name="name">中国会计科目表</field>
+ <field name="model">account.chart.template</field>
+ <field name="key">default</field>
+ <field name="res_id" ref="l10n_chart_china"/>
+ <field name="value" ref="base.CNY"/>
+ </record>
<!-- 增值税 -->
<record id="vats" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china"/>
diff --git a/addons/l10n_co/data/account_chart.xml b/addons/l10n_co/data/account_chart.xml index 2fe4ac9a1b9..cead488e306 100644 --- a/addons/l10n_co/data/account_chart.xml +++ b/addons/l10n_co/data/account_chart.xml @@ -103349,6 +103349,13 @@ participacion, de conformidad con las disposiciones legales vigentes. <field name="property_account_expense_categ" ref="chart529595999"/> <field name="property_account_income_categ" ref="chart413595999"/> </record> + <record id="vauxoo_mx_chart_template_value" model="ir.values"> + <field name="name">Unique Account Chart - PUC</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="vauxoo_mx_chart_template"/> + <field name="value" ref="base.COP"/> + </record> </data> </openerp> diff --git a/addons/l10n_cr/data/account_chart_template.xml b/addons/l10n_cr/data/account_chart_template.xml index e84ea73fbed..b2ad615a158 100644 --- a/addons/l10n_cr/data/account_chart_template.xml +++ b/addons/l10n_cr/data/account_chart_template.xml @@ -17,6 +17,13 @@ <field name="property_account_income_categ" ref="account_account_template_0_410001"/> <field name="property_account_expense_categ" ref="account_account_template_0_511301"/> </record> + <record id="account_chart_template_0_value" model="ir.values"> + <field name="name">Costa Rica - Company 0</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="account_chart_template_0"/> + <field name="value" ref="base.CRC"/> + </record> <record id="account_chart_template_x" model="account.chart.template"> <field name="name">Costa Rica - Company 1</field> <field name="account_root_id" ref="account_account_template_x000000"/> @@ -29,5 +36,12 @@ <field name="property_account_income_categ" ref="account_account_template_x410001"/> <field name="property_account_expense_categ" ref="account_account_template_x511301"/> </record> + <record id="account_chart_template_x_value" model="ir.values"> + <field name="name">Costa Rica - Company 1</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="account_chart_template_x"/> + <field name="value" ref="base.CRC"/> + </record> </data> </openerp> diff --git a/addons/l10n_de/account_chart_template_skr03.xml b/addons/l10n_de/account_chart_template_skr03.xml index 058424188f6..bfd6672afb1 100644 --- a/addons/l10n_de/account_chart_template_skr03.xml +++ b/addons/l10n_de/account_chart_template_skr03.xml @@ -13,5 +13,12 @@ <field name="property_account_expense_categ" ref="account_3400"/> <field name="property_account_income_categ" ref="account_8400"/> </record> + <record id="l10n_de_chart_template_value" model="ir.values"> + <field name="name">Deutscher Kontenplan SKR03</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="l10n_de_chart_template"/> + <field name="value" ref="base.EUR"/> + </record> </data> </openerp> diff --git a/addons/l10n_de/account_chart_template_skr04.xml b/addons/l10n_de/account_chart_template_skr04.xml index c33c0d415eb..1929a7b07e1 100644 --- a/addons/l10n_de/account_chart_template_skr04.xml +++ b/addons/l10n_de/account_chart_template_skr04.xml @@ -13,5 +13,12 @@ <field name="property_account_expense_categ" ref="chart_skr04_5400"/> <field name="property_account_income_categ" ref="chart_skr04_4400"/> </record> + <record id="l10n_chart_de_skr04_value" model="ir.values"> + <field name="name">Deutscher Kontenplan SKR04</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="l10n_chart_de_skr04"/> + <field name="value" ref="base.EUR"/> + </record> </data> </openerp> diff --git a/addons/l10n_ec/account_chart.xml b/addons/l10n_ec/account_chart.xml index 17f1b71d047..31d85e03dc7 100644 --- a/addons/l10n_ec/account_chart.xml +++ b/addons/l10n_ec/account_chart.xml @@ -4203,6 +4203,13 @@ <field name="property_account_payable" ref="5"/> <field name="property_account_expense_categ" ref="60101"/> <field name="property_account_income_categ" ref="710101"/> + </record> + <record id="ec_chart_template_value" model="ir.values"> + <field name="name">Ecuador - Chart of Accounts</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="ec_chart_template"/> + <field name="value" ref="base.USD"/> </record> </data> diff --git a/addons/l10n_es/account_chart.xml b/addons/l10n_es/account_chart.xml index 1bc63f6419f..7e44eb1b613 100644 --- a/addons/l10n_es/account_chart.xml +++ b/addons/l10n_es/account_chart.xml @@ -13334,5 +13334,12 @@ <field name="property_account_expense_categ" ref="pgc_600_child"/> <field name="property_account_income_categ" ref="pgc_7000_child"/> </record> + <record id="l10nES_chart_template_value" model="ir.values"> + <field name="name">Plantilla PGCE completo 2008</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="l10nES_chart_template"/> + <field name="value" ref="base.EUR"/> + </record> </data> </openerp> diff --git a/addons/l10n_es/account_chart_assoc.xml b/addons/l10n_es/account_chart_assoc.xml index 670eed53c9b..785d9ed60a5 100644 --- a/addons/l10n_es/account_chart_assoc.xml +++ b/addons/l10n_es/account_chart_assoc.xml @@ -12421,6 +12421,13 @@ <field name="property_account_expense_categ" ref="pgc_assoc_600_child"/> <field name="property_account_income_categ" ref="pgc_assoc_7000_child"/> </record> + <record id="l10nES_chart_template_assoc_value" model="ir.values"> + <field name="name">Plantilla PGCE Asociaciones 2008</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="l10nES_chart_template_assoc"/> + <field name="value" ref="base.EUR"/> + </record> </data> </openerp> diff --git a/addons/l10n_es/account_chart_pymes.xml b/addons/l10n_es/account_chart_pymes.xml index 223d80e3193..72cfc17853c 100644 --- a/addons/l10n_es/account_chart_pymes.xml +++ b/addons/l10n_es/account_chart_pymes.xml @@ -11465,5 +11465,12 @@ <field name="property_account_expense_categ" ref="pgc_pymes_600_child"/> <field name="property_account_income_categ" ref="pgc_pymes_7000_child"/> </record> + <record id="l10nES_chart_template_pymes_value" model="ir.values"> + <field name="name">Plantilla PGCE PYMES 2008</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="l10nES_chart_template_pymes"/> + <field name="value" ref="base.EUR"/> + </record> </data> </openerp> diff --git a/addons/l10n_fr/fr_pcg_taxes.xml b/addons/l10n_fr/fr_pcg_taxes.xml index 78b34f2d696..222749252c6 100644 --- a/addons/l10n_fr/fr_pcg_taxes.xml +++ b/addons/l10n_fr/fr_pcg_taxes.xml @@ -442,6 +442,13 @@ <field name="property_account_expense_categ" ref="pcg_6071"/> <field name="property_account_income_categ" ref="pcg_7071"/> </record> + <record id="l10n_fr_pcg_chart_template_value" model="ir.values"> + <field name="name">Plan Comptable Général (France)</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="l10n_fr_pcg_chart_template"/> + <field name="value" ref="base.EUR"/> + </record> </data> </openerp> diff --git a/addons/l10n_gr/account_tax.xml b/addons/l10n_gr/account_tax.xml index c3de033869b..e60b3909a69 100644 --- a/addons/l10n_gr/account_tax.xml +++ b/addons/l10n_gr/account_tax.xml @@ -22,7 +22,13 @@ <field name="property_account_expense_categ" ref="chartgr_64_98"/> <field name="property_account_income_categ" ref="chartgr_71_00"/> </record> - + <record id="l10n_gr_chart_template_value" model="ir.values"> + <field name="name">Πρότυπο Ελληνικού Λογιστικού Σχεδίου</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="l10n_gr_chart_template"/> + <field name="value" ref="base.EUR"/> + </record> <record id="vat_code_balance_net" model="account.tax.code.template"> <field name="name">Υπόλοιπο ΦΠΑ </field> diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/l10n_gt_base.xml index 8caf6ebe48c..e14d5910583 100644 --- a/addons/l10n_gt/l10n_gt_base.xml +++ b/addons/l10n_gt/l10n_gt_base.xml @@ -32,6 +32,13 @@ <field name="property_account_income_categ" ref="cta410101"/> <field name="property_account_expense_categ" ref="cta510101"/> </record> + <record id="cuentas_plantilla_value" model="ir.values"> + <field name="name">Plantilla de cuentas de Guatemala (sencilla)</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="cuentas_plantilla"/> + <field name="value" ref="base.QTQ"/> + </record> <!-- Compras e IVA por Cobrar --> diff --git a/addons/l10n_hn/l10n_hn_base.xml b/addons/l10n_hn/l10n_hn_base.xml index b8b85c3f2a7..9f5a9b8cbd9 100644 --- a/addons/l10n_hn/l10n_hn_base.xml +++ b/addons/l10n_hn/l10n_hn_base.xml @@ -18,6 +18,13 @@ <field name="property_account_income_categ" ref="cta410101"/> <field name="property_account_expense_categ" ref="cta510101"/> </record> + <record id="cuentas_plantilla_value" model="ir.values"> + <field name="name">Plantilla de cuentas de Honduras (sencilla)</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="cuentas_plantilla"/> + <field name="value" ref="base.HNL"/> + </record> <!-- Compras e ISV por Cobrar --> diff --git a/addons/l10n_hr/l10n_hr_chart_template.xml b/addons/l10n_hr/l10n_hr_chart_template.xml index d9a7db5710c..9509030117e 100644 --- a/addons/l10n_hr/l10n_hr_chart_template.xml +++ b/addons/l10n_hr/l10n_hr_chart_template.xml @@ -16,6 +16,14 @@ <field name="property_account_expense_categ" ref="kp_rrif4199"/> <field name="property_account_income_categ" ref="kp_rrif7500"/> </record> + + <record id="l10n_hr_chart_template_rrif_value" model="ir.values"> + <field name="name">RRIF-ov računski plan za poduzetnike</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="l10n_hr_chart_template_rrif"/> + <field name="value" ref="base.HRK"/> + </record> </data> </openerp> diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml index 671fdc334d9..91fc525e070 100644 --- a/addons/l10n_in/l10n_in_private_chart.xml +++ b/addons/l10n_in/l10n_in_private_chart.xml @@ -515,7 +515,13 @@ <field name="property_account_expense_categ" ref="a540"/> <field name="property_account_income_categ" ref="a311"/> </record> - + <record id="indian_chart_template_private_value" model="ir.values"> + <field name="name">India - Chart of Accounts for Private Ltd/Partnership</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="indian_chart_template_private"/> + <field name="value" ref="base.INR"/> + </record> </data> </openerp> diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml index 9612afddc39..f30a9173c3f 100644 --- a/addons/l10n_in/l10n_in_public_chart.xml +++ b/addons/l10n_in/l10n_in_public_chart.xml @@ -669,6 +669,13 @@ <field name="property_account_expense_categ" ref="p41010"/> <field name="property_account_income_categ" ref="p31010"/> </record> + <record id="indian_chart_template_public_value" model="ir.values"> + <field name="name">India - Chart of Accounts for Public Ltd</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="indian_chart_template_public"/> + <field name="value" ref="base.INR"/> + </record> </data> </openerp> diff --git a/addons/l10n_it/account_chart.xml b/addons/l10n_it/account_chart.xml index 6dd7b539b49..7d3ef5909ab 100644 --- a/addons/l10n_it/account_chart.xml +++ b/addons/l10n_it/account_chart.xml @@ -12,5 +12,12 @@ <field name="property_account_expense_categ" ref="4101"/> <field name="property_account_income_categ" ref="3101"/> </record> + <record id="l10n_it_chart_template_generic_value" model="ir.values"> + <field name="name">Italy - Generic Chart of Accounts</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="l10n_it_chart_template_generic"/> + <field name="value" ref="base.EUR"/> + </record> </data> </openerp> diff --git a/addons/l10n_lu/account_chart_template.xml b/addons/l10n_lu/account_chart_template.xml index f0986277343..cb6c88527b4 100644 --- a/addons/l10n_lu/account_chart_template.xml +++ b/addons/l10n_lu/account_chart_template.xml @@ -14,6 +14,13 @@ <field name="property_account_income_opening" ref="lu_2011_account_141"/> <field name="property_account_expense_opening" ref="lu_2011_account_141"/> </record> + <record id="lu_2011_chart_1_value" model="ir.values"> + <field name="name">PCMN Luxembourg</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="lu_2011_chart_1"/> + <field name="value" ref="base.EUR"/> + </record> </data> </openerp> diff --git a/addons/l10n_ma/l10n_ma_tax.xml b/addons/l10n_ma/l10n_ma_tax.xml index 070d2d4fc9b..48d06e31bc5 100644 --- a/addons/l10n_ma/l10n_ma_tax.xml +++ b/addons/l10n_ma/l10n_ma_tax.xml @@ -742,7 +742,15 @@ <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 id="l10n_kzc_temp_chart_value" model="ir.values"> + <field name="name">compta Kazacube</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="l10n_kzc_temp_chart"/> + <field name="value" ref="base.MAD"/> </record> <record model="account.tax.template" id="tva_exo"> diff --git a/addons/l10n_mx/data/account_chart.xml b/addons/l10n_mx/data/account_chart.xml index 491942e4b72..7b81ec81d20 100644 --- a/addons/l10n_mx/data/account_chart.xml +++ b/addons/l10n_mx/data/account_chart.xml @@ -3696,6 +3696,13 @@ Cuentas del plan <field name="property_stock_account_input_categ" ref="cuenta4111003000"/> <field name="property_stock_account_output_categ" ref="cuenta4511003000"/> </record> + <record id="vauxoo_mx_chart_template_value" model="ir.values"> + <field name="name">Plan de Cuentas para Mexico</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="vauxoo_mx_chart_template"/> + <field name="value" ref="base.MXN"/> + </record> </data> diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml index c7eefb42cde..1599d3df1b9 100644 --- a/addons/l10n_nl/account_chart_netherlands.xml +++ b/addons/l10n_nl/account_chart_netherlands.xml @@ -4103,6 +4103,13 @@ <field name="property_account_expense_categ" ref="a_expense"/><!-- aankoop grondstoffen --> <field name="property_account_income_categ" ref="a_sale"/> <!-- verkoop rekening --> </record> + <record id="l10nnl_chart_template_value" model="ir.values"> + <field name="name">Nederlands Grootboekschema</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="l10nnl_chart_template"/> + <field name="value" ref="base.EUR"/> + </record> <!-- BTW Template De volgende 2 velden worden gebruikt om een koppeling met het grootboek te maken. In de code wordt berekend diff --git a/addons/l10n_pa/l10n_pa_chart.xml b/addons/l10n_pa/l10n_pa_chart.xml index 3f9c1b316ca..823c4c73b93 100644 --- a/addons/l10n_pa/l10n_pa_chart.xml +++ b/addons/l10n_pa/l10n_pa_chart.xml @@ -242,6 +242,13 @@ <field name="property_account_payable" ref="211"/> <field name="property_account_expense_categ" ref="62_01"/> <field name="property_account_income_categ" ref="411_01"/> + </record> + <record id="l10npa_chart_template_value" model="ir.values"> + <field name="name">Panamá - Plan de Cuentas</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="l10npa_chart_template"/> + <field name="value" ref="base.PAB"/> </record> diff --git a/addons/l10n_pe/l10n_pe_chart.xml b/addons/l10n_pe/l10n_pe_chart.xml index 29559de605e..894c8c7db9b 100644 --- a/addons/l10n_pe/l10n_pe_chart.xml +++ b/addons/l10n_pe/l10n_pe_chart.xml @@ -2259,7 +2259,13 @@ <field name="property_account_expense_categ" ref="6011_01"/> <field name="property_account_income_categ" ref="70111_01"/> </record> - + <record id="pe_chart_template_value" model="ir.values"> + <field name="name">Peru - Plan de Cuentas 2011</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="pe_chart_template"/> + <field name="value" ref="base.PEN"/> + </record> </data> diff --git a/addons/l10n_pl/account_chart.xml b/addons/l10n_pl/account_chart.xml index 57ab12beb5d..c193f42f6ab 100644 --- a/addons/l10n_pl/account_chart.xml +++ b/addons/l10n_pl/account_chart.xml @@ -3203,6 +3203,13 @@ <field name="property_account_expense_categ" ref="chart330020000"/> <field name="property_account_income_categ" ref="chart773010000"/> </record> + <record id="pl_chart_template_value" model="ir.values"> + <field name="name">Polska - Plan kont</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="pl_chart_template"/> + <field name="value" ref="base.PLZ"/> + </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/l10n_pt/account_chart_template.xml b/addons/l10n_pt/account_chart_template.xml index 25ddc500def..3b4a63a4a43 100644 --- a/addons/l10n_pt/account_chart_template.xml +++ b/addons/l10n_pt/account_chart_template.xml @@ -17,6 +17,13 @@ <field name="property_account_expense_categ" ref="chart_311"/> <field name="property_reserve_and_surplus_account" ref="chart_811"/> </record> + <record id="pt_chart_template_value" model="ir.values"> + <field name="name">Portugal - Template do Plano de Contas SNC</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="pt_chart_template"/> + <field name="value" ref="base.EUR"/> + </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/l10n_ro/account_chart.xml b/addons/l10n_ro/account_chart.xml index 1e0a9b749f7..0ed1084b7ed 100644 --- a/addons/l10n_ro/account_chart.xml +++ b/addons/l10n_ro/account_chart.xml @@ -4589,5 +4589,13 @@ <field name="property_account_income_categ" ref="ro_pcg_sale"/> <!-- 707 --> </record> + + <record id="romania_chart_template_value" model="ir.values"> + <field name="name">Romania - Chart of Accounts</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="romania_chart_template"/> + <field name="value" ref="base.ROL"/> + </record> </data> </openerp> diff --git a/addons/l10n_syscohada/l10n_syscohada_data.xml b/addons/l10n_syscohada/l10n_syscohada_data.xml index d90988e00e3..99a1cbdd7fd 100644 --- a/addons/l10n_syscohada/l10n_syscohada_data.xml +++ b/addons/l10n_syscohada/l10n_syscohada_data.xml @@ -1850,6 +1850,13 @@ <field name="property_account_payable" ref="pcg_4011"/>
<field name="property_account_expense_categ" ref="pcg_6011" />
<field name="property_account_income_categ" ref="pcg_7011" />
+ </record>
+ <record id="syscohada_chart_template_value" model="ir.values">
+ <field name="name">SYSCOHADA - Plan de compte</field>
+ <field name="model">account.chart.template</field>
+ <field name="key">default</field>
+ <field name="res_id" ref="syscohada_chart_template"/>
+ <field name="value" ref="base.XOF"/>
</record>
<record model="account.tax.code.template" id="tax_col_ht">
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml index 9ae3d9e3364..91e6969801b 100644 --- a/addons/l10n_th/account_data.xml +++ b/addons/l10n_th/account_data.xml @@ -478,6 +478,13 @@ <field name="property_account_expense" ref="a_exp_office"/> <field name="property_account_income" ref="a_sales"/> </record> +<record id="chart_value" model="ir.values"> + <field name="name">Thailand - Chart of Accounts</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="chart"/> + <field name="value" ref="base.THB"/> +</record> <!-- TAXES --> diff --git a/addons/l10n_tr/account_chart_template.xml b/addons/l10n_tr/account_chart_template.xml index 3e10353298e..11596155fd3 100644 --- a/addons/l10n_tr/account_chart_template.xml +++ b/addons/l10n_tr/account_chart_template.xml @@ -13,6 +13,13 @@ <field name="property_account_expense_categ" ref="tr150"/> <field name="property_account_income_categ" ref="tr600"/> </record> + <record id="l10ntr_tek_duzen_hesap_value" model="ir.values"> + <field name="name">Tek Düzen Hesap Planı</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="l10ntr_tek_duzen_hesap"/> + <field name="value" ref="base.TRL"/> + </record> </data> diff --git a/addons/l10n_us/account_chart_template.xml b/addons/l10n_us/account_chart_template.xml index 0863680981f..878991c859d 100644 --- a/addons/l10n_us/account_chart_template.xml +++ b/addons/l10n_us/account_chart_template.xml @@ -6,52 +6,127 @@ <field name="name">Basic Chart of Account</field> <field name="visible" eval="False" /> <field name="complete_tax_set" eval="False" /> + <field name="currency_id" ref="base.USD"/> + </record> + <record id="account_chart_template_basic_value" model="ir.values"> + <field name="name">Basic Chart of Account</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="account_chart_template_basic"/> + <field name="value" ref="base.USD"/> </record> <record id="account_chart_template_cogs" model="account.chart.template"> <field name="name">Cost of Goods sold</field> <field name="visible" eval="False" /> <field name="parent_id" ref="account_chart_template_basic"/> + <field name="currency_id" ref="base.USD"/> <field name="complete_tax_set" eval="False" /> </record> + <record id="account_chart_template_cogs_value" model="ir.values"> + <field name="name">Cost of Goods sold</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="account_chart_template_cogs"/> + <field name="value" ref="base.USD"/> + </record> + <record id="account_chart_template_advertising" model="account.chart.template"> <field name="name">Advertising</field> <field name="complete_tax_set" eval="False" /> + <field name="currency_id" ref="base.USD"/> <field name="parent_id" ref="account_chart_template_cogs"/> </record> + <record id="account_chart_template_advertising_value" model="ir.values"> + <field name="name">Advertising</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="account_chart_template_advertising"/> + <field name="value" ref="base.USD"/> + </record> + <record id="account_chart_template_agriculture" model="account.chart.template"> <field name="name">Agriculture</field> <field name="complete_tax_set" eval="False" /> + <field name="currency_id" ref="base.USD"/> <field name="parent_id" ref="account_chart_template_basic"/> </record> + <record id="account_chart_template_agriculture_value" model="ir.values"> + <field name="name">Agriculture</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="account_chart_template_agriculture"/> + <field name="value" ref="base.USD"/> + </record> + <record id="account_chart_template_construction" model="account.chart.template"> <field name="name">Construction Trades (Plumber, Electrician, HVAC, etc.)</field> <field name="complete_tax_set" eval="False" /> + <field name="currency_id" ref="base.USD"/> <field name="parent_id" ref="account_chart_template_cogs"/> </record> + <record id="account_chart_template_construction_value" model="ir.values"> + <field name="name">Construction Trades (Plumber, Electrician, HVAC, etc.)</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="account_chart_template_construction"/> + <field name="value" ref="base.USD"/> + </record> <record id="account_chart_template_financial_service" model="account.chart.template"> <field name="name">Financial Services other than Accounting or Bookkeeping</field> <field name="complete_tax_set" eval="False" /> + <field name="currency_id" ref="base.USD"/> <field name="parent_id" ref="account_chart_template_cogs"/> </record> + <record id="account_chart_template_financial_service_value" model="ir.values"> + <field name="name">Financial Services other than Accounting or Bookkeeping</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="account_chart_template_financial_service"/> + <field name="value" ref="base.USD"/> + </record> <record id="account_chart_template_general_service" model="account.chart.template"> <field name="name">General Service-Based Business</field> <field name="complete_tax_set" eval="False" /> + <field name="currency_id" ref="base.USD"/> <field name="parent_id" ref="account_chart_template_cogs"/> </record> + <record id="account_chart_template_general_service_value" model="ir.values"> + <field name="name">General Service-Based Business</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="account_chart_template_general_service"/> + <field name="value" ref="base.USD"/> + </record> <record id="account_chart_template_legal_service" model="account.chart.template"> <field name="name">Legal Services</field> <field name="complete_tax_set" eval="False" /> + <field name="currency_id" ref="base.USD"/> <field name="parent_id" ref="account_chart_template_basic"/> </record> + <record id="account_chart_template_legal_service_value" model="ir.values"> + <field name="name">Legal Services</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="account_chart_template_legal_service"/> + <field name="value" ref="base.USD"/> + </record> <record id="account_chart_template_general_product" model="account.chart.template"> <field name="name">General Product-Based Business</field> <field name="complete_tax_set" eval="False" /> + <field name="currency_id" ref="base.USD"/> <field name="parent_id" ref="account_chart_template_basic"/> </record> + <record id="account_chart_template_general_product_value" model="ir.values"> + <field name="name">General Product-Based Business</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="account_chart_template_general_product"/> + <field name="value" ref="base.USD"/> + </record> </data> </openerp> diff --git a/addons/l10n_us/account_chart_template_after.xml b/addons/l10n_us/account_chart_template_after.xml index 5ca3a169aba..4dea930f09f 100644 --- a/addons/l10n_us/account_chart_template_after.xml +++ b/addons/l10n_us/account_chart_template_after.xml @@ -6,6 +6,8 @@ <field name="account_root_id" ref="coa_basic"/> <field name="bank_account_view_id" ref="cash_expenditure"/> <field name="tax_code_root_id" ref="tax_code_chart_root"/> + <field name="property_account_receivable" ref="account_receivable"/> + <field name="property_account_payable" ref="account_payable"/> </record> <record id="account_chart_template_advertising" model="account.chart.template"> <field name="bank_account_view_id" ref="cash_expenditure"/> diff --git a/addons/l10n_uy/account_chart_template.xml b/addons/l10n_uy/account_chart_template.xml index 4ce35184967..05868963d49 100644 --- a/addons/l10n_uy/account_chart_template.xml +++ b/addons/l10n_uy/account_chart_template.xml @@ -1896,7 +1896,13 @@ <field name="property_account_income_categ" ref="uy_code_4100"/> <field name="property_account_expense_categ" ref="uy_code_5100"/> </record> - + <record id="uy_chart_template_value" model="ir.values"> + <field name="name">Plan de Cuentas Uruguay - Template</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="uy_chart_template"/> + <field name="value" ref="base.UYP"/> + </record> </data> </openerp> diff --git a/addons/l10n_ve/data/account_chart.xml b/addons/l10n_ve/data/account_chart.xml index 05645805a84..c4725b117bd 100644 --- a/addons/l10n_ve/data/account_chart.xml +++ b/addons/l10n_ve/data/account_chart.xml @@ -3316,5 +3316,12 @@ <field name="property_account_expense_categ" ref="account_activa_account_7151001"/> <field name="property_account_income_categ" ref="account_activa_account_5111001"/> </record> + <record id="ve_chart_template_amd_value" model="ir.values"> + <field name="name">Venezuelan - Account</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="ve_chart_template_amd"/> + <field name="value" ref="base.VUB"/> + </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> diff --git a/addons/l10n_vn/account_chart.xml b/addons/l10n_vn/account_chart.xml index c7d3f6a9ee3..c09512c8de6 100755 --- a/addons/l10n_vn/account_chart.xml +++ b/addons/l10n_vn/account_chart.xml @@ -2017,6 +2017,13 @@ <field name="property_account_income_categ" ref="chart5111" /> </record> + <record id="vn_template_value" model="ir.values"> + <field name="name">VN - Chart of Accounts</field> + <field name="model">account.chart.template</field> + <field name="key">default</field> + <field name="res_id" ref="vn_template"/> + <field name="value" ref="base.VND"/> + </record> </data> </openerp> |
