[IMP]: product: Improved reference of demo product xml_id from static names to number...
[odoo/odoo.git] / addons / stock / stock_view.xml
index 3a48598..d2a7c2d 100644 (file)
             <field name="model">stock.inventory.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock Inventory Lines">
-                    <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)" select="1" 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"/>
-                    <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
+                <form string="Stock Inventory Lines" version="7.0">
+                    <group col="4">
+                        <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"/>
+                        <field domain="[('usage','=','internal')]" name="location_id"/>
                         <button name="%(stock.action_view_stock_inventory_line_split)d"
-                            string="Split inventory lines" groups="stock.group_inventory_valuation"
+                            string="Split Inventory Line" groups="stock.group_inventory_valuation"
                             type="action" icon="terp-stock_effects-object-colorize"/>
+                    </group>
                 </form>
             </field>
         </record>
             <field name="arch" type="xml">
                 <search string="Search Inventory">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Inventory Reference"/>
+                        <separator orientation="vertical"/>
                         <field name="date"/>
+                        <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
             <field name="model">stock.inventory</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Physical Inventory" version="7.0">
                 <header>
                     <button name="action_confirm" states="draft" string="Confirm Inventory" type="object"/>
                     <button name="action_done" states="confirm" string="Validate Inventory" type="object"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object"/>
-                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
-                <sheet string="Physical Inventory" layout="auto">
-                <group class="oe_form_header">
-                    <field name="name" placeholder="Annual invetory 2013"/>
-                    <field name="date"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <notebook colspan="4">
+                <sheet>
+                    <div class="oe_title">
+                        <div class="oe_edit_only">
+                            <label for="name"  /> 
+                        </div>
+                        <h1>
+                            <field name="name" placeholder="Annual inventory"/>
+                        </h1>
+                    </div>
+                <group>
+                    <group>
+                        <field name="date"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                </group>
+                    <notebook>
                     <page string="General Informations">
-                        <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list">
+                        <field name="inventory_line_id">
                             <tree string="Products" editable="bottom">
                                 <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')]"/>
                                     type="action" icon="terp-stock_effects-object-colorize" states="draft,confirm"/>
                                 <field name="state" invisible="True"/>
                             </tree>
-                            <form string="Products ">
-                                <field domain="[('usage','=','internal')]" name="location_id"/>
-                                <newline/>
-                                <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"/>
-                                <group colspan="2" col="4">
-                                <field name="prod_lot_id" groups="stock.group_production_lot"/>
+                            <form string="Products" version="7.0">
+                                <group col="4">
+                                    <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"/>
                             </form>
                         </field>
                     </page><page string="Posted Inventory">
-                             <field colspan="2" name="move_ids" nolabel="1" widget="one2many_list" context="{'inventory_id':active_id}" >
-                                <tree string="Stock Moves">
-                                    <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="prodlot_id" groups="stock.group_production_lot"/>
-                                     <button name="%(track_line)d" string="Split in serial numbers" type="action"
-                                        icon="terp-stock_effects-object-colorize"
-                                        attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
-                                        states="draft,done,cancel"
-                                        context="{'inventory_id':parent.id}"
-                                        groups="stock.group_production_lot"/>
-                                     <field groups="stock.group_tracking_lot" name="tracking_id"/>
-                                     <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                        groups="stock.group_tracking_lot"
-                                        icon="terp-stock_effects-object-colorize"
-                                        context="{'inventory_id':parent.id}"
-                                        states="draft,done,cancel"/>
-                                    <field name="location_id" groups="stock.group_locations"/>
-                                    <field name="location_dest_id" groups="stock.group_locations"/>
-                                    <field name="date" string="Date"/>
-                                    <field name="state"  invisible="True"/>
-                                </tree>
-                             </field>
+                         <field name="move_ids" context="{'inventory_id':active_id}" >
+                            <tree string="Stock Moves">
+                                <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="prodlot_id" groups="stock.group_production_lot"/>
+                                 <button name="%(track_line)d" string="Split in serial numbers" type="action"
+                                    icon="terp-stock_effects-object-colorize"
+                                    attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
+                                    states="draft,done,cancel"
+                                    context="{'inventory_id':parent.id}"
+                                    groups="stock.group_production_lot"/>
+                                 <field groups="stock.group_tracking_lot" name="tracking_id"/>
+                                 <button name="%(split_into)d" string="Put in a new pack" type="action"
+                                    groups="stock.group_tracking_lot"
+                                    icon="terp-stock_effects-object-colorize"
+                                    context="{'inventory_id':parent.id}"
+                                    states="draft,done,cancel"/>
+                                <field name="location_id" groups="stock.group_locations"/>
+                                <field name="location_dest_id" groups="stock.group_locations"/>
+                                <field name="date" string="Date"/>
+                                <field name="state"  invisible="True"/>
+                            </tree>
+                         </field>
                     </page>
                     </notebook>
