[MERGE] Merged with main addons.

[odoo/odoo.git] / addons / product / product_view.xml

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 0866cec..03cf036 100644 (file)
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -14,23 +14,23 @@
                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
                    <filter string="Products" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]" help="Both stockable and consumable products"/>
                    <filter string="To Sell" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
-                   <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
+                   <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
                    <separator orientation="vertical"/>
                    <field name="categ_id" widget="selection" operator="child_of"/>
                    <group expand="0" string="Context...">
                        <field name="pricelist_id" widget="selection" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
-                       <separator orientation="vertical" groups="base.group_multi_company" />
-                       <field name="company_id" widget="selection" groups="base.group_multi_company" />
+                       <separator orientation="vertical" groups="base.group_multi_company"/>
+                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                    <newline/>
                    <group  expand='0' string='Group by...'>
                        <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}"/>
                        <separator orientation="vertical"/>
-                       <filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'uom_id'}" />
+                       <filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'uom_id'}"/>
                        <separator orientation="vertical"/>
-                       <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
+                       <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}"/>
                        <separator orientation="vertical" groups="base.group_multi_company"/>
-                       <filter string='Company' icon="terp-go-home" domain="[]" context="{'group_by' : 'company_id'}" groups="base.group_multi_company" />
+                       <filter string='Company' icon="terp-go-home" domain="[]" context="{'group_by' : 'company_id'}" groups="base.group_multi_company"/>
                    </group>
 
                 </search>
@@ -60,6 +60,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form</field>
             <field name="model">product.product</field>
@@ -72,30 +73,30 @@
 
                         <div class="oe_title">
                             <div class="oe_edit_only">
-                                <label for="name" string="Product Name" /> 
+                                <label for="name" string="Product Name"/> 
                             </div>
                             <h1>
                                 <field name="name"/>
                             </h1>
-                            <label for="categ_id" class="oe_edit_only" />
-                            <h2><field name="categ_id" /></h2>
+                            <label for="categ_id" class="oe_edit_only"/>
+                            <h2><field name="categ_id"/></h2>
                         </div>
                         <notebook>
                             <page string="Information">
                                 <group>
                                     <group>
                                         <field name="default_code"/>
-                                        <field name="ean13" placeholder="5901234123457" />
-                                        <field groups="product.group_product_variant" name="variants" />
+                                        <field name="ean13" placeholder="5901234123457"/>
+                                        <field groups="product.group_product_variant" name="variants"/>
                                     </group>
-                                    <group>
+                                    <group groups="base.group_user">
                                         <field name="sale_ok"/>
                                         <field name="purchase_ok"/>
                                     </group>
                                     <group string="Procurement">
                                         <field name="type"/>
                                         <field name="procure_method"/>
-                                        <field name="supply_method"/>
+                                        <field name="supply_method" groups="base.group_user"/>
                                     </group>
                                     <group string="Prices">
                                         <field name="list_price"/>
@@ -126,7 +127,7 @@
 
                                 </group>
                             </page>
-                            <page string="Procurement &amp; Locations">
+                            <page string="Procurement &amp; Locations" groups="base.group_user">
                                 <group>
                                     <group name="delay" string="Delays">
                                         <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
@@ -134,7 +135,7 @@
                                         <field name="warranty"/>
                                     </group>
                                     <group name="store" string="Storage Localisation">
-                                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
+                                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}"/>
                                         <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
                                         <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
                                     </group>
@@ -145,11 +146,11 @@
                                 </group>
 
                             </page>
-                            <page string="Suppliers">
+                            <page string="Suppliers" groups="base.group_user">
                                 <field name="seller_ids" context="{'uom_id': uom_id}"/>
                             </page>
-                            <page string="Descriptions">
-                                <separator string="Internal Description"/>
+                            <page string="Descriptions" groups="base.group_user">
+                                <separator string="Description"/>
                                 <field name="description"/>
                                 <separator string="Sale Description"/>
                                 <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
@@ -214,7 +215,8 @@
                                         <t t-if="record.type.raw_value != 'service'">
                                             <div>Stock: <field name="qty_available"/> on hand, <field name="virtual_available"/> available</div>
                                             <div t-if="record.list_price.raw_value != 0">Public Price: <field name="lst_price"/></div>
-                                            <div>Cost : <field name="standard_price"/></div>
+                                            <!-- TODO would deserve to be hidden at the field level -->
+                                            <div groups="base.group_user">Cost : <field name="standard_price"/></div>
                                         </t>
                                         <div class="oe_kanban_clear"/>
                                     </div>
@@ -463,8 +465,8 @@
             <field name="arch" type="xml">
                 <form string="Packaging" version="7.0">
                     <group>
-                        <field name="name" />
-                        <field name="type" />
+                        <field name="name"/>
+                        <field name="type"/>
                     </group>
                 </form>
             </field>