[Merge] Merge with trunk addons
[odoo/odoo.git] / addons / stock / stock_view.xml
index 512acab..9265350 100644 (file)
@@ -3,10 +3,10 @@
     <data>
         <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="2"/>
         <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
-        <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="3"/>
+        <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="4"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="6"/>
-        <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="2"/>
+        <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="3"/>
 
         <record id="stock_inventory_line_tree" model="ir.ui.view">
             <field name="name">stock.inventory.line.tree</field>
@@ -17,9 +17,9 @@
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
-                    <field name="prod_lot_id"/>
+                    <field name="prod_lot_id" groups="base.group_extended"/>
                     <button name="%(stock.action_view_stock_inventory_line_split)d"
-                            string="Split inventory lines"
+                            string="Split inventory lines" groups="base.group_extended"
                             type="action" icon="gtk-justify-fill"/>
                     <field name="location_id"/>
                 </tree>
                     <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
-                    <field name="prod_lot_id"/>
+                    <field name="prod_lot_id" groups="base.group_extended"/>
                     <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
                         <button name="%(stock.action_view_stock_inventory_line_split)d"
-                            string="Split inventory lines"
+                            string="Split inventory lines" groups="base.group_extended"
                             type="action" icon="gtk-justify-fill"/>
                 </form>
             </field>
             <field name="arch" type="xml">
                 <search string="Search Inventory">
                     <group col="10" colspan="4">
-                        <field name="name" select="1" />
-                        <field name="date" select="1" />
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <field name="name"/>
+                        <field name="date"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="4" col="4" groups="base.group_extended">
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Date" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
 
@@ -64,7 +69,7 @@
             <field name="model">stock.inventory</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Lot Inventory" colors="grey:state in ('done', 'cancel')">
+                <tree string="Lot Inventory" colors="grey:state in ('cancel')">
                     <field name="name"/>
                     <field name="date"/>
                     <field name="state"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Lot Inventory">
-                    <field name="name" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                    <field name="name"/>
+                    <field name="date"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <notebook colspan="4">
                     <page string="General Informations">
                         <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list">
                             <tree string="Inventory Lines" editable="bottom">
-                                <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
+                                <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
-                                <field name="prod_lot_id"/>
-                                <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
+                                <field name="prod_lot_id" groups="base.group_extended"/>
+                                <field colspan="4" domain="[('usage','=','internal')]" name="location_id"/>
                                 <field name="state" invisible="1"/>
                                 <button name="%(stock.action_view_stock_inventory_line_split)d"
-                                    string="Split inventory lines"
+                                    string="Split inventory lines" groups="base.group_extended"
                                     type="action" icon="gtk-justify-fill" states="draft"/>
                             </tree>
                             <form string="Inventory Lines">
-                                <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
+                                <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
-                                <field  domain="[('usage','=','internal')]" name="location_id" select="1"/>
-                                <field name="prod_lot_id"/>
+                                <field  domain="[('usage','=','internal')]" name="location_id"/>
+                                <field name="prod_lot_id" groups="base.group_extended"/>
                                 <group colspan="2" col="3">
                                     <button name="%(stock.action_view_stock_inventory_line_split)d"
-                                        string="Split inventory lines"
+                                        string="Split inventory lines" groups="base.group_extended"
                                         type="action" icon="gtk-justify-fill"/>
                                 </group>
                             </form>
                         </field>
-                    </page><page string="Posted Inventory">
+                    </page><page string="Posted Inventory" groups="base.group_extended">
                         <field colspan="4" name="move_ids" nolabel="1"/>
                     </page>
                     </notebook>
-                    <field name="state" select="1"/>
+                    <field name="state"/>
                     <group col="4" colspan="2">
                         <button name="action_done" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
                         <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-cancel"/>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_tracking_tree"/>
         </record>
-        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="4"/>
-        <menuitem action="action_tracking_form" id="menu_action_tracking_form" parent="menu_traceability"/>
+        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="2"/>
+        <menuitem action="action_tracking_form" id="menu_action_tracking_form"
+            groups="base.group_extended"
+            parent="menu_traceability"/>
 
         <record id="lot_line_tree" model="ir.ui.view">
             <field name="name">stock.tracking.tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree colors="grey:not active" string="Tracking Number">
-                    <field name="name" select="1"/>
-                    <field name="serial" select="1"/>
-                    <field name="date" select="1"/>
+                    <field name="name" />
+                    <field name="serial" />
+                    <field name="date" />
                 </tree>
             </field>
         </record>
                 <form string="Production Lot">
                     <notebook colspan="4">
                         <page string="Production Lot">