-                    </group>
                     </sheet>
                 </form>
             </field>
             <field name="model">stock.tracking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Packs">
-                    <group col="2" colspan="2" groups="product.group_stock_packaging">
-                        <separator string="Pack Identification" colspan="2"/>
-                        <field name="name"/>
-                        <field name="serial"/>
-                        <field name="date"/>
-                        <field name="active"/>
-                    </group>
-                    <group col="2" colspan="2" groups="stock.group_tracking_lot">
-                        <separator string="Traceability" colspan="4"/>
-                        <button name="action_traceability" icon="gtk-go-up" string="Upstream traceability" type="object"
-                             colspan="2"/>
-                        <button name="action_traceability" icon="gtk-go-down" string="Downstream traceability" type="object"
-                            context="{'type': 'move_history_ids'}" colspan="2"/>
+                <form string="Packs" version="7.0">
+                    <group>
+                        <group groups="product.group_stock_packaging" string="Pack Identification">
+                            <field name="name"/>
+                            <field name="serial"/>
+                            <field name="date"/>
+                            <field name="active"/>
+                        </group>
+                        <group groups="stock.group_tracking_lot" string="Traceability">
+                            <button name="action_traceability" icon="gtk-go-up" string="Upstream Traceability" type="object"
+                                 colspan="2"/>
+                            <button name="action_traceability" icon="gtk-go-down" string="Downstream Traceability" type="object"
+                                context="{'type': 'move_history_ids'}" colspan="2"/>
+                        </group>
                     </group>
-                    <notebook colspan="4">
-                        <page string="Stock Moves">
-                            <field colspan="2" name="move_ids" nolabel="1"/>
-                        </page>
-                    </notebook>
+                    <field name="move_ids"/>
                 </form>
             </field>
         </record>
             <field name="arch" type="xml">
                 <search string="Pack Search">
                     <group>
-                        <field name="name" />
-                        <field name="serial" />
+                        <field name="name" string="Pack" filter_domain="['|',('name','ilike',self),('serial','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="date" />
+                        <separator orientation="vertical"/>
                         <field name="active"/>
                     </group>
                 </search>
             <field name="model">stock.production.lot.revision</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Serial Number Revisions">
-                    <field colspan="4" name="name"/>
-                    <field colspan="2" name="indice"/>
-                    <field colspan="2" name="date"/>
-                    <newline/>
-                    <field name="author_id" readonly="1"/>
-                    <newline/>
-                    <separator string="Description" colspan="4"/>
-                    <field colspan="4" name="description" nolabel="1"/>
+                <form string="Serial Number Revisions" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="indice"/>
+                        <field name="date"/>
+                        <field name="author_id"/>
+                    </group>
+                    <separator string="Description"/>
+                    <field name="description"/>
                 </form>
             </field>
         </record>
             <field name="model">stock.production.lot</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Serial Number">
-                    <group col="4" colspan="2">
-                        <separator string="Serial Number Identification" colspan="4"/>
-                        <field name="product_id" colspan="4"/>
-                        <field name="prefix" colspan="2"/>
-                        <field name="name" colspan="2"/>
-                        <field name="ref" colspan="4"/>
-                        <field name="date" colspan="4"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Traceability" colspan="2"/>
-                        <field name="stock_available" colspan="2"/>
-                        <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"/>
+                <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"/>
+                            <field name="date"/>
+                        </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 colspan="4">
+                    <notebook>
                         <page string="Revisions">
