openerp-dev-web team mailing list archive

["Rohan Nayani\(openerp\)" <ron@xxxxxxxxxxx>]

Rohan Nayani(openerp) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-724073-ron into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #724073 Missing company rules
  https://bugs.launchpad.net/bugs/724073

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-724073-ron/+merge/51257

https://bugs.launchpad.net/openobject-addons/+bug/724073
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-724073-ron/+merge/51257
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-724073-ron.

=== modified file 'account/security/account_security.xml'
--- account/security/account_security.xml	2011-01-14 00:11:01 +0000
+++ account/security/account_security.xml	2011-02-25 06:38:57 +0000
@@ -110,4 +110,25 @@
         <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>
     </record>
 
+    <record model="ir.rule" id="account_invoice_line_comp_rule">
+        <field name="name">Invoice Line company rule</field>
+        <field name="model_id" ref="model_account_invoice_line"/>
+        <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>
+    </record>
+
+    <record model="ir.rule" id="account_bank_statement_comp_rule">
+        <field name="name">Account bank statement company rule</field>
+        <field name="model_id" ref="model_account_bank_statement"/>
+        <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>
+    </record>
+
+    <record model="ir.rule" id="account_bank_statement_line_comp_rule">
+        <field name="name">Account bank statement line company rule</field>
+        <field name="model_id" ref="model_account_bank_statement_line"/>
+        <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>
+    </record>
+
 </data></openerp>

=== modified file 'product/security/product_security.xml'
--- product/security/product_security.xml	2011-01-14 00:11:01 +0000
+++ product/security/product_security.xml	2011-02-25 06:38:57 +0000
@@ -24,5 +24,26 @@
         <field name="name">Useability / Product Variant</field>
     </record>
 
+    <record model="ir.rule" id="product_pricelist_comp_rule">
+        <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>
+    </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>
+    </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>
+    </record>
+
 </data>
 </openerp>

=== modified file 'sale/security/sale_security.xml'
--- sale/security/sale_security.xml	2011-01-14 00:11:01 +0000
+++ sale/security/sale_security.xml	2011-02-25 06:38:57 +0000
@@ -28,19 +28,21 @@
         <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>
     </record>
+
     <record model="ir.rule" id="sale_order_line_comp_rule">
         <field name="name">Sale Order Line multi-company</field>
         <field name="model_id" ref="model_sale_order_line"/>
         <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>
     </record>
-    <record model="ir.rule" id="sale_order_line_comp_rule">
+ 
+    <record model="ir.rule" id="sale_shop_comp_rule">
         <field name="name">Sale Shop multi-company</field>
         <field name="model_id" ref="model_sale_shop"/>
         <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>
     </record>
-
+ 
     <!-- Multi - Salesmen sales order assignation rules -->
 
     <record id="sale_order_personal_rule" model="ir.rule">