-                            <field name="name" select="1"/>
-                            <field name="ref" select="2"/>
-                            <field name="prefix" select="1"/>
-                            <field name="product_id" select="1"/>
+                            <field name="name"/>
+                            <field name="ref"/>
+                            <field name="prefix"/>
+                            <field name="product_id"/>
                             <field name="stock_available"/>
-                            <field name="date" select="2"/>
+                            <field name="date"/>
                             <field colspan="4" name="revisions" nolabel="1"/>
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
                         <filter icon="terp-stock" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
                         <separator orientation="vertical"/>
-                        <field name="prefix" select="1"/>
-                        <field name="name" select="1"/>
-                        <field name="ref" select="1"/>
-                        <field name="product_id" select="1"/>
-                        <field name="date" select="1"/>
+                        <field name="prefix"/>
+                        <field name="name"/>
+                        <field name="ref"/>
+                        <field name="product_id"/>
+                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
             <field name="search_view_id" ref="search_product_lot_filter" />
             <field name="context">{'full':'1',"search_default_available":1}</field>
         </record>
-        <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability"/>
+        <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability" groups="base.group_extended"/>
 
         #
         # Lot composition (history)
             <field name="type">tree</field>
             <field name="field_parent">move_history_ids</field>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Moves">
-                    <field name="product_id" select="1"/>
-                    <field name="product_qty" select="1"/>
-                    <field name="product_uom" select="1" string="UOM"/>
-                    <field name="prodlot_id" select="1"/>
-                    <field name="product_packaging" domain="[('product_id','=',product_id)]"/>
+                <tree colors="grey:state in ('cancel')" string="Moves">
+                    <field name="product_id" />
+                    <field name="product_qty" />
+                    <field name="product_uom"  string="UOM"/>
+                    <field name="prodlot_id"  groups="base.group_extended"/>
+                    <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
                     <field name="picking_id"/>
-                    <field name="location_id" select="1"/>
-                    <field name="location_dest_id" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="date_planned" select="1" string="Date"/>
+                    <field name="location_id" />
+                    <field name="location_dest_id" />
+                    <field name="date"/>
+                    <field name="date_planned" string="Date"/>
+                    <field name="date_expected" string="Date Expected"/>
                     <field name="state"/>
                 </tree>
             </field>
             <field name="type">tree</field>
             <field name="field_parent">move_history_ids2</field>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Moves">
-                    <field name="product_id" select="1"/>
-                    <field name="product_qty" select="1"/>
-                    <field name="product_uom" select="1" string="UOM"/>
-                    <field name="prodlot_id" select="1"/>
-                    <field name="product_packaging" domain="[('product_id','=',product_id)]"/>
+                <tree colors="grey:state in ('cancel')" string="Moves">
+                    <field name="product_id" />
+                    <field name="product_qty" />
+                    <field name="product_uom"  string="UOM"/>
+                    <field name="prodlot_id"  groups="base.group_extended"/>
+                    <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
                     <field name="picking_id"/>
-                    <field name="location_id" select="1"/>
-                    <field name="location_dest_id" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="date_planned" select="1" string="Date"/>
+                    <field name="location_id" />
+                    <field name="location_dest_id" />
+                    <field name="date" />
+                    <field name="date_planned" string="Date"/>
+                     <field name="date_expected" string="Date Expected"/>
                     <field name="state"/>
                 </tree>
             </field>
         </record>
 
         <!--wizard
-            id="action_lot2"
-            model="stock.production.lot"
-            name="stock.traceability.lot.upstream"
-            string="Upstream traceability"/-->
-
-        <!--wizard
             id="action_lot4"
             model="stock.production.lot"
             name="stock.traceability.lot.downstream"
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock location">
-                    <field name="name" select="1"/>
-                    <field name="active" select="2"/>
-                    <field name="usage" select="1"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                    <field name="account_id" select="1"/>
+                    <field name="name"/>
+                    <field name="active" groups="base.group_extended"/>
+                    <newline/>
+                    <field name="usage"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="account_id" groups="base.group_extended"/>
                     <field name="location_id"/>
                     <field name="address_id" context="{'contact_display':'partner'}"/>
-                    <field name="icon"/>
+                    <field name="icon" groups="base.group_extended"/>
+                    <field name="scrap_location"/>
                     <newline/>
-                    <group col="2" colspan="2">
+                    <group col="2" colspan="2" groups="base.group_extended">
                         <separator string="Chained Locations" colspan="2"/>
                         <field name="chained_location_type"/>
                         <field name="chained_location_id"/>
             </field>
         </record>
 