-                            <field colspan="2" name="revisions" nolabel="1"/>
+                            <field name="revisions"/>
                         </page>
                         <page string="Stock Moves">
-                            <field colspan="2" name="move_ids" nolabel="1" widget="one2many_list">
+                            <field name="move_ids">
                                 <tree  string="Stock Moves">
                                     <field name="picking_id" string="Reference"/>
                                     <field name="origin"/>
             <field name="arch" type="xml">
                 <search string="Product Lots Filter">
                     <group>
+                        <field name="name" string="Product Lots" filter_domain="['|','|',('name','ilike',self),('prefix','ilike',self),('ref','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
                         <separator orientation="vertical"/>
-                        <field name="prefix"/>
-                        <field name="name"/>
-                        <field name="ref"/>
                         <field name="product_id"/>
-                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
             <field name="model">stock.location</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock Location">
-                    <group col="2" colspan="2">
-                        <separator string="Location" colspan="2"/>
-                        <field name="name"/>
-                        <field name="usage"/>
-                        <field name="location_id" groups="stock.group_locations"/>
-                    </group>
-                    <group col="4" colspan="2">
-                        <separator string="Additional Information" colspan="4"/>
-                        <field name="partner_id" colspan="4"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection" colspan="4"/>
-                        <field name="icon" colspan="4"/>
-                        <field name="scrap_location"/>
-                        <field name="active"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Chained Locations" colspan="2"/>
-                        <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 col="2" colspan="2">
-                        <separator string="Localization" colspan="2"/>
-                        <field name="posx"/>
-                        <field name="posy"/>
-                        <field name="posz"/>
-                        <separator string="Accounting Information" colspan="2"/>
-                        <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'))]}"/>
+                <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"/>
+                        </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" colspan="4"/>
-                    <field colspan="4" name="comment" nolabel="1"/>
+                    <separator string="Additional Information"/>
+                    <field name="comment"/>
                 </form>
             </field>
         </record>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Locations">
+                    <field name="name" string="Stock Locations"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="in_location"
                         string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations" />
                     <filter icon="terp-personal" name="customer"
                     <filter icon="terp-personal" name="supplier"
                         string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations" />
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="location_id" string="Parent Location"/>
                 </search>
             </field>
             <field name="model">stock.warehouse</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Warehouse">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="lot_input_id"/>
-                    <field name="lot_stock_id"/>
-                    <field name="lot_output_id"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
-                    <field name="partner_id"/>
+                <form string="Warehouse" version="7.0">
+                    <label for="name" class="oe_edit_only"/>
+                    <h1><field name="name"/></h1>
+                    <group>
+                        <group>
+                            <field name="lot_input_id"/>
+                            <field name="lot_stock_id"/>
+                            <field name="lot_output_id"/>
+                        </group>
+                        <group>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="partner_id"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
             <field name="type">form</field>
             <field eval="12" name="priority"/>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Internal Picking List" version="7.0">
                 <header>
                     <button name="draft_force_assign" states="draft" string="Confirm" type="object"/>
                     <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object"/>
                     <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" />
                     <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" />
                     <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
-                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </header>
-                <sheet string="Internal Picking List" layout="auto">
-                    <group colspan="4" col="6">
-                        <group colspan="4" col="4">
-                            <field name="name" readonly="1"/>
-                            <field name="origin" placeholder="PO0032"/>
-                            <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4"/>
-                            <field name="invoice_state" string="Invoice Control" groups="account.group_account_invoice"/>
+                <sheet>
+                    <label for="name" class="oe_edit_only"/>
+                    <h1>
+                        <field name="name" class="oe_inline"/>
+                        <span attr="{'invisible': [('origin','=',False)]}"> - </span>
+                        <field name="origin" placeholder="PO0032" class="oe_inline"/>
+                    </h1>
+                    <label for="partner_id" class="oe_edit_only"/>
+                    <h2>
+                        <field name="partner_id" on_change="onchange_partner_in(partner_id)"/>
+                    </h2>
+                    <group>
+                        <group>
                             <field name="backorder_id" readonly="1"/>
