From d920466786eded2444b4cfea13b7a372ffd2eff2 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Mon, 23 Jul 2007 05:16:24 +0000
Subject: [PATCH] kernel,base,account: fix multi company rule and property

- 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
---
 addons/account/data/account_minimal.xml | 3 +++
 addons/account/product_data.xml         | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/account/data/account_minimal.xml b/addons/account/data/account_minimal.xml
index 85105412eb2..2c04a115483 100644
--- a/addons/account/data/account_minimal.xml
+++ b/addons/account/data/account_minimal.xml
@@ -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>
diff --git a/addons/account/product_data.xml b/addons/account/product_data.xml
index ca842cde176..63d6d8c668d 100644
--- a/addons/account/product_data.xml
+++ b/addons/account/product_data.xml
@@ -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>