+        <record id="view_location_search" model="ir.ui.view">
+            <field name="name">stock.location.search</field>
+            <field name="model">stock.location</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Stock Locations">
+                    <filter icon="terp-stock" name="in_location"
+                        string="Internal" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
+                    <filter icon="terp-stock" name="customer"
+                        string="Customer" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
+                    <filter icon="terp-stock" name="supplier"
+                        string="Supplier" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                </search>
+            </field>
+        </record>
+
+
         <record id="view_location_tree2" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
             <field name="model">stock.location</field>
             <field name="type">tree</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
-                <tree string="Stock location" colors="blue:usage=='view';darkred:usage=='internal';black:usage not in ('view','internal')">
+                <tree string="Stock location" colors="blue:usage=='view';darkred:usage=='internal'">
                     <field name="complete_name"/>
                     <field name="usage"/>
                     <field name="stock_real" invisible="'product_id' not in context"/>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_location_tree2"/>
-            <field name="context">{'full':'1'}</field>
+            <field name="context">{'full':1, 'search_default_in_location':1}</field>
         </record>
         <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_stock_configuration" />
 
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_location_tree"/>
         </record>
-        <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_inventory_control" sequence="20"/>
+        <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_inventory_control" groups="base.group_extended" sequence="20"/>
 
         <record id="view_warehouse" model="ir.ui.view">
             <field name="name">stock.warehouse</field>
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
+                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="backorder_id"/>
+                    <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
+                    <field name="invoice_state"/>
                     <field name="state"/>
                     <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the picking.   Do you want to continue?"/>
             <field name="arch" type="xml">
                 <form string="Picking list">
                     <group colspan="4" col="6">
-                        <field name="name" select="1" readonly="1"/>
-                        <field name="address_id" select="1" context="{'contact_display' : 'partner'}"/>
-                        <field name="origin" select="2"/>
-                        <field name="backorder_id" select="2" readonly="1"/>
-                        <field name="date" />
-                        <field name="min_date" select="1"/>
+
+                        <field name="name" readonly="1"/>
+<!--                    <field name="address_id" context="{'contact_display' : 'partner'}" groups="base.group_extended"/>-->
+                        <field name="origin"/>
+
+                        <field name="backorder_id" groups="base.group_extended" readonly="1"/>
+                        <field name="date"/>
+                        <field name="min_date"/>
                         <field name="type"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                        <button name="%(act_stock_make_picking_wizard)d"
-                            states="confirmed,assigned"
-                            string="Make Picking"
-                            type="action"
-                            icon="gtk-go-forward"
-                            help="Make Picking" colspan="2"/>
-                        <button name="%(act_stock_return_picking)d"
-                            states="done"
-                            string="Return Picking"
-                            type="action"
-                            icon="gtk-go-back"
-                            help="Return Picking" colspan="2"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
-                                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
+                                <tree colors="grey:state in ('cancel')" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <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="UOM"/>
-                                    <field name="picking_id" select="1"/>
-                                    <field name="prodlot_id"/>
+                                    <field name="picking_id"/>
+                                    <field name="prodlot_id" groups="base.group_extended"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
+                                    <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                     <button
                                         name="%(stock.track_line)d"
                                     <notebook colspan="4">
                                         <page string="General Information">
                                             <separator colspan="4" string="Move Information"/>
-                                            <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
-                                            <field name="location_dest_id" select="1" domain="[('usage','=','internal')]"/>
-                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                            <field name="product_uom" select="1"/>
+                                            <field name="location_id" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)" select="1"/>
+                                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field name="product_uom"/>
                                             <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                             <field groups="product.group_uos" name="product_uos_qty"/>
-                                            <field colspan="4" invisible="1" name="name" select="1"/>
+                                            <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
-                                            <field name="address_id" select="1" context="{'contact_display':'partner'}"/>
-                                            <field groups="base.group_extended" name="product_packaging"/>
-                                            <field name="prodlot_id" select="2"
+                                             <field name="date_expected" string="Date Expected"/>
+                                            <field name="address_id" context="{'contact_display':'partner'}"/>
+                                            <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
+                                            <field name="prodlot_id" groups="base.group_extended"
                                                 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)"/>
-                                            <field groups="base.group_extended" name="tracking_id" select="2"/>
+                                            <field groups="base.group_extended" name="tracking_id"/>
                                             <newline/>
                                             <label/>
                                             <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                                             <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
                                             <separator colspan="4" string="Move State"/>