+                            <field name="invoice_state" string="Invoice Control" groups="account.group_account_invoice"/>
+                            <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
                         </group>
-                        <group colspan="2" col="2">
+                        <group>
                             <field name="date"/>
                             <field name="min_date" readonly="1"/>
-                            <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
                         </group>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Products">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': partner_id}">
+                            <field name="move_lines" context="{'address_in_id': partner_id}">
                                 <tree colors="grey:scrapped == True" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                         icon="terp-stock_effects-object-colorize"
                                         states="draft,assigned,confirmed"/>
                                     <field name="location_dest_id" groups="stock.group_locations"/>
-                                    <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                 </tree>
-                                <form string="Stock Moves">
-                                    <group colspan="2" col="4">
-                                        <separator colspan="4" string="Move Information"/>
-                                        <field name="name" invisible="1" colspan="4"/>
-                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)" colspan="4"/>
-                                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
-                                        <button name="%(stock.move_scrap)d"
-                                                string="Scrap" type="action"
-                                                icon="gtk-convert" context="{'scrap': True}"
-                                                states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" colspan="4"/>
-                                        <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
-                                        <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
-                                        <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
-                                    </group>
-
-                                    <group colspan="2" col="2" groups="stock.group_locations">
-                                        <separator string="Locations" colspan="2" />
-                                        <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                        <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
-                                    </group>
-
-                                    <group colspan="2" col="2">
-                                        <separator string="Dates" colspan="2" />
-                                        <field name="create_date" invisible="1"/>
-                                        <field name="date"/>
-                                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                                    </group>
-
-                                    <group colspan="2" col="4" groups="stock.group_tracking_lot">
-                                        <separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
-                                        <field name="tracking_id" groups="stock.group_tracking_lot"  colspan="3"/>
-                                        <button name="%(split_into)d" string="New Pack" type="action"
-                                              groups="product.group_stock_packaging"
-                                              icon="terp-stock_effects-object-colorize"
-                                              states="draft,assigned,confirmed"  colspan="1"/>
-                                        <field name="prodlot_id" groups="stock.group_production_lot"
-                                            context="{'location_id':location_id, 'product_id':product_id}"
-                                            domain="[('product_id','=?',product_id)]"
-                                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"  colspan="3"/>
-                                        <button name="%(track_line)d"
-                                            groups="stock.group_tracking_lot"
-                                            states="draft,waiting,confirmed,assigned"
-                                            string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
-                                    </group>
-                                    <label string="" colspan="4"/>
-                                    <field name="state"/>
-                                    <group col="4" colspan="2">
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
-                                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
+                                <form string="Stock Moves" version="7.0">
+                                    <header>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
+                                        <field name="state" widget="statusbar" status_visible="draft,assigned,done" />
+                                    </header>
+                                    <group>
+                                        <group string="Move Information">
+                                            <field name="name" invisible="1"/>
+                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                                            <label for="product_qty"/>
+                                            <div>
+                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
+                                                <button name="%(stock.move_scrap)d"
+                                                        string="Scrap" type="action"
+                                                        icon="gtk-convert" context="{'scrap': True}"
+                                                        states="draft,waiting,confirmed,assigned" colspan="1"/>
+                                            </div>
+                                            <label for="product_uos_qty" groups="product.group_uos"/>
+                                            <div>
+                                                <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
+                                                <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                            </div>
+                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
+                                        </group>
+
+                                        <group string="Dates">
+                                            <field name="create_date" invisible="1"/>
+                                            <field name="date"/>
+                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                                        </group>
+
+                                        <group string="Locations" groups="stock.group_locations">
+                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
+                                        </group>
+
+                                        <group groups="stock.group_tracking_lot" string="Traceability">
+                                            <label for="tracking_id"/>
+                                            <div>
+                                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
+                                                <button name="%(split_into)d" string="New Pack" type="action"
+                                                      groups="product.group_stock_packaging"
+                                                      icon="terp-stock_effects-object-colorize"
+                                                      states="draft,assigned,confirmed"/>
+                                            </div>
+
+                                            <label for="prodlot_id"/>
+                                            <div>
+                                                <field name="prodlot_id" groups="stock.group_production_lot"
+                                                    context="{'location_id':location_id, 'product_id':product_id}"
+                                                    domain="[('product_id','=?',product_id)]"
+                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
+                                                <button name="%(track_line)d"
+                                                    groups="stock.group_tracking_lot"
+                                                    states="draft,waiting,confirmed,assigned"
+                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            </div>
+                                        </group>
                                     </group>
                                 </form>
                             </field>
                         </page>
                         <page string="Additional info">
