From c8dec38eb193c745433e934ad8a3b52c079d4411 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 27 Nov 2008 01:00:02 +0100
Subject: [PATCH] improved_view

bzr revid: fp@tinyerp.com-20081127000002-jk3fb1ycni90a59x
---
 addons/product/product_view.xml | 98 ++++++++++++++++++++++++---------
 addons/sale/sale_view.xml       |  2 +-
 addons/stock/product_view.xml   | 18 +++---
 3 files changed, 83 insertions(+), 35 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index ce879ab389f..fa9ff515aef 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -455,37 +455,83 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Template">
-                    <notebook>
+                    <group colspan="2" col="4">
+                        <separator string="Product Description" colspan="4"/>
+                        <field name="name" select="1"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Product Type" colspan="2"/>
+                        <field name="sale_ok" select="2"/>
+                        <field name="purchase_ok" select="2"/>
+                        <field groups="base.group_extended" name="rental" select="2"/>
+                    </group>
+                    <notebook colspan="4">
                         <page string="Information">
-                            <field colspan="4" name="name" select="1"/>
-                            <field name="categ_id" select="1"/>
-                            <field name="type" select="1"/>
-                            <field digits="(14, 3)" name="volume"/>
-                            <newline/>
-                            <field digits="(14, 3)" name="weight"/>
-                            <field digits="(14, 3)" name="weight_net"/>
-                            <field name="procure_method"/>
-                            <field name="state"/>
-                            <field name="uom_id"/>
-                            <field name="uom_po_id"/>
-                            <field colspan="4" name="description"/>
-                            <newline/>
-                            <field name="list_price"/>
-                            <field name="standard_price"/>
-                            <field name="product_manager"/>
-                            <field name="cost_method"/>
+                            <group colspan="2" col="2">
+                                <separator string="Procurement" colspan="2"/>
+                                <field name="type" select="2"/>
+                                <field name="procure_method"/>
+                                <field name="supply_method"/>
+                            </group>
+
+                            <group colspan="2" col="2" groups="base.group_extended">
+                                <separator string="Weigths" colspan="2"/>
+                                <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
+                                <field digits="(14, 3)" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
+                                <field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
+                            </group>
+
+                            <group colspan="2" col="2" name="status">
+                                <separator string="Status" colspan="2"/>
+                                <field name="categ_id" select="1"/>
+                                <field name="state" select="2"/>
+                                <field groups="base.group_extended" name="product_manager" select="2"/>
+                            </group>
+
+                            <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)"/>
+                                <field name="uom_po_id"/>
+                            </group>
+
+                            <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"/>
+                                <field name="mes_type"/>
+                            </group>
+
                         </page>
-                        <page string="Procurement">
-                            <field name="supply_method" select="2"/>
-                            <field name="rental" select="2"/>
+                        <page string="Procurement &amp; Locations">
+                            <group colspan="2" col="2" name="delay">
+                                <separator string="Delays" colspan="2"/>
+                                <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                <field name="produce_delay"/>
+                                <field name="warranty"/>
+                            </group>
+                            <group colspan="2" col="2" name="store">
+                                <separator string="Storage Localisation" colspan="2"/>
+                                <field name="loc_rack"/>
+                                <field name="loc_row"/>
+                                <field name="loc_case"/>
+                            </group>
+
+                            <group colspan="2" col="2" name="misc">
+                                <separator string="Miscelleanous" colspan="2"/>
+                            </group>
+
+                        </page>
+                        <page string="Prices &amp; Suppliers">
+                            <separator string="Base Prices" colspan="4"/>
+                            <field name="standard_price"/>
+                            <field name="list_price"/>
+                            <field groups="base.group_extended" name="cost_method"/>
                             <newline/>
-                            <field name="sale_delay" select="2"/>
-                            <field name="sale_ok" select="2"/>
-                            <field name="purchase_ok" select="2"/>
-                            <field name="produce_delay" select="2"/>
-                            <field name="warranty"/>
+                            <field colspan="4" name="seller_ids" nolabel="1"/>
                         </page>
                         <page string="Descriptions">
+                            <separator string="Description"/>
+                            <field colspan="4" name="description" nolabel="1"/>
                             <separator string="Sale Description"/>
                             <field colspan="4" name="description_sale" nolabel="1"/>
                             <separator string="Purchase Description"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 52a84c6cfa7..d362ad6d664 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -108,7 +108,7 @@
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
                             <field domain="[('type','=','sale')]" name="pricelist_id"/>
-                            <field name="project_id" select="2" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id}"/>
+                            <field name="project_id" select="2" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"/>
                             <newline/>
                             <field colspan="4" mode="tree,graph" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sale Order Lines">
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index d1cf0f7a3ad..c82391a2df2 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -27,14 +27,16 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
-                <page string="Properties" position="inside">
-                    <separator string="Counter-Part Locations Properties" colspan="4"/>
-                    <field name="property_stock_procurement"/>
-                    <field name="property_stock_production"/>
-                    <field name="property_stock_inventory"/>
-                    <separator string="Accounting Entries" colspan="4"/>
-                    <field name="property_stock_account_input"/>
-                    <field name="property_stock_account_output"/>
+                 <page position="after" string="Information">
+                    <page string="Properties">
+                        <separator string="Counter-Part Locations Properties" colspan="4"/>
+                        <field name="property_stock_procurement"/>
+                        <field name="property_stock_production"/>
+                        <field name="property_stock_inventory"/>
+                        <separator string="Accounting Entries" colspan="4"/>
+                        <field name="property_stock_account_input"/>
+                        <field name="property_stock_account_output"/>
+                    </page>
                 </page>
             </field>
         </record>