pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel,base,account: fix multi company rule and property

Browse Source 
- provide the rule to add active condition
- add main company to property that are linked to object that have company_id

bzr revid: ced-e25dcea6c711a71fbdbe3d13fafc4e88fb0c5788
This commit is contained in:
ced
2007-07-23 05:16:24 +00:00
parent 6c4b31cf08
commit d920466786
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/data/account_minimal.xml
+3
View File
@@ -58,16 +58,19 @@
<field name="name">property_account_receivable</field>
<field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_receivable')]"/>
<field name="value" eval="'account.account,'+str(a_recv)"/>
<field name="company_id" ref="base.main_company"/>
</record>
<record model="ir.property" id="property_account_payable" forcecreate="True">
<field name="name">property_account_payable</field>
<field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_payable')]"/>
<field name="value" eval="'account.account,'+str(a_pay)"/>
<field name="company_id" ref="base.main_company"/>
</record>
<record model="ir.property" id="property_account_tax" forcecreate="True">
<field name="name">property_account_tax</field>
<field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_tax')]"/>
<field name="value" eval="False"/>
<field name="company_id" ref="base.main_company"/>
</record>
</data>
addons/account/product_data.xml
+5 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<terp>
<data>
<data noupdate="1">
<!--
Product income and expense accounts, default parameters
-->
@@ -9,21 +9,25 @@
<field name="name">property_account_expense</field>
<field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_expense')]"/>
<field name="value" eval="False"/>
<field name="company_id" ref="base.main_company"/>
</record>
<record model="ir.property" id="property_account_income_prd">
<field name="name">property_account_income</field>
<field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_income')]"/>
<field name="value" eval="False"/>
<field name="company_id" ref="base.main_company"/>
</record>
<record model="ir.property" id="property_account_expense_categ">
<field name="name">property_account_expense_categ</field>
<field name="fields_id" search="[('model','=','product.category'),('name','=','property_account_expense_categ')]"/>
<field name="value" eval="'account.account,'+str(ref('account.a_expense'))"/>
<field name="company_id" ref="base.main_company"/>
</record>
<record model="ir.property" id="property_account_income_categ">
<field name="name">property_account_income_categ</field>
<field name="fields_id" search="[('model','=','product.category'),('name','=','property_account_income_categ')]"/>
<field name="value" eval="'account.account,'+str(ref('account.a_sale'))" model="account.account"/>
<field name="company_id" ref="base.main_company"/>
</record>
</data>