-                            <field name="auto_picking"/>
-                            <field name="date_done"/>
-                            <field name="move_type"/>
-                            <field name="type"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <group>
+                                <group>
+                                    <field name="move_type"/>
+                                    <field name="type"/>
+                                    <field name="auto_picking"/>
+                                </group>
+                                <group>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    <field name="date_done"/>
+                                </group>
+                            </group>
                         </page>
                         <page string="Notes">
-                            <field colspan="4" name="note" nolabel="1" placeholder="Quality test ok..."/>
+                            <field name="note" placeholder="Add an internal note..."/>
                         </page>
                     </notebook>
                 </sheet>
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
                     <group>
+                        <field name="name" string="Internal Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
                         <separator orientation="vertical"/>
-                        <field name="name"
-                            domain="[('name','ilike', self),('origin','ilike',self)]"/>
                         <field name="partner_id"/>
                         <field name="product_id"/>
                         <field name="stock_journal_id" widget="selection"/>
                     <field name="partner_id"/>
                     <field name="origin"/>
                     <field name="min_date"/>
+                    <field name="date"/>
                     <field name="backorder_id"/>
                     <field name="stock_journal_id" groups="account.group_account_user"/>
                     <field name="invoice_state"/>
                     <xpath expr="/form/header/field[@name='state']" position="replace">
                         <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                     </xpath>
-                    <xpath expr="/form/sheet/group/group/field[@name='partner_id']" position="replace">
+                    <xpath expr="//field[@name='partner_id']" position="replace">
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Customer"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <group>
+                        <field name="name" string="Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="origin"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/header/button[@name='%(act_stock_return_picking)d']" position="replace">
+                    <xpath expr="//button[@name='%(act_stock_return_picking)d']" position="replace">
                         <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" />
                     </xpath>
-                    <xpath expr="/form/header/button[@name='draft_validate']" position="replace">
+                    <xpath expr="//button[@name='draft_validate']" position="replace">
                         <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object"/>
                     </xpath>
-                    <xpath expr="/form/header/button[@name='action_process']" position="replace">
+                    <xpath expr="//button[@name='action_process']" position="replace">
                         <button name="action_process" states="assigned" string="Receive" type="object"/>
                     </xpath>
-                    <xpath expr="/form/sheet/group/group/field[@name='partner_id']" position="replace">
+                    <xpath expr="//field[@name='partner_id']" position="replace">
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
-                        <div class="oe_form_bottom">
+                        <div class="oe_bottom">
                             <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
                         </div>
                     </xpath>
             <field name="arch" type="xml">
                 <search string="Incoming Shipments">
                     <group>
+                        <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available" />
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <separator orientation="vertical"/>
                         <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
                         <separator orientation="vertical"/>
-                        <field name="name"
-                            domain="[('name','ilike',self),('origin','ilike',self)]"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="product_id"/>
                     </group>
             <field name="type">form</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Stock Moves" version="7.0">
                 <header>
                     <button name="action_confirm" states="draft" string="Process Later" type="object"/>
                     <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object"/>
                     <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
