Merge lp:~openerp-dev/openobject-addons/trunk-bug-1244390-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello,

I have checked and applied code of Stefan Rijnhart (Therp) and added some code
which fixes the issue of Demo company partners are not assigned their own company.

Thanks & Regards,
Devnani Bharat R.

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks for the credits!

review: Approve

Unmerged revisions

9029. By Stefan Rijnhart (Therp) on 2013-12-27

[FIX] Demo company partners are not assigned their own company

=== modified file 'multi_company/multi_company_demo.xml'
--- multi_company/multi_company_demo.xml	2013-10-27 12:31:04 +0000
+++ multi_company/multi_company_demo.xml	2013-12-27 10:41:28 +0000
@@ -49,6 +49,24 @@
             <field name="currency_id" ref="base.EUR"/>
             <field name="name">Odoo</field>
         </record>
+        
+        <!-- Write company to their partners -->
+
+        <record id="res_partner_oerp_editor" model="res.partner">
+            <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="res_partner_oerp_us" model="res.partner">
+            <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="res_partner_oerp_in" model="res.partner">
+            <field name="company_id" ref="res_company_oerp_in"/>
+        </record>
+        <record id="res_partner_oerp_be" model="res.partner">
+            <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="res_partner_odoo" model="res.partner">
+            <field name="company_id" ref="res_company_odoo"/>
+        </record>
 
 <!--                      User                        -->
 

=== modified file 'stock/stock_demo.xml'
--- stock/stock_demo.xml	2013-10-27 12:31:04 +0000
+++ stock/stock_demo.xml	2013-12-27 10:41:28 +0000
@@ -207,6 +207,10 @@
             <field name="parent_id" ref="base.main_company"/>
             <field name="name">Your Company, Chicago shop</field>
         </record>
+        
+        <record id="res_partner_company_1" model="res.partner">
+            <field name="company_id" ref="res_company_1"/>
+        </record>
 
         <!--        Child Company 2-->
         <record id="res_partner_company_2" model="res.partner">
@@ -236,6 +240,10 @@
             <field name="parent_id" ref="base.main_company"/>
             <field name="name">Your Company, Birmingham shop</field>
         </record>
+        
+        <record id="res_partner_company_2" model="res.partner">
+            <field name="company_id" ref="res_company_2"/>
+        </record>
 
         <!--TOCHECK-->
         <record id="stock_location_shop0" model="stock.location">