From f5b9ce48941e7e573a6c40509933130fc083a668 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 29 Jun 2012 17:11:39 +0530
Subject: [PATCH] [IMP]:improved view

bzr revid: apa@tinyerp.com-20120629114139-ajfyd8j1q2ljxo1x
---
 addons/delivery/delivery_view.xml             |  99 +++++-----
 addons/procurement/procurement_view.xml       |  15 +-
 addons/stock/stock_view.xml                   | 177 ++++++++++--------
 addons/stock_planning/stock_planning_view.xml |   4 +-
 4 files changed, 161 insertions(+), 134 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index b78bfd0f8b7..9c469addb71 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -15,6 +15,7 @@
                 </tree>
             </field>
         </record>
+        
         <record id="view_delivery_carrier_form" model="ir.ui.view">
             <field name="name">delivery.carrier.form</field>
             <field name="model">delivery.carrier</field>
@@ -22,64 +23,68 @@
             <field name="arch" type="xml">
                 <form string="Carrier" version="7.0">
                     <sheet>
-                        <group col="4">
-                            <group>
-                                <label for="free_if_more_than"/>
-                                <div>
-                                    <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}" class="oe_inline"/>
-                                    <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}" class="oe_inline"/>
-                                </div>
-                                <field name="use_detailed_pricelist"/>
-                            </group>
-                            <group>
-                                <field name="name"/>
-                                <field name="partner_id"/>
-                                <field name="product_id"/>
-                                <field name="active" invisible="1"/>
-                                <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}" invisible="1"/>
+                        <group col="4" name="general">
+                            <field name="name"/>
+                            <field name="partner_id"/>
+                            <field name="product_id"/>
+                            <field name="active"/>
+                            <separator string="Pricing Information" colspan="4"/>
+                            <group colspan="4" col="4">
+                                <group col="2" colspan="2">
+                                    <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
+                                    <label for="free_if_more_than"/>
+                                    <div>
+                                        <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
+                                        <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
+                                    </div>
+                                </group>
                             </group>
+                            <newline/>
+                            <field name="use_detailed_pricelist"/>
                         </group>
-                        <group>
-                            <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form" nolabel="1">
-                                 <tree string="Delivery grids">
-                                      <field name="sequence"/>
-                                      <field name="name"/>
-                                 </tree>
-                                 <form string="Delivery grids" version="7.0">
-                                     <group>
-                                         <group>
-                                             <field name="name"/>
-                                         </group>
-                                         <group>
-                                             <field name="active"/>
-                                             <field name="sequence"/>
-                                         </group>
-                                     </group>
-                                     <notebook>
-                                        <page string="Grid definition">
-                                           <field name="line_ids"/>
-                                        </page>
-                                        <page string="Destination">
+                        <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
+                            <tree string="Delivery grids">
+                                  <field name="sequence"/>
+                                  <field name="name"/>
+                            </tree>
+                            <form string="Delivery grids" version="7.0">
+                                 <group>
+                                    <group>
+                                        <field name="name"/>
+                                    </group>
+                                    <group>
+                                        <field name="active"/>
+                                        <field name="sequence"/>
+                                    </group>
+                                 </group>
+                                 <notebook>
+                                    <page string="Grid definition">
+                                       <field name="line_ids"/>
+                                    </page>
+                                    <page string="Destination">
+                                        <group>
                                             <group>
                                                 <field name="country_ids" widget="many2many_tags"/>
                                                 <field name="state_ids" widget="many2many_tags"/>
                                             </group>
-                                            <group class="oe_inline" col="4">
-                                                <field name="zip_from" string="Zip"/>
-                                                <label  string="-"/>
-                                                <field name="zip_to" nolabel="1"/>
+                                            <group>
+                                                <label for="zip_from" string="Zip"/>
+                                                <div>
+                                                    <field name="zip_from" class="oe_inline"/>
+                                                    -
+                                                    <field name="zip_to" class="oe_inline"/>
+                                                </div>
                                             </group>
-                                        </page>
-                                    </notebook>
-                                </form>
-                            </field>
-
-                        </group>
-
+                                        </group>
+                                    </page>
+                                </notebook>
+                            </form>
+                       </field>
                     </sheet>
                 </form>
             </field>
         </record>