-                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                 </header>
-                <sheet string="Stock Moves" layout="auto">
-                    <group colspan="4" col="7">
-                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
-                        <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"/>
-                        <button name="%(stock.move_scrap)d"
-                                string="Scrap" type="action"
-                                icon="gtk-convert" context="{'scrap': True}"
-                                states="draft,waiting,confirmed,assigned" colspan="1"/>
-                        <newline/>
-                        <field name="location_id" groups="stock.group_locations"/>
-                        <field name="location_dest_id" groups="stock.group_locations"/>
-                        <field name="partner_id" context="{'contact_display':'partner'}"/>
-
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator colspan="2" string="Move Information"/>
-                        <field name="name" string="Reason"/>
-                        <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
-                        <field name="product_uos" groups="product.group_uos" colspan="4"/>
-                    </group>
-
-                    <group colspan="2" col="2">
-                        <separator string="Picking" colspan="2" />
-                        <field name="picking_id"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-
-                    <group colspan="2" col="2">
-                        <separator string="Dates" colspan="2" />
-                        <field name="create_date" groups="base.group_no_one" />
-                        <field name="date" groups="base.group_no_one" />
-                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                    </group>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
+                            <label for="product_qty"/>
+                            <div>
+                                <field name="product_qty"
+                                    on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"
+                                    class="oe_inline"/>
+                                <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
+                                <button name="%(stock.move_scrap)d"
+                                        string="Scrap" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned" colspan="1"/>
+                            </div>
+                            <label for="product_uso_qty" />
+                            <div>
+                                <field name="product_uos_qty" 
+                                    groups="product.group_uos" 
+                                    on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" 
+                                    class="oe_inline"/>
+                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
+                            </div>
+                            <field name="name" string="Reason"/>
+                        </group>
+                        <group>
+                            <field name="picking_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="location_id" groups="stock.group_locations"/>
+                            <field name="location_dest_id" groups="stock.group_locations"/>
+                            <field name="partner_id" context="{'contact_display':'partner'}"/>
+                            <field name="create_date" groups="base.group_no_one" />
+                            <field name="date" groups="base.group_no_one" />
+                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
 
-                    <group colspan="2" col="4">
-                        <separator string="Traceability" colspan="4"/>
-                        <field name="tracking_id" colspan="3" groups="stock.group_tracking_lot"/>
-                        <button name="%(split_into)d" string="New Pack" type="action"
-                              groups="product.group_stock_packaging"
-                              icon="terp-stock_effects-object-colorize"
-                              states="draft,assigned,confirmed" colspan="1"/>
-                        <field name="prodlot_id" groups="stock.group_production_lot"
-                            context="{'location_id':location_id, 'product_id':product_id}"
-                            domain="[('product_id','=?',product_id)]"
-                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
-                        <button name="%(track_line)d"
-                              groups="stock.group_tracking_lot"
-                              states="draft,waiting,confirmed,assigned"
-                              string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
+                        </group>
+                        <group>
+                            <label for="tracking_id"/>
+                            <div>
+                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
+                                <button name="%(split_into)d" string="New Pack" type="action"
+                                      groups="product.group_stock_packaging"
+                                      icon="terp-stock_effects-object-colorize"
+                                      states="draft,assigned,confirmed"/>
+                            </div>
+                            <label for="prodlot_id"/>
+                            <div>
+                                <field name="prodlot_id" groups="stock.group_production_lot"
+                                    context="{'location_id':location_id, 'product_id':product_id}"
+                                    domain="[('product_id','=?',product_id)]" class="oe_inline"
+                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
+                                <button name="%(track_line)d"
+                                    groups="stock.group_tracking_lot"
+                                    states="draft,waiting,confirmed,assigned"
+                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                            </div>
+                        </group>
                     </group>
                 </sheet>
                 </form>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
+                        <field name="origin" string="Stock Moves"/>
+                        <separator orientation="vertical" groups="base.group_no_one"/>
+                        <field name="date" groups="base.group_no_one"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
                         <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
                         <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
                         <separator orientation="vertical"/>
                         <field name="product_id"/>
                         <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
                         <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','ilike',self)]"/>
-                        <field name="date" groups="base.group_no_one"/>
-                        <field name="origin"/>
                         <field name="prodlot_id"/>
                     </group>
                     <newline/>
             <field name="type">form</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Receive Products" version="7.0">
                 <header>
                     <button name="action_confirm" states="draft" string="Process Later" type="object"/>
                     <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                 </header>
