[IMP] sale,product:Improvemwnt in invoicing page in product form

odoo · Mar 24, 2017 · 3a9a276 · 3a9a276
1 parent 107c8a3
commit 3a9a276
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 15 deletions.
diff --git a/addons/account/views/product_view.xml b/addons/account/views/product_view.xml
@@ -24,6 +24,7 @@
                             </group>
                         </group>
                         <group name="accounting"/>
+                        <group name="invoicing"/>
                     </page>
                 </page>
             </field>

diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
@@ -61,14 +61,6 @@
                                 </group>
                             </group>
                         </page>
-                        <page string="Inventory" name="inventory" groups="stock.group_stock_user,product.group_stock_packaging">
-                            <group name="packaging" string="Packaging"
-                                colspan="4"
-                                attrs="{'invisible':['|', ('type', 'not in', ['product', 'consu']), ('product_variant_count', '>', 1)]}"
-                                groups="product.group_stock_packaging">
-                                <field name="packaging_ids" nolabel="1" context="{'default_product_id': product_variant_id,'tree_view_ref':'product.product_packaging_tree_view', 'form_view_ref':'product.product_packaging_form_view'}"/>
-                            </group>
-                        </page>
                         <page string="Sales" attrs="{'invisible':[('sale_ok','=',False)]}" name="sales">
                             <div name="pricelist_item" groups="product.group_product_pricelist">
                                 <separator string="Pricing"/>
@@ -93,7 +85,7 @@
                                 colspan="4"
                                 attrs="{'invisible':['|', ('type', 'not in', ['product', 'consu']), ('product_variant_count', '>', 1)]}"
                                 groups="product.group_stock_packaging">
-                                <field name="packaging_ids" nolabel="1" context="{'default_product_id': product_variant_id}"/>
+                                <field name="packaging_ids" nolabel="1" context="{'default_product_id': product_variant_id,'tree_view_ref':'product.product_packaging_tree_view', 'form_view_ref':'product.product_packaging_form_view'}"/>
                             </group>
                         </page>
                         <page string="Notes" name="notes">

diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
@@ -565,7 +565,7 @@
                         </group>
                     </page>
                 </page>
-                <group name="invoicing" position="before">
+                <group name="invoicing" position="inside">
                     <group string="Purchase Bills" name="bill" attrs="{'invisible': [('purchase_ok','=',False)]}" groups="purchase.group_purchase_manager">
                         <field name="purchase_method" widget="radio"/>
                     </group>

diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
@@ -647,7 +647,7 @@
             <field name="model">product.template</field>
             <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
-                <group name="payables" position="after">
+                <group name="invoicing" position="inside">
                     <group string="Invoicing" name="invoicing" attrs="{'invisible': [('sale_ok','=',False)]}">
                         <field name="invoice_policy" widget="radio"/>
                         <field name="track_service" widget="radio" invisible="True"/>

diff --git a/addons/stock_account/views/product_views.xml b/addons/stock_account/views/product_views.xml
@@ -49,13 +49,11 @@
                             class="oe_link oe_read_only" colspan="2"/>
                     </div>
                     <group name="accounting" position="inside">
-                        <group name="property_inventory_valuation" attrs="{'invisible': [('type','=','service')]}">
+                        <group name="property_inventory_valuation"  string="Stock Valuation" attrs="{'invisible': [('type','=','service'), ('valuation', '!=', 'real_time')]}">
                             <field name="property_valuation" invisible="1"/>
                             <field name="property_stock_account_input"
-                                attrs="{'invisible':[ ('valuation', '!=', 'real_time')]}"
                                 domain="[('deprecated', '=', False)]"/>
                             <field name="property_stock_account_output"
-                                attrs="{'invisible':[ ('valuation', '!=', 'real_time')]}"
                                 domain="[('deprecated', '=', False)]"/>
                         </group>
                     </group>

diff --git a/addons/stock_landed_costs/views/product_views.xml b/addons/stock_landed_costs/views/product_views.xml
@@ -6,7 +6,7 @@
             <field name="model">product.template</field>
             <field name="inherit_id" ref="purchase.view_product_supplier_inherit"/>
             <field name="arch" type="xml">
-                <group name="bill" position="after">
+                <group name="accounting" position="inside">
                     <group string="Landed Costs">
                         <field name="landed_cost_ok" class="oe_inline" attrs="{'invisible':[('type', 'not in', ['product', 'consu', 'service'])]}"/>
                         <field name="split_method" attrs="{'invisible':['|', ('landed_cost_ok', '=' ,False), ('type', 'not in', ['product', 'consu', 'service'])]}"/>