[REM] product: Removed common changes done for product.

bzr revid: uco@tinyerp.com-20120312110509-j6pbm1agzc2875ds

diff --git a/addons/product/__init__.py b/addons/product/__init__.py
index a7e0be0..4247b49 100644 (file)
--- a/addons/product/__init__.py
+++ b/addons/product/__init__.py
@@ -23,6 +23,5 @@ import pricelist
 import report
 import partner
 import wizard
-import res_config
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index f40c5ab..51d012b 100644 (file)
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
                     <newline/>
-                    <group col="2" colspan="2" groups="base.group_sale_pricelist_per_customer">
+                    <group col="2" colspan="2" groups="base.group_extended">
                         <separator string="Sales Properties" colspan="2"/>
                         <field name="property_product_pricelist"/>
                     </group>

diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 4703187..c48fb40 100644 (file)
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -4,8 +4,7 @@
 
         <menuitem id="base.menu_sale_config_sales" name="Sales"
             parent="base.menu_base_config" sequence="0" groups="base.group_extended"/>
-        <menuitem id="menu_product_pricelist_main" name="Pricelists" 
-            parent="base.menu_base_config" groups="base.group_sale_pricelist_per_customer" sequence="50"/>
+        <menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="base.menu_base_config" sequence="50"/>
 
         <record id="product_pricelist_version_form_view" model="ir.ui.view">
             <field name="name">product.pricelist.version.form</field>

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index d2fea17..8e2ab4e 100644 (file)
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -20,7 +20,7 @@
                    <field name="categ_id" widget="selection" operator="child_of" groups="base.group_extended"/>
                    <newline/>
                    <group expand="0" string="Context..." groups="base.group_extended">
-                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" groups="base.group_sale_pricelist_per_customer"/>
+                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
                        <separator orientation="vertical" groups="base.group_multi_company" />
                        <field name="company_id" widget="selection" groups="base.group_multi_company" />
                    </group>
@@ -50,7 +50,7 @@
                     <field name="name"/>
                     <field name="categ_id" invisible="1"/>
                     <field name="variants" groups="product.group_product_variant"/>
-                    <field name="uom_id" string="UoM" groups="base.group_sale_uom_per_product"/>
+                    <field name="uom_id" string="UoM"/>
                     <field name="type"/>
                     <field name="qty_available"/>
                     <field name="virtual_available"/>
@@ -125,11 +125,11 @@
 
                             <group colspan="2" col="2" name="uom">
                                 <separator string="Unit of Measure" colspan="2"/>
-                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="base.group_sale_uom_per_product"/>
+                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
                                 <field name="uom_po_id" groups="base.group_extended"/>
                             </group>
 
-                            <group colspan="2" col="2" name="uos" groups="base.group_sale_uom_per_product">
+                            <group colspan="2" col="2" name="uos" groups="product.group_uos">
                                 <separator string="Second UoM" colspan="2"/>
                                 <field name="uos_id"/>
                                 <field name="uos_coeff"/>
@@ -440,7 +440,7 @@
             <field name="view_id" ref="product_uom_tree_view"/>
             <field name="help">Create and manage the units of measure you want to be used in your system. You can define a conversion rate between several Units of Measure within the same category.</field>
         </record>
-        <menuitem id="next_id_16" name="Units of Measure" parent="prod_config_main" sequence="65" groups="base.group_sale_uom_per_product"/>
+        <menuitem id="next_id_16" name="Units of Measure" parent="prod_config_main" sequence="65"/>
         <menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/>
 
         <record id="product_uom_categ_form_view" model="ir.ui.view">
@@ -552,7 +552,7 @@
                     <field name="product_uom"/>
                     <field name="delay"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <field colspan="4" groups="base.group_sale_pricelist_per_customer" name="pricelist_ids" nolabel="1" widget="one2many_list">
+                    <field colspan="4" groups="base.group_extended" name="pricelist_ids" nolabel="1" widget="one2many_list">
                         <tree editable="bottom" string="Pricelist">
                             <field name="min_quantity"/>
                             <field name="price"/>
@@ -674,11 +674,11 @@
 
                             <group colspan="2" col="2" name="uom">
                                 <separator string="UOM" colspan="2"/>
-                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="base.group_sale_uom_per_product"/>
+                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
                                 <field name="uom_po_id" groups="base.group_extended"/>
                             </group>
 
-                            <group colspan="2" col="2" name="uos" groups="base.group_sale_uom_per_product">
+                            <group colspan="2" col="2" name="uos" groups="product.group_uos">
                                 <separator string="Second UoM" colspan="2"/>
                                 <field name="uos_id"/>
                                 <field name="uos_coeff"/>

diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 4fb1331..5c993b9 100644 (file)
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -19,21 +19,6 @@
         <field name="category_id" ref="base.module_category_usability"/>
     </record>
 
-    <record id="base.group_sale_pricelist_per_customer" model="res.groups">
-        <field name="name">Sales Pricelists</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
-    <record id="base.group_sale_uom_per_product" model="res.groups">
-        <field name="name">Product UOM</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
-    <record id="base.group_user" model="res.groups">
-        <field name="implied_ids" eval="[(6,0,[ref('base.group_sale_pricelist_per_customer'),
-        ref('base.group_sale_uom_per_product')])]"/>
-    </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"/>

diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index 63ffc6e..91fb931 100644 (file)
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -31,7 +31,6 @@
             name="Price List"
                res_model="product.price_list"
             src_model="product.product"
-            groups="base.group_sale_pricelist_per_customer"
                view_mode="form" target="new" view_type="form" />
 
 </data>