[MERGE] forward port of branch saas-3 up to 04e1318
This commit is contained in:
commit
86f98d5144
|
@ -1,9 +1,22 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<openerp>
|
<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 name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_account_input_categ')]"/>
|
||||||
|
<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 name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_account_output_categ')]"/>
|
||||||
|
<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>
|
<data>
|
||||||
|
|
||||||
<!-- Chart template -->
|
<!-- Chart template -->
|
||||||
|
|
||||||
<record id="ca_en_chart_template_en" model="account.chart.template">
|
<record id="ca_en_chart_template_en" model="account.chart.template">
|
||||||
<field name="name">Canada - Chart of Accounts for english-speaking provinces</field>
|
<field name="name">Canada - Chart of Accounts for english-speaking provinces</field>
|
||||||
<field name="account_root_id" ref="chart0_en"/>
|
<field name="account_root_id" ref="chart0_en"/>
|
||||||
|
@ -16,18 +29,6 @@
|
||||||
<field name="currency_id" ref="base.CAD"/>
|
<field name="currency_id" ref="base.CAD"/>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record id="stock.property_stock_account_input_categ" model="ir.property">
|
|
||||||
<field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_account_input_categ')]"/>
|
|
||||||
<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 name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_account_output_categ')]"/>
|
|
||||||
<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">
|
<record id="property_stock_valuation_account_id_en" model="ir.property">
|
||||||
<field name="name">property_stock_valuation_account_id</field>
|
<field name="name">property_stock_valuation_account_id</field>
|
||||||
<field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_valuation_account_id')]"/>
|
<field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_valuation_account_id')]"/>
|
||||||
|
|
|
@ -1,5 +1,19 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<openerp>
|
<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 name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_account_input_categ')]"/>
|
||||||
|
<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 name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_account_output_categ')]"/>
|
||||||
|
<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>
|
<data>
|
||||||
|
|
||||||
<!-- Chart template -->
|
<!-- Chart template -->
|
||||||
|
@ -15,18 +29,6 @@
|
||||||
<field name="currency_id" ref="base.CAD"/>
|
<field name="currency_id" ref="base.CAD"/>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record id="stock.property_stock_account_input_categ" model="ir.property">
|
|
||||||
<field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_account_input_categ')]"/>
|
|
||||||
<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 name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_account_output_categ')]"/>
|
|
||||||
<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">
|
<record id="property_stock_valuation_account_id" model="ir.property">
|
||||||
<field name="name">property_stock_valuation_account_id</field>
|
<field name="name">property_stock_valuation_account_id</field>
|
||||||
<field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_valuation_account_id')]"/>
|
<field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_valuation_account_id')]"/>
|
||||||
|
|
Loading…
Reference in New Issue