-                                            <field name="state" select="1"/>
-                                            <group>
+                                            <field name="state"/>
+                                            <group colspan="2">
                                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                                 <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-no"/>
                                                 <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                             </group>
                                         </page>
-                                        <page string="Return Picking History">
+                                        <page string="Return Picking History" groups="base.group_extended">
                                             <field name="move_stock_return_history" nolabel="1"/>
                                         </page>
                                     </notebook>
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="Other info" groups="base.group_extended">
-                            <field name="active" select="2"/>
+                            <field name="active"/>
                             <field name="auto_picking"/>
-                            <field name="invoice_state" select="2"/>
-                            <field name="date_done" select="2"/>
+                            <field name="invoice_state"/>
+                            <field name="date_done"/>
                             <newline/>
                             <field name="move_type"/>
                         </page>
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order"  />
                         <separator orientation="vertical"/>
-                        <field name="location_id" select="1"/>
-                        <field name="location_dest_id" select="1"/>
-                        <field name="name" select="1"/>
-                        <field name="address_id" select="1"/>
+                        <field name="location_id"/>
+                        <field name="location_dest_id"/>
+                        <field name="name"/>
+                        <field name="address_id"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
+                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="address_id" select="1"/>
-                    <field name="backorder_id"/>
+                    <field name="address_id"/>
+                    <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
-                    <field name="date" select="1"/>
-                    <field name="min_date" select="1"/>
-                    <field name="state" select="1"/>
+                    <field name="date"/>
+                    <field name="min_date"/>
+                    <field name="state"/>
                     <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Delivery"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the delivery.    Do you want to continue?"/>
                 </tree>
             <field name="arch" type="xml">
                 <form string="Picking list">
                     <group col="6" colspan="4">
-                        <field name="name" select="1" readonly="1"/>
-                        <field name="address_id" select="1"/>
-                        <field name="origin" select="2"/>
-                        <field name="backorder_id" select="2" readonly="1"/>
+                        <field name="name" readonly="1"/>
+                        <field name="address_id"/>
+                        <field name="origin"/>
+                        <field name="backorder_id" groups="base.group_extended" readonly="1"/>
                         <field name="date" />
-                        <field name="min_date" select="1"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                        <button name="%(act_stock_make_picking_wizard)d"
-                                states="assigned"
-                                string="Make Picking"
-                                type="action"
-                                icon="gtk-go-forward"
-                                help="Make Picking" colspan="2"/>
-                        <button name="%(act_stock_return_picking)d"
-                                states="done"
-                                string="Return Picking"
-                                type="action"
-                                icon="gtk-go-back"
-                                help="Return Picking" colspan="2"/>
+                        <field name="min_date"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                         <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
-                                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
+                                <tree colors="grey:state in ('cancel')" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <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="UOM"/>
-                                    <field name="picking_id" select="1"/>
-                                    <field name="prodlot_id"/>
+                                    <field name="picking_id" />
+                                    <field name="prodlot_id" groups="base.group_extended"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
+                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                     <button
                                            name="%(stock.track_line)d"
                                            string="Split in production lots"
                                            type="action" icon="gtk-justify-fill"
+                                           groups="base.group_extended"
                                            states="draft,waiting,confirmed,assigned" />
                                        <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                     <notebook colspan="4">
                                         <page string="General Information">
                                             <separator colspan="4" string="Move Information"/>
-                                            <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
-                                            <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                            <field name="product_uom" select="1"/>
+                                            <field name="location_id" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)"/>
+                                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field name="product_uom"/>
                                             <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                             <field groups="product.group_uos" name="product_uos_qty"/>
-                                            <field colspan="4" invisible="1" name="name" select="1"/>
+                                            <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
-                                            <field groups="base.group_extended" name="product_packaging"/>
-                                            <field name="prodlot_id" select="2"
+                                             <field name="date_expected"  string="Date Expected"/>
+                                            <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]"/>
+                                            <field name="prodlot_id" groups="base.group_extended"
                                                 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)"/>
-                                            <field groups="base.group_extended" name="tracking_id" select="1"/>
+                                            <field groups="base.group_extended" name="tracking_id"/>
                                             <separator colspan="4" string="Move State"/>
-                                            <field name="state" select="1"/>
-                                            <group>
+                                            <field name="state"/>
+                                            <group colspan="2">
                                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                                 <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
                                                 <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                         </page>
                         <page string="Other info" groups="base.group_extended">
                             <field name="auto_picking"/>
-                            <field name="active" select="2"/>
+                            <field name="active"/>
                             <newline/>
