From b1ef98d4637bf0ea27a6a4f2315f001bc36ccbe2 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 25 Apr 2012 14:12:23 +0200
Subject: [PATCH] [IMP] sale, sale_crm, sale_layout, sale_mrp: remove
 group_extended

bzr revid: rco@openerp.com-20120425121223-30vvjjmj748gfhzm
---
 addons/sale/report/sale_report_view.xml |  2 +-
 addons/sale/sale_view.xml               | 22 +++++++++++-----------
 addons/sale_crm/sale_crm_view.xml       |  7 +++----
 addons/sale_layout/sale_layout_view.xml | 10 ++++------
 addons/sale_mrp/sale_mrp_view.xml       |  4 ++--
 5 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 4c1a85a7b86..a86df29d56f 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -85,7 +85,7 @@
                     </field>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                <group expand="0" string="Extended Filters...">
                     <field name="shop_id" widget="selection"/>
                     <field name="categ_id" widget="selection"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 3d597b80dea..278f21cafc2 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -112,7 +112,7 @@
                     <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
                     <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
                     <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
-                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
+                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>
@@ -122,7 +122,7 @@
                         <group col="4" colspan="4">
                             <field name="name"/>
                             <field name="date_order"/>
-                            <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/>
+                            <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
                             <field name="client_order_ref"/>
                         </group>
                         <group col="2" colspan="2">
@@ -164,14 +164,14 @@
                                             <newline/>
                                             <field name="product_packaging"
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
-                                                domain="[('product_id','=',product_id)]" groups="base.group_extended"
+                                                domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"
                                                 colspan="3"/>
                                             <field name="discount" groups="sale.group_discount_per_so_line"/>
                                             <separator colspan="5" string="Notes" groups="base.group_sale_notes_subtotal"/>
                                             <field colspan="5" name="notes" nolabel="1" groups="base.group_sale_notes_subtotal"/>
                                             <separator colspan="5" string="Taxes"/>
                                             <field colspan="5" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-                                            <group colspan="5" col="5" groups="base.group_extended">
+                                            <group colspan="5" col="5">
                                                 <separator colspan="5" string="States"/>
                                                 <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                                                 <field name="invoiced"/>
@@ -189,7 +189,7 @@
                                             <separator colspan="4" string="Properties"/>
                                             <field name="property_ids" colspan="4" nolabel="1"/>
                                         </page>
-                                        <page string="History" groups="base.group_extended">
+                                        <page string="History">
                                             <separator colspan="4" string="Invoice Lines"/>
                                             <field colspan="4" name="invoice_lines" nolabel="1"/>
                                             <separator colspan="4" string="Stock Moves"/>
@@ -222,7 +222,7 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="Other Information">
-                            <group colspan="2" col="2" groups="base.group_extended" name="logistics">
+                            <group colspan="2" col="2" name="logistics">
                                 <separator string="Logistic" colspan="2"/>
                                 <field name="incoterm" widget="selection"/>
                                 <field name="picking_policy" required="True"/>
@@ -232,9 +232,9 @@
                             <group colspan="2" col="2">
                                 <separator string="References" colspan="2"/>
                                 <field name="user_id"/>
-                                <field groups="base.group_extended" name="origin"/>
+                                <field groups="base.group_no_one" name="origin"/>
                             </group>
-                            <group name="sale_pay" colspan="2" col="2" groups="base.group_extended" >
+                            <group name="sale_pay" colspan="2" col="2">
                                 <separator string="Conditions" colspan="2"/>
                                 <field name="payment_term" widget="selection"/>
                                 <field name="fiscal_position" widget="selection"/>
@@ -243,7 +243,7 @@
                             <separator colspan="4" string="Notes" groups="base.group_sale_notes_subtotal"/>
                             <field colspan="4" name="note" nolabel="1" groups="base.group_sale_notes_subtotal"/>
                         </page>
-                        <page string="History" groups="base.group_extended">
+                        <page string="History">
                             <separator colspan="4" string="Invoices"/>
                             <field colspan="4" name="invoice_ids" nolabel="1" context="{'form_view_ref':'account.invoice_form'}"/>
                             <separator colspan="4" string="Packings"/>