+        
         <record id="action_delivery_carrier_form" model="ir.actions.act_window">
             <field name="name">Delivery Method</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index c89b8d1daa3..a32e7091b29 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -55,19 +55,24 @@
                         <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
                     </header>
                     <sheet>
+                    <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name" class="oe_inline"/>
                         <label string="-" attrs="{'invisible':[('origin','=',False)]}"/>
                         <field name="origin"  class="oe_inline"/>
                     </h1>
+                    <label for="message" class="oe_edit_only"/>
                     <h2>
                         <field name="message"/>
                     </h2>
-                    <group>
-                        <field name="date_planned"/>
-                        <field name="procure_method"/>
-                        <field name="priority"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection" invisible="1"/>
+                    <group col="4" colspan="4">
+                        <group col="2" colspan="2">
+                            <field name="date_planned"/>
+                            <field name="procure_method"/>
+                            <field name="priority"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection" invisible="1"/>
+                        </group>
+                        <group col="2" colspan="2"/>
                     </group>
                     <notebook>
                     <page string="Procurement Details">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 78be02ad324..aed29ad2609 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -121,14 +121,16 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
+                    <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name" placeholder="Annual inventory" class="oe_inline"/>
                         <span> - </span>
                         <field name="date" class="oe_inline"/>
                     </h1>
-                    <div>
+                    <label for="company_id" class="oe_edit_only"/>
+                    <h2>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </div>
+                    </h2>
                     <notebook>
                     <page string="General Informations">
                         <field name="inventory_line_id">
@@ -144,16 +146,27 @@
                                 <field name="state" invisible="True"/>
                             </tree>
                             <form string="Products" version="7.0">
-                                <group>
-                                    <field domain="[('usage','=','internal')]" name="location_id"/>
-                                    <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
-                                    <field name="product_qty"/>
-                                    <field name="product_uom" groups="product.group_uom"/>
-                                    <field name="prod_lot_id" groups="stock.group_production_lot"/>
-                                    <button name="%(stock.action_view_stock_inventory_line_split)d"
-                                        string="Split inventory lines" groups="stock.group_inventory_valuation"
-                                        type="action" icon="terp-stock_effects-object-colorize"/>
-                                </group>
+                                <sheet>
+                                    <div class="oe_right oe_button_box">
+                                        <button name="%(stock.action_view_stock_inventory_line_split)d"
+                                            string="Split inventory lines" groups="stock.group_inventory_valuation"
+                                            type="action" icon="terp-stock_effects-object-colorize"/>
+                                    </div>
+                                    <group>
+                                        <group>
+                                            <field domain="[('usage','=','internal')]" name="location_id"/>
+                                            <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
+                                        </group>
+                                        <group>
+                                            <label for="product_qty"/>
+                                            <div>
+                                                <field name="product_qty" class="oe_inline"/>
+                                                <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
+                                            </div>
+                                            <field name="prod_lot_id" groups="stock.group_production_lot"/>
+                                        </group>
+                                    </group>
+                                </sheet>
                             </form>
                         </field>
                     </page>
@@ -326,44 +339,46 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
-                    <group>
-                        <group string="Serial Number Identification">
-                            <field name="product_id"/>
-                            <field name="prefix"/>
-                            <field name="name"/>
-                            <field name="ref"/>
-                            <group string="Dates">
-                                <field name="date"/>
+                    <sheet>
+                        <group>
+                            <group string="Serial Number Identification">
+                                <field name="product_id"/>
+                                <field name="prefix"/>
+                                <field name="name"/>
+                                <field name="ref"/>
+                                <group string="Dates">
+                                    <field name="date"/>
+                                </group>
+                            </group>
+                            <group string="Traceability">
+                                <field name="stock_available"/>
+                                <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
+                                <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
                             </group>
                         </group>
