[MERGE] main trunk

bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e

2 files changed, 16 insertions, 6 deletions

diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv
index 3a0d8554ea7..7d3a29a8216 100644
--- a/addons/product/security/ir.model.access.csv
+++ b/addons/product/security/ir.model.access.csv
@@ -19,3 +19,5 @@ access_prices_history_employee,prices.history employee,model_prices_history,base
 access_product_template_sale_manager,product.template salemanager,model_product_template,base.group_sale_manager,1,1,1,1

 access_product_product_sale_manager,product.product salemanager,model_product_product,base.group_sale_manager,1,1,1,1

 access_product_category_sale_manager,product.category salemanager,product.model_product_category,base.group_sale_manager,1,1,1,1

+access_product_category_pos_manager,product.public.category manager,model_product_public_category,base.group_sale_manager,1,1,1,1

+access_product_category_pos_user,product.public.category user,model_product_public_category,base.group_user,1,0,0,0
\ No newline at end of file
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 3cb54f84d47..264aad7ebc5 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -5,10 +5,18 @@
     DO NOT CHANGE IT IN TRUNK -->
 
     <record id="group_product_variant" model="res.groups">
-        <field name="name">Product Variant (not supported)</field>
+        <field name="name">Manage Product Variants</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+    <record id="group_product_mono" model="res.groups">
+        <field name="name">Do Not Manage Product Variants</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+    <record id="base.group_user" model="res.groups">
+        <field name="implied_ids" eval="[(4, ref('product.group_product_mono'))]"/>
+    </record>
+
     <record id="group_sale_pricelist" model="res.groups">
         <field name="name">Sales Pricelists</field>
         <field name="category_id" ref="base.module_category_hidden"/>
@@ -51,35 +59,35 @@
         <field name="name" >Product multi-company</field>
         <field name="model_id" ref="model_product_template"/>
         <field name="global" eval="True"/>
-        <field name="domain_force"> ['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+        <field name="domain_force"> ['|',('company_id','=',user.company_id.id),('company_id','=',False)]</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.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+        <field name="domain_force"> ['|',('company_id','=',user.company_id.id),('company_id','=',False)]</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.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+        <field name="domain_force"> ['|',('company_id','=',user.company_id.id),('company_id','=',False)]</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.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+        <field name="domain_force"> ['|',('company_id','=',user.company_id.id),('company_id','=',False)]</field>
     </record>
 
     <record model="ir.rule" id="product_supplierinfo_comp_rule">
         <field name="name">product supplierinfo company rule</field>
         <field name="model_id" ref="model_product_supplierinfo"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','=',user.company_id.id)]</field>
     </record>
 
 </data>