-                <sheet string="Receive Products" layout="auto">
-                    <group colspan="4" col="7">
+                <sheet>
+                <group>
+                    <group>
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
-                        <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"/>
-                        <button name="%(stock.move_scrap)d"
+                        <label for="product_qty"/>
+                        <div>
+                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
+                            <button name="%(stock.move_scrap)d"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
-                                states="draft,waiting,confirmed,assigned" colspan="1"/>
-                        <newline/>
-                        <field name="location_id" groups="stock.group_locations" />
-                        <field name="location_dest_id" groups="stock.group_locations"/>
-                        <field name="partner_id" groups="stock.group_locations"/>
-
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator colspan="2" string="Move Information"/>
+                                states="draft,waiting,confirmed,assigned"/>
+                        </div>
+                        <label for="product_uos_qty"/>
+                        <div>
+                            <field name="product_uos_qty" groups="product.group_uos" class="oe_inline"
+                                on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
+                            <field name="product_uos" groups="product.group_uos"/>
+                        </div>
                         <field name="name" string="Reason"/>
-                        <field name="product_uos_qty" groups="product.group_uos"  on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
-                        <field name="product_uos" groups="product.group_uos"/>
                     </group>
-
-                    <group colspan="2" col="2">
-                        <separator string="Picking" colspan="2" />
+                    <group>
                         <field name="picking_id"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-
-                    <group colspan="2" col="2">
-                        <separator string="Dates" colspan="2" />
+                        <field name="location_id" groups="stock.group_locations"/>
+                        <field name="location_dest_id" groups="stock.group_locations"/>
+                        <field name="partner_id" groups="stock.group_locations"/>
                         <field name="create_date" groups="base.group_no_one" />
                         <field name="date" groups="base.group_no_one" />
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                     </group>
 
-                    <group colspan="2" col="4">
-                        <separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
-                        <field name="tracking_id" colspan="3" groups="stock.group_tracking_lot"/>
-                        <button name="%(split_into)d" string="New Pack" type="action"
+                    <group>
+                        <label name="tracking_id"/>
+                        <div>
+                            <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
+                            <button name="%(split_into)d" string="New Pack" type="action"
                               groups="product.group_stock_packaging"
                               icon="terp-stock_effects-object-colorize"
                               states="draft,assigned,confirmed,done" colspan="1"/>
-                        <field name="prodlot_id" groups="stock.group_production_lot"
-                            context="{'location_id':location_id, 'product_id':product_id}"
-                            domain="[('product_id','=?',product_id)]"
-                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
-                        <button name="%(track_line)d"
-                              groups="stock.group_tracking_lot"
-                              states="draft,waiting,confirmed,assigned,done"
-                              string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
+                        </div>
+                        <label name="prodlot_id"/>
+                        <div>
+                            <field name="prodlot_id" groups="stock.group_production_lot"
+                                context="{'location_id':location_id, 'product_id':product_id}"
+                                domain="[('product_id','=?',product_id)]" class="oe_inline"
+                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
+                            <button name="%(track_line)d"
+                                  groups="stock.group_tracking_lot" class="oe_inline"
+                                  states="draft,waiting,confirmed,assigned,done"
+                                  string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                        </div>
                     </group>
+                </group>
                 </sheet>
                 </form>
             </field>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
+                        <field name="origin" string="Stock Moves"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
-                        <field name="origin"/>
                         <field name="product_id"/>
                         <field name="prodlot_id"/>
                     </group>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
-                        <filter icon="terp-gtk-go-back-rtl" name="receive" string=" Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
+                        <field name="origin" string="Stock Moves"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
                         <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
-                        <field name="origin"/>
                         <field name="product_id"/>
                         <field name="prodlot_id"/>
                     </group>
             <field name="model">stock.incoterms</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Incoterms">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="active" select="1"/>
+                <form string="Incoterms" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="active"/>
+                    </group>
                 </form>
             </field>
         </record>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Journal">
-                    <field name="name"/>
+                    <field name="name" string="Stock Journal"/>
+                    <separator orientation="vertical"/>
                     <field name="user_id"/>
                 </search>
             </field>
             <field name="model">stock.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock Journal">
-                    <field name="name"/>
-                    <field name="user_id"/>
+                <form string="Stock Journal" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="user_id"/>
+                    </group>
                 </form>
             </field>
         </record>