-                            <field name="date" select="1"/>
-                            <field name="date_done" select="2"/>
+                            <field name="date"/>
+                            <field name="date_done"/>
                             <field name="move_type"/>
                         </page>
                     </notebook>
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Back Order" domain="[('backorder_id','!=',False)]" help="Back Order"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="address_id" select="1"/>
-                        <field name="origin" select="1"/>
+                        <field name="name"/>
+                        <field name="address_id"/>
+                        <field name="origin"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
+                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
                     <field name="address_id"/>
-                    <field name="backorder_id"/>
+                    <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
             <field name="arch" type="xml">
                 <form string="Picking list">
                     <group col="6" colspan="4">
-                        <field name="address_id" select="2"/>
-                        <field name="min_date" select="2"/>
-                        <field name="name" select="1" readonly="1"/>
+                        <field name="address_id"/>
+                        <field name="min_date"/>
+                        <field name="name" readonly="1"/>
                         <field name="invoice_state"/>
-                        <field name="backorder_id" select="2" readonly="1"/>
-                        <field name="origin" select="2" readonly="1"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                        <button name="%(act_stock_make_picking_wizard)d"
-                                states="assigned"
-                                string="Make Picking"
-                                type="action"
-                                icon="gtk-go-forward"
-                                help="Make Picking" colspan="2"/>
-                        <button name="%(act_stock_return_picking)d"
-                                states="done"
-                                string="Return Picking"
-                                type="action"
-                                icon="gtk-go-back"
-                                help="Return Picking" colspan="2"/>
+                        <field name="backorder_id" readonly="1"/>
+                        <field name="origin" readonly="1"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
-                                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
+                                <tree colors="grey:state in ('cancel')" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <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="UOM"/>
-                                    <field name="picking_id" select="1"/>
-                                    <field name="prodlot_id"/>
+                                    <field name="picking_id"/>
+                                    <field name="prodlot_id" groups="base.group_extended"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
+                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                     <button
                                            name="%(stock.track_line)d"
                                            states="draft,waiting,confirmed,assigned" />
                                        <button
                                            name="%(stock.move_scrap)d"
-                                           string="D" type="action"
+                                           string="Scrap Products" type="action"
                                            icon="gtk-convert"
                                            states="draft,waiting,confirmed,assigned" />
                                 </tree>
                                     <notebook colspan="4">
                                          <page string="General Information">
                                             <separator colspan="4" string="Move Information"/>
-                                            <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
-                                            <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
-                                            <field name="product_uom" select="1"/>
+                                            <field name="location_id" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)"/>
+                                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
+                                            <field name="product_uom"/>
                                             <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                             <field groups="product.group_uos" name="product_uos_qty"/>
-                                            <field colspan="4" invisible="1" name="name" select="1"/>
+                                            <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
-                                            <field groups="base.group_extended" name="product_packaging"/>
-                                            <field name="prodlot_id" select="1"
+                                             <field name="date_expected"  string="Date Expected"/>
+                                            <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
+                                            <field name="prodlot_id" groups="base.group_extended"
                                                 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)"/>
-                                            <field groups="base.group_extended" name="tracking_id" select="1"/>
+                                            <field groups="base.group_extended" name="tracking_id"/>
                                             <label/>
                                             <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                                             <separator colspan="4" string="Move State"/>
-                                            <field name="state" select="1"/>
-                                            <group>
+                                            <field name="state"/>
+                                            <group colspan="2">
                                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object"  icon="gtk-jump-to"/>
                                                 <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"  icon="gtk-no"/>
                                                 <button name="action_cancel" states="assigned" string="Cancel" type="object"  icon="gtk-cancel"/>
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="Other info" groups="base.group_extended">
-                            <field name="active" select="2"/>
+                            <field name="active"/>
                             <field name="auto_picking"/>
                             <newline/>
-                            <field name="date" select="2"/>
-                            <field name="date_done" select="2"/>
+                            <field name="date"/>
+                            <field name="date_done"/>
                             <field name="move_type"/>
                         </page>
                     </notebook>
                         <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Orders"/>
                         <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="address_id" select="1"/>
-                        <field name="company_id" select="1" widget="selection"/>
+
+                        <field name="name"/>
+                        <field name="address_id" />
+<!--                        <field name="company_id" widget="selection"/>-->
+
                    </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
                     </group>
                 </search>
             </field>
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
+                <tree colors="blue:state in ('draft');grey:state in ('done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
                     <field name="address_id"/>