-                        <group string="Traceability">
-                            <field name="stock_available"/>
-                            <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
-                            <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="Revisions">
-                            <field name="revisions"/>
-                        </page>
-                        <page string="Stock Moves">
-                            <field name="move_ids">
-                                <tree  string="Stock Moves">
-                                    <field name="picking_id" string="Reference"/>
-                                    <field name="origin"/>
-                                    <field name="product_id"/>
-                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                    <field name="tracking_id" groups="stock.group_tracking_lot"/>
-                                    <field name="date"/>
-                                    <field name="prodlot_id"/>
-                                    <field name="location_id" groups="stock.group_locations"/>
-                                    <field name="location_dest_id" groups="stock.group_locations"/>
-                                    <field name="state"/>
-                                </tree>
-                             </field>
-                        </page>
-                    </notebook>
+                        <notebook>
+                            <page string="Revisions">
+                                <field name="revisions"/>
+                            </page>
+                            <page string="Stock Moves">
+                                <field name="move_ids">
+                                    <tree  string="Stock Moves">
+                                        <field name="picking_id" string="Reference"/>
+                                        <field name="origin"/>
+                                        <field name="product_id"/>
+                                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                        <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                                        <field name="tracking_id" groups="stock.group_tracking_lot"/>
+                                        <field name="date"/>
+                                        <field name="prodlot_id"/>
+                                        <field name="location_id" groups="stock.group_locations"/>
+                                        <field name="location_dest_id" groups="stock.group_locations"/>
+                                        <field name="state"/>
+                                    </tree>
+                                 </field>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -509,39 +524,41 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Location" version="7.0">
-                    <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name"/></h1>
-                    <label for="location_id" class="oe_edit_only"/>
-                    <h2><field name="location_id"/></h2>
-                    <group>
-                        <group string="Additional Information">
-                            <field name="usage"/>
-                            <field name="partner_id"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="icon"/>
-                            <field name="scrap_location"/>
-                            <field name="active"/>
+                    <sheet>
+                        <label for="name" class="oe_edit_only"/>
+                        <h1><field name="name"/></h1>
+                        <label for="location_id" class="oe_edit_only"/>
+                        <h2><field name="location_id"/></h2>
+                        <group>
+                            <group string="Additional Information">
+                                <field name="usage"/>
+                                <field name="partner_id"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="icon"/>
+                                <field name="scrap_location"/>
+                                <field name="active"/>
+                            </group>
+                            <group string="Chained Locations">
+                                <field name="chained_location_type"/>
+                                <field name="chained_location_id"  attrs="{'required':[('chained_location_type','=','fixed')]}"/>
+                                <field name="chained_auto_packing"/>
+                                <field name="chained_delay"/>
+                                <field name="chained_journal_id"/>
+                                <field name="chained_picking_type"/>
+                                <field name="chained_company_id" widget="selection"/>
+                            </group>
+                            <group string="Localization">
+                                <field name="posx"/>
+                                <field name="posy"/>
+                                <field name="posz"/>
+                            </group><group string="Accounting Information">
+                                <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
+                                <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
+                            </group>
                         </group>
-                        <group string="Chained Locations">
-                            <field name="chained_location_type"/>
-                            <field name="chained_location_id"  attrs="{'required':[('chained_location_type','=','fixed')]}"/>
-                            <field name="chained_auto_packing"/>
-                            <field name="chained_delay"/>
-                            <field name="chained_journal_id"/>
-                            <field name="chained_picking_type"/>
-                            <field name="chained_company_id" widget="selection"/>
-                        </group>
-                        <group string="Localization">
-                            <field name="posx"/>
-                            <field name="posy"/>
-                            <field name="posz"/>
-                        </group><group string="Accounting Information">
-                            <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
-                            <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
-                        </group>
-                    </group>
-                    <separator string="Additional Information"/>
-                    <field name="comment"/>
+                        <separator string="Additional Information"/>
+                        <field name="comment"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 0c610c090ff..86755d8c8d0 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -299,8 +299,8 @@
                             <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
                             <field name="stock_supply_location"/>
                         </group>
-                        <group string = "Procurement Histor">
-                            <field name = "history" nolabel = "1"/>
+                        <group string="Procurement History">
+                            <field name="history" nolabel = "1"/>
                         </group>
                     </sheet>
                 </form>