From 0b98166e73f1863e0aa6907d02433a89828d307d Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 22 Jun 2012 11:25:24 +0530
Subject: [PATCH] [IMP] account, product: account : Improve view for
 account_invoice_view.xml account : Improve view for product_view.xml product
 : Improve product category as well as uom view file stock : Improve product
 inherited view

bzr revid: dbr@tinyerp.com-20120622055524-j3erbqup81u72f6f
---
 addons/account/account_invoice_view.xml     | 17 ++++++++++-------
 addons/account/product_view.xml             | 14 ++++++++------
 addons/account_anglo_saxon/product_view.xml | 13 +++++++------
 addons/product/product_view.xml             | 21 ++++++++++++---------
 addons/stock/product_view.xml               | 18 ++++++++++--------
 5 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 835189726dd..4e1db78616b 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -192,15 +192,15 @@
                             <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
                                 <tree string="Invoice lines">
                                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)"/>
                                     <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
                                     <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="quantity"/>
                                     <field name="price_unit"/>
-                                     <!-- Removed if subtotal is set -->
                                     <field name="price_subtotal"/>
-                                    <field invisible="True" name="name"/>
-                                    <field invisible="True" name="uos_id"/>
+                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)" invisible="1"/>
+                                    <!-- Removed if subtotal is set -->
+                                    <field name="name" invisible="1"/>
+                                    <field name="uos_id" invisible="1"/>
                                 </tree>
                             </field>
                             <group>
@@ -234,14 +234,17 @@
                         </page>
                         <page string="Other Info">
                             <group col="4">
+                            <group>
                                 <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
+                                <field name="payment_term" widget="selection"/>
+                            </group>
+                            <group>
                                 <field name="user_id"/>
                                 <field name="name" invisible="1"/>
-                                <newline/>
                                 <field name="move_id" groups="account.group_account_user" invisible="1"/>
-                                <field name="payment_term" widget="selection"/>
                                 <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             </group>
+                            </group>
                         </page>
                         <page string="Payments">
                             <field name="payment_ids">
@@ -249,7 +252,7 @@
                                     <field name="date" string="Payment Date"/>
                                     <field name="ref"/>
                                     <field name="name"/>
-                                    <field name="amount_currency"/>
+                                    <field name="amount_currency" string="Amount"/>
                                     <field name="currency_id"/>
                                     <field name="move_id" invisible="1"/>
                                     <field name="journal_id" invisible="1"/>
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 73bf64893ba..7959062df2b 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -51,12 +51,14 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
-                <form position="inside">
-                    <group string="Accounting Properties">
-                        <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                    </group>
-                </form>
+                <data>
+                    <xpath expr="/form/sheet//group[@name='basic']" position="inside">
+                        <group string="Accounting Properties">
+                            <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        </group>
+                    </xpath>
+                </data>
             </field>
         </record>
 
diff --git a/addons/account_anglo_saxon/product_view.xml b/addons/account_anglo_saxon/product_view.xml
index 8a79d96d1c4..a342438dca5 100644
--- a/addons/account_anglo_saxon/product_view.xml
+++ b/addons/account_anglo_saxon/product_view.xml
@@ -34,12 +34,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
-                <form position="inside">
-                    <group>
-                        <separator string="Accounting Property" colspan="2"/>
-                        <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                    </group>
-                </form>
+                <data>
+                    <xpath expr="/form/sheet//group[@name='basic']" position="before">
+                        <group string="Accounting Property">
+                            <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        </group>
+                    </xpath>
+                </data>
             </field>
         </record>
 
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index ce95cc8a044..1063121438e 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -311,12 +311,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Categories" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="parent_id"/>
-                        <field name="sequence" invisible="1"/>
-                        <field name="type"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="parent_id"/>
+                            <field name="sequence" invisible="1"/>
+                            <field name="type"/>
+                        </group>
+                        <group name="basic" col="4"/>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -415,9 +418,9 @@
                         </group>
                         <group string="Ratio &amp; Precision">
                             <field name="uom_type" on_change="onchange_type(uom_type)"/>
-                            <field name="rounding"/>
-                            <field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
-                            <label string="  e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
+                            <field name="rounding" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
+                            <field name="factor" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
+                            <label string="  e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                             <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                             <label string="  e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                         </group>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 09fa784e56a..b06ecf868b7 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -21,14 +21,16 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
-                <form position="inside" version="7.0">
-                    <group string="Accounting Stock Properties">
-                        <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_valuation_account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_journal"/>
-                    </group>
-                </form>
+                <data>
+                    <xpath expr="/form/sheet//group[@name='basic']" position="inside">
+                        <group string="Accounting Stock Properties">
+                            <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="property_stock_valuation_account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
+                            <field name="property_stock_journal"/>
+                        </group>
+                    </xpath>
+                </data>
             </field>
         </record>