From ed5fc84a373920a9740cac990cab33666f3373f8 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Tue, 28 Oct 2014 15:57:14 +0100
Subject: [PATCH] [IMP] stock_account: stock journal in multicompany

Restrict the property_stock_journal to the main company only. This avoids errors in multicompany when the stock journal of the main company (getting an error company mismatch) is used instead of a more useful message explaining the missing stock journal.
Fixes #3251
---
 addons/stock_account/product_data.xml |    1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock_account/product_data.xml b/addons/stock_account/product_data.xml
index 49a0654..33b65f6 100644
--- a/addons/stock_account/product_data.xml
+++ b/addons/stock_account/product_data.xml
@@ -6,6 +6,7 @@
             <field name="name">property_stock_journal</field>
             <field name="fields_id" search="[('model', '=', 'product.category'), ('name', '=', 'property_stock_journal')]"/>
             <field eval="'account.journal,'+str(ref('stock_journal'))" model="account.journal" name="value"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
 
         <record forcecreate="True" id="property_stock_account_output_prd" model="ir.property">
-- 
1.7.10.4