-                    <field name="backorder_id"/>
+                    <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
-                    <field name="invoice_state"/>
+                    <field name="invoice_state" groups="base.group_extended"/>
                     <field name="state"/>
                     <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-ok" help="Receive products"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
             <field name="arch" type="xml">
                 <form string="Input Picking List">
                     <group colspan="4" col="6">
-                        <field name="name" readonly="1" select="1"/>
-                        <field name="address_id" on_change="onchange_partner_in(address_id)" select="2" context="{'contact_display':'partner'}"/>
-                        <field name="origin" select="2"/>
-                        <field name="backorder_id" select="2" readonly="1"/>
+
+                        <field name="name" readonly="1"/>
+                        <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" />
+                        <field name="origin"/>
+                        <field name="backorder_id" readonly="1" groups="base.group_extended"/>
                         <field name="date"/>
-                        <field name="min_date" select="2" readonly="1"/>
-                        <field name="invoice_state" select="2" string="Invoice Control"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                        <button name="%(act_stock_make_picking_wizard)d"
-                                states="confirmed,assigned"
-                                string="Make Picking"
-                                type="action"
-                                icon="gtk-go-forward"
-                                help="Make Picking" colspan="2"/>
-                        <button name="%(act_stock_return_picking)d"
-                                states="done"
-                                string="Return Picking"
-                                type="action"
-                                icon="gtk-go-back"
-                                help="Return Picking" colspan="2"/>
+                        <field name="type"/>
+                        <field name="min_date" readonly="1"/>
+                        <field name="invoice_state" string="Invoice Control"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}">
-                                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
+                                <tree colors="grey:state in ('cancel')" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty"/>
-                                    <field name="product_uom"/>
+                                    <field name="product_uom" string="Product Unit of Measure"/>
                                     <field name="location_dest_id"/>
-                                    <field name="prodlot_id"/>
+                                    <field name="prodlot_id" groups="base.group_extended"/>
                                     <field name="state"/>
                                     <button
                                            name="%(stock.track_line)d"
                                     <notebook colspan="4">
                                         <page string="General Information">
                                             <separator colspan="4" string="Move Information"/>
-                                            <field name="location_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field domain="[('usage','=','internal')]" name="location_dest_id" select="1"/>
-                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                            <field name="product_uom" select="1"/>
+                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field domain="[('usage','=','internal')]" name="location_dest_id" />
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)"/>
+                                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field name="product_uom"/>
                                             <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                             <field groups="product.group_uos" name="product_uos_qty"/>
-                                            <field colspan="4" invisible="1" name="name" select="1"/>
+                                            <field colspan="4" invisible="1" name="name" />
                                             <field groups="base.group_extended" name="date_planned"/>
+                                             <field name="date_expected" groups="base.group_extended" string="Date Expected"/>
                                             <newline/>
                                             <newline/>
-                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
                                             <newline/>
-                                            <field name="prodlot_id" select="1"
+                                            <field name="prodlot_id" groups="base.group_extended"
                                                 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)"/>
-                                            <field groups="base.group_extended" name="tracking_id" select="1"/>
+                                            <field groups="base.group_extended" name="tracking_id"/>
                                             <newline/>
                                             <label/>
                                             <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                                             <separator colspan="4" string="Move State"/>
-                                            <field name="state" select="1"/>
-                                            <group>
+                                            <field name="state"/>
+                                            <group colspan="2">
                                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon=""/>
                                                 <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon=""/>
                                                 <button name="action_cancel" states="assigned" string="Cancel" type="object" icon=""/>
                 <search string="Input Picking List">
                     <group col="8" colspan="4">
                         <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" />
+                        <separator orientation="vertical" />
+                        <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" />
-                        <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="address_id" select="1"/>
-                        <field name="company_id" select="1" widget="selection" groups="base.group_multi_company" />
+                        <field name="name"/>
+                        <field name="address_id"/>
+                        <field name="origin"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company" />
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
+                        <filter icon="terp-stock" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical" />
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
-                        <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-                        <filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
                     </group>
                 </search>
             </field>
                         <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
                         <filter icon="terp-stock" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="origin" select="1"/>
-                        <field name="company_id" select="1" widget="selection"/>
+                        <field name="name"/>
+                        <field name="origin"/>
+                        <field name="company_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
-                        <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
                         <filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/>
                     </group>
                 </search>
             <field name="context">{'contact_display': 'partner',"search_default_confirmed":1}</field>
             <field name="search_view_id" ref="view_picking_internal_search"/>
         </record>
-        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
+        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" groups="base.group_extended" sequence="2"/>
 
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">stock.move.tree</field>
             <field name="type">tree</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('done', 'cancel');black:state not in ('done', 'cancel');red:date_planned > current_date" string="Moves">
