openerp-dev-web team mailing list archive

["Rucha \(Open ERP\)" <rpa@xxxxxxxxxxx>]

Rucha (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-748927-rpa into lp:openobject-addons.

Requested reviews:
  qdp (OpenERP) (qdp)
Related bugs:
  Bug #748927 in OpenERP Addons: "multicompany - inconsistent security rule definitions"
  https://bugs.launchpad.net/openobject-addons/+bug/748927

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-748927-rpa/+merge/56150

fixed inconsistency in record rules, lp:748927
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-748927-rpa/+merge/56150
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-748927-rpa.

=== modified file 'procurement/security/procurement_security.xml'
--- procurement/security/procurement_security.xml	2011-01-14 00:11:01 +0000
+++ procurement/security/procurement_security.xml	2011-04-04 12:51:37 +0000
@@ -6,14 +6,14 @@
             <field name="name">procurement multi-company</field>
             <field name="model_id" search="[('model','=','procurement.order')]" model="ir.model"/>
             <field name="global" eval="True"/>
-            <field name="domain_force">['|','|',('company_id','child_of',[user.company_id.id]),('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id])]</field>
+            <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
         </record>
 
         <record model="ir.rule" id="stock_warehouse_orderpoint_rule">
             <field name="name">stock_warehouse.orderpoint multi-company</field>
             <field name="model_id" search="[('model','=','stock.warehouse.orderpoint')]" model="ir.model"/>
             <field name="global" eval="True"/>
-            <field name="domain_force">['|','|',('company_id','child_of',[user.company_id.id]),('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id])]</field>
+            <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
         </record>
 
     </data>

=== modified file 'product/security/product_security.xml'
--- product/security/product_security.xml	2011-03-10 07:24:46 +0000
+++ product/security/product_security.xml	2011-04-04 12:51:37 +0000
@@ -28,21 +28,21 @@
         <field name="name">product pricelist company rule</field>
         <field name="model_id" ref="model_product_pricelist"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="product_pricelist_item_comp_rule">
         <field name="name">product pricelist item company rule</field>
         <field name="model_id" ref="model_product_pricelist_item"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="product_pricelist_version_comp_rule">
         <field name="name">product pricelist version company rule</field>
         <field name="model_id" ref="model_product_pricelist_version"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 </data>