diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-08-21 16:08:27 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-08-21 16:08:27 +0200 |
| commit | 04e13180c9be77c79d8ddd9e3d43ab6fc4dc3f43 (patch) | |
| tree | 49d5c9440d7fdd1dfc8da4d48ae1e0552a60565f /addons/l10n_ca | |
| parent | e95e9f887852b0e76783a78cdb8eefa68d0dc3d4 (diff) | |
| parent | 607114ff00576380c45a5b7a2c1391ee914c7238 (diff) | |
[MERGE] forward port of branch 7.0 up to 607114f
Diffstat (limited to 'addons/l10n_ca')
| -rw-r--r-- | addons/l10n_ca/account_chart_template_en.xml | 22 | ||||
| -rw-r--r-- | addons/l10n_ca/account_chart_template_fr.xml | 22 |
2 files changed, 24 insertions, 20 deletions
diff --git a/addons/l10n_ca/account_chart_template_en.xml b/addons/l10n_ca/account_chart_template_en.xml index 64e0632382e..f73bdcec68e 100644 --- a/addons/l10n_ca/account_chart_template_en.xml +++ b/addons/l10n_ca/account_chart_template_en.xml @@ -1,5 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> + <data noupdate="1"> + <!-- Those properties are in a noupdate section in the stock module --> + <!-- No need to create them if they have been deleted --> + <record id="stock.property_stock_account_input_categ" model="ir.property" forcecreate="False"> + <field eval="'account.account,'+str(ref('chart2141_en'))" model="account.account" name="value"/> + <field eval="'product.category,'+str(ref('product.product_category_all'))" model="product.category" name="res_id"/> + </record> + <record id="stock.property_stock_account_output_categ" model="ir.property" forcecreate="False"> + <field eval="'account.account,'+str(ref('chart1145_en'))" model="account.account" name="value"/> + <field eval="'product.category,'+str(ref('product.product_category_all'))" model="product.category" name="res_id"/> + </record> + </data> <data> <!-- Chart template --> @@ -16,16 +28,6 @@ <field name="currency_id" 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"/> - <field eval="'product.category,'+str(ref('product.product_category_all'))" model="product.category" name="res_id"/> - </record> - - <record id="stock.property_stock_account_output_categ" model="ir.property"> - <field eval="'account.account,'+str(ref('chart1145_en'))" model="account.account" name="value"/> - <field eval="'product.category,'+str(ref('product.product_category_all'))" model="product.category" name="res_id"/> - </record> - <record id="property_stock_valuation_account_id_en" model="ir.property"> <field name="name">property_stock_valuation_account_id</field> <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_valuation_account_id')]"/> diff --git a/addons/l10n_ca/account_chart_template_fr.xml b/addons/l10n_ca/account_chart_template_fr.xml index 510153200c6..b425d525e1d 100644 --- a/addons/l10n_ca/account_chart_template_fr.xml +++ b/addons/l10n_ca/account_chart_template_fr.xml @@ -1,5 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> + <data noupdate="1"> + <!-- Those properties are in a noupdate section in the stock module --> + <!-- No need to create them if they have been deleted --> + <record id="stock.property_stock_account_input_categ" model="ir.property" forcecreate="False"> + <field eval="'account.account,'+str(ref('chart2171_fr'))" model="account.account" name="value"/> + <field eval="'product.category,'+str(ref('product.product_category_all'))" model="product.category" name="res_id"/> + </record> + <record id="stock.property_stock_account_output_categ" model="ir.property" forcecreate="False"> + <field eval="'account.account,'+str(ref('chart1145_fr'))" model="account.account" name="value"/> + <field eval="'product.category,'+str(ref('product.product_category_all'))" model="product.category" name="res_id"/> + </record> + </data> <data> <!-- Chart template --> @@ -15,16 +27,6 @@ <field name="currency_id" 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"/> - <field eval="'product.category,'+str(ref('product.product_category_all'))" model="product.category" name="res_id"/> - </record> - - <record id="stock.property_stock_account_output_categ" model="ir.property"> - <field eval="'account.account,'+str(ref('chart1145_fr'))" model="account.account" name="value"/> - <field eval="'product.category,'+str(ref('product.product_category_all'))" model="product.category" name="res_id"/> - </record> - <record id="property_stock_valuation_account_id" model="ir.property"> <field name="name">property_stock_valuation_account_id</field> <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_valuation_account_id')]"/> |