-                    <field name="name" string="Move Name"/>
+                <tree colors="grey:state in ('cancel');red:(state not in ('cancel','done')) and date_planned > current_date" string="Moves">
+                    <field name="picking_id" select="1"/>
                     <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="UOM"/>
-                    <field name="picking_id" select="1"/>
-                    <field name="prodlot_id"/>
+                    <field name="product_uom" string="Unit Of Measure"/>
+                    <field name="prodlot_id" groups="base.group_extended"/>
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
                     <field name="date_planned"/>
+                    <field name="date_expected"/>
                     <field name="state"/>
                 </tree>
             </field>
                         <page string="General Information">
                             <group colspan="2" col="2">
                                 <separator colspan="2" string="Move Information"/>
-                                <field name="name" select="2"/>
-                                <field name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
-                                <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                <field name="product_uom" select="2"/>
-                                <field name="product_uos" select="2"/>
+                                <field name="name"/>
+                                <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_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" widget="selection"/>
+                                <field name="product_uos" groups="base.group_extended" />
                             </group>
 
                             <group colspan="2" col="2">
                                 <separator string="Locations &amp; Picking" colspan="2" />
-                                <field name="location_id" select="1"/>
-                                <field name="location_dest_id" select="1"/>
-                                <field name="picking_id" select="2"/>
-                                <field name="address_id" select="2" context="{'contact_display':'partner'}"/>
-                                <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                                <field name="location_id" widget="selection"/>
+                                <field name="location_dest_id" widget="selection"/>
+                                <field name="picking_id"/>
+                                <field name="address_id" context="{'contact_display':'partner'}"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </group>
 
                             <group colspan="2" col="2">
                                 <separator string="Dates &amp; Priority" colspan="2" />
                                 <field name="date"/>
                                 <field name="date_planned"/>
+                                <field name="date_expected"/>
                                 <field name="priority"/>
                             </group>
 
                             <group colspan="2" col="4">
                                 <separator string="Traceability" colspan="4" />
-                                <field name="tracking_id" select="1" colspan="4" />
-                                <field name="prodlot_id" select="2"
+                                <field name="tracking_id" colspan="4" />
+                                <field name="prodlot_id" groups="base.group_extended"
                                     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)"/>
                         </page>
                     </notebook>
                     <group col="6" colspan="4">
-                        <field name="state" select="1"/>
+                        <field name="state"/>
                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                         <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                         <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
             <field name="name">stock.move.search</field>
             <field name="model">stock.move</field>
             <field name="type">search</field>
-            <field eval="6" name="priority"/>
+            <field eval="3" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Available Moves"/>
-                        <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Moves"/>
-                        <filter icon="terp-stock" string="Waiting" domain="[('state','=','waiting')]" help="Waiting"/>
+                        <filter icon="terp-stock" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves"/>
+                        <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Future stock moves"/>
+                        <filter icon="terp-stock" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Future stock moves that are ready"/>
                         <separator orientation="vertical"/>
-                        <field name="location_id" select="1"/>
-                        <field name="location_dest_id" select="1"/>
-                        <field name="product_id" select="1"/>
+                        <field name="product_id"/>
+                        <field name="location_id" string="Location" domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
+                        <field name="address_id" string="Partner" context="{'contact_display':'partner'}" domain="[('picking_id.address_id','ilike',self)]"/>
+                        <field name="date_planned"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="Product" icon="terp-stock" domain="[]"  context="{'group_by':'product_id'}"/>
-                        <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
-                        <filter string="Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
-                        <filter string="Destination Location" icon="terp-stock" domain="[]" context="{'group_by':'location_dest_id'}"/>
+                        <filter string="Product" name="by_product" icon="terp-stock" domain="[]"  context="{'group_by':'product_id'}"/>
+                        <filter string="Lot" name="prodlot_id" icon="terp-stock" domain="[]"  context="{'group_by':'prodlot_id'}"/>
+                        <filter string="Packing" name="picking_id" icon="terp-stock" domain="[]"  context="{'group_by':'picking_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Source" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
+                        <filter string="Destination" icon="terp-stock" domain="[]" context="{'group_by':'location_dest_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-stock" string="State" domain="[]" context="{'group_by':'state'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Creation" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Expected" icon="terp-stock" domain="[]" context="{'group_by':'date_planned'}"/>
                     </group>
                 </search>
             </field>
         </record>
 
         <record id="action_move_form2" model="ir.actions.act_window">