@@ -276,7 +276,7 @@
                         <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
                     </field>
                     <newline/>
-                    <group expand="0" string="Group By..." groups="base.group_extended">
+                    <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
@@ -393,7 +393,7 @@
                         <field name="product_uom" groups="product.group_uom"/>
                         <newline/>
 
-                        <field colspan="4" name="name" groups="base.group_extended"/>
+                        <field colspan="4" name="name" groups="base.group_no_one"/>
                         <field name="company_id" groups="base.group_multi_company" readonly="1"/>
                     </group>
                     <separator colspan="4" string="Price"/>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index a96892b990f..32e23a10666 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -21,8 +21,8 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="after">
-                <field name="section_id" widget="selection" groups="base.group_extended"/>
-                <field name="categ_id" widget="selection" groups="base.group_extended"/>
+                    <field name="section_id" widget="selection"/>
+                    <field name="categ_id" widget="selection"/>
                 </field>
             </field>
         </record>
@@ -34,10 +34,9 @@
             <field name="inherit_id" ref="sale.view_sales_order_filter"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="after">
-                    <field name="section_id" widget="selection" string="Sales Team" groups="base.group_extended">
+                    <field name="section_id" widget="selection" string="Sales Team">
                         <filter icon="terp-personal+"
                                 domain="[('section_id.user_id','=',uid)]"
-                                groups="base.group_extended"
                                 help="My Sales Team(s)"/>
                     </field>
                 </field>
diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index d43ecdaf4d6..4c4300b497f 100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -19,7 +19,7 @@
                                     <page string="Order Line">
                                     <group colspan="4" col="5">
                                         <field colspan="3" name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
-                                        <field name="sequence" groups="base.group_extended"/>
+                                        <field name="sequence" groups="base.group_no_one"/>
                                         <field colspan="3"
                                             context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
                                             name="product_id"
@@ -55,7 +55,7 @@
                                             context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
                                             on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
                                             domain="[('product_id','=',product_id)]"
-                                            groups="base.group_extended"/>
+                                            groups="product.group_stock_packaging"/>
                                         <field
                                             name="discount"
                                             attrs="{'invisible':[('layout_type','!=','article')]}"/>
@@ -80,16 +80,14 @@
                                         </group>
                                     </group>
                                     </page>
-                                    <page groups="base.group_extended" string="Extra Info"
-                                        attrs="{'invisible':[('layout_type','!=','article')]}">
+                                    <page string="Extra Info" attrs="{'invisible':[('layout_type','!=','article')]}">
                                         <field name="type" attrs="{'invisible':[('layout_type','!=','article')]}"/>
                                         <field name="delay" select="2" attrs="{'invisible':[('layout_type','!=','article')]}"/>
                                         <field name="address_allotment_id" select="2"/>
                                         <separator colspan="4" string="Properties"/>
                                         <field colspan="4" name="property_ids" nolabel="1"/>
                                     </page>
-                                    <page string="History" groups="base.group_extended"
-                                        attrs="{'invisible':[('layout_type','!=','article')]}">
+                                    <page string="History" attrs="{'invisible':[('layout_type','!=','article')]}">
                                         <separator colspan="4" string="Invoice Lines"/>
                                         <field colspan="4" name="invoice_lines" nolabel="1"/>
                                         <separator colspan="4" string="Stock Moves"/>
diff --git a/addons/sale_mrp/sale_mrp_view.xml b/addons/sale_mrp/sale_mrp_view.xml
index ced19625784..d4d2c153d76 100644
--- a/addons/sale_mrp/sale_mrp_view.xml
+++ b/addons/sale_mrp/sale_mrp_view.xml
@@ -9,8 +9,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='move_prod_id']" position="after">
-                    <field name="sale_name" groups="base.group_extended"/>
-                    <field name="sale_ref" groups="base.group_extended"/>
+                    <field name="sale_name"/>
+                    <field name="sale_ref"/>
                 </xpath>
             </field>
         </record>