-            <field name="name">All Moves</field>
+            <field name="name">Stock Moves</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_move_search"/>
+            <field name="context">{'search_default_Available':1}</field>
         </record>
         <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="1"/>
 
             <field name="type">tree</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel','done');black:state not in ('cancel','done')" string="Moves">
+                <tree colors="grey:state in ('cancel')" string="Moves">
                     <field name="picking_id" string="Reference"/>
                     <field name="origin" string="Latest Procurement"/>
                     <field name="partner_id" string="Supplier"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
-                    <field name="product_uom" string="UOM"/>
-                    <field name="prodlot_id" string="Lot"/>
+                    <field name="product_uom" string="Uint Of Measure"/>
+                    <field name="prodlot_id" string="Lot" groups="base.group_extended"/>
                     <field name="date_planned"/>
-                    <field name="backorder_id"/>
+                    <field name="date_expected"/>
+                    <field name="backorder_id" groups="base.group_extended"/>
                     <field name="state"/>
                     <button name="%(action_partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/>
+                    <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
                     <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
                 </tree>
             </field>
                     <notebook colspan="4">
                         <page string="General Information">
                             <separator colspan="4" string="Move Information"/>
-                            <field name="location_id" select="1"/>
-                            <field name="location_dest_id" select="1"/>
-                            <field colspan="4" name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
-                            <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                            <field name="product_uom" select="2"/>
-                            <field name="product_uos" select="2"/>
-                            <field colspan="4" name="name" select="2"/>
+                            <field name="location_id" widget="selection"/>
+                            <field name="location_dest_id" widget="selection"/>
+                            <field colspan="4" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)"/>
+                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                            <field name="product_uom" widget="selection"/>
+                            <field name="product_uos" widget="selection" groups="base.group_extended"/>
+                            <field colspan="4" name="name"/>
                             <field name="date"/>
-                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="date_planned"/>
+                            <field name="date_expected"/>
                             <field name="priority"/>
-                            <field name="address_id" select="2" context="{'contact_display':'partner'}"/>
+                            <field name="address_id" context="{'contact_display':'partner'}"/>
                             <newline/>
-                            <field name="picking_id" select="2"/>
+                            <field name="picking_id"/>
                             <newline/>
-                            <field name="prodlot_id" select="2"
+                            <field name="prodlot_id" groups="base.group_extended"
                                 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)"/>
-                            <field name="tracking_id" select="2"/>
+                            <field name="tracking_id"/>
                             <newline/>
-                            <label/>
-                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                            <group col="2" colspan="2">
+                                <label/>
+                                <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                            </group>
                             <separator colspan="4" string="Move State"/>
-                            <field name="state" select="1"/>
+                            <field name="state"/>
                             <group col="5" colspan="2">
                                 <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                 <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                         <filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
                         <filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
-                        <field name="origin" string="Latest Procurement" select="1"/>
-                        <field name="partner_id" string="Supplier" select="1"/>
+                        <field name="origin" string="Latest Procurement"/>
+                        <field name="partner_id" string="Supplier"/>
                         <field name="product_id"/>
                     </group>
                     <newline/>
+                    <group col='8' colspan='14' expand="1" string="Tracking Lots">
+                       <field name="tracking_id" context="{'tracking_lot': self}" />
+                    </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" icon="terp-stock" domain="[]" context="{'group_by':'date_expected'}" />
                     </group>
                 </search>
             </field>
             <field name="arch" type="xml">
                 <tree string="Incoterms">
                     <field name="code"/>
-                    <field colspan="4" name="name" select="1"/>
+                    <field colspan="4" name="name"/>
                 </tree>
             </field>
         </record>
             src_model="stock.location"/>
 
         <act_window
-            context="{'location': active_id}"
+            context="{'location': active_id, 'search_default_done': 1}"
             domain="[('product_id','=',active_id)]"
             id="act_product_stock_move_open"
-            name="All Stock Moves"
+            name="Stock Moves"
             res_model="stock.move"
             src_model="product.product"/>
 
             src_model="stock.move"/>
 
         <act_window
-            context="{'location': active_id}"
+            context="{'location': active_id, 'search_default_future': 1}"
             domain="[('product_id','=',active_id),('state','in',('waiting','confirmed','assigned'))]"
             id="act_product_stock_move_futur_open"
             name="Future Stock Moves"
             res_model="stock.move"
-            src_model="product.product"/>
+            src_model="product.product"
+            groups="base.group_extended"/>
 
         <record id="ir_act_product_location_open" model="ir.values">
             <field name="key2">tree_but_open</field>