[Merge] Merge with trunk addons
[odoo/odoo.git] / addons / stock / stock_view.xml
index 33b62bf..9265350 100644 (file)
@@ -55,7 +55,7 @@
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="4">
+                    <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>
@@ -69,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="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>
             <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" groups="base.group_extended"/>
+                <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" groups="base.group_extended"/>
+                <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="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="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" 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?"/>
                     <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 ('done','cancel');black:state not in ('cancel','done')" 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="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"
                                             <separator colspan="4" string="Move Information"/>
                                             <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)" select="1"/>
+                                            <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 colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
+                                             <field name="date_expected" string="Date Expected"/>
                                             <field name="address_id" context="{'contact_display':'partner'}"/>
-                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <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)]"
                                             <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
-                                            <group>
+                                            <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 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="address_id"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
                         <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 ('done','cancel');black:state not in ('cancel','done')" 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="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"
                                             <separator colspan="4" string="Move Information"/>
                                             <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)"/>
+                                            <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 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="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)]"
                                             <field groups="base.group_extended" name="tracking_id"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
-                                            <group>
+                                            <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"/>
             <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" groups="base.group_extended"/>
                     <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 ('done','cancel');black:state not in ('cancel','done')" 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="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"
                                             <separator colspan="4" string="Move Information"/>
                                             <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)"/>
+                                            <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 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="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)]"
                                             <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"/>
-                                            <group>
+                                            <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 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" groups="base.group_extended"/>
                     <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 ('done','cancel');black:state not in ('cancel','done')" string="Stock Moves">
+                                <tree colors="grey:state in ('cancel')" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom" string="Product Unit of Measure"/>
                                             <separator colspan="4" string="Move Information"/>
                                             <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)"/>
+                                            <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" />
                                             <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" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
                                             <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"/>
-                                            <group>
+                                            <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=""/>
                         <separator orientation="vertical"/>
                         <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'}"/>
+                        <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'}"/>
                         <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'}"/>
-                        <separator orientation="vertical" />
-                        <filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/>
                     </group>
                 </search>
             </field>
                     <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="Order 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>
             <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="Unit Of Measure"/>
-                    <field name="picking_id" select="1"/>
-
+                    <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>
                             <group colspan="2" col="2">
                                 <separator colspan="2" string="Move Information"/>
                                 <field name="name"/>
-                                <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
+                                <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" />
                                 <separator string="Dates &amp; Priority" colspan="2" />
                                 <field name="date"/>
                                 <field name="date_planned"/>
+                                <field name="date_expected"/>
                                 <field name="priority"/>
                             </group>
 
             <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" name="Available" domain="[('state','=','assigned')]" help="Available"/>
+                        <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="product_id"/>
-                        <field name="location_id"/>
-                        <field name="location_dest_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 icon="terp-stock" string="Inventory" domain="[]" context="{'group_by':'name'}" />
-                       <filter icon="terp-stock" string="State" domain="[]" context="{'group_by':'state'}" />
-                        <filter string="Product" icon="terp-stock" domain="[]"  context="{'group_by':'product_id'}"/>
-                        <filter string="Source Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
-                        <filter string="Dest. Location" icon="terp-stock" domain="[]" context="{'group_by':'location_dest_id'}"/>
-                        <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+                        <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="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_uom" string="Uint Of Measure"/>
                     <field name="prodlot_id" string="Lot" groups="base.group_extended"/>
                     <field name="date_planned"/>
+                    <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"/>
                     <notebook colspan="4">
                         <page string="General Information">
                             <separator colspan="4" string="Move Information"/>
-                            <field name="location_id"/>
-                            <field name="location_dest_id"/>
-                            <field colspan="4" name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
+                            <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"/>
-                            <field name="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" groups="base.group_multi_company" widget="selection"/>
                             <field name="date_planned"/>
+                            <field name="date_expected"/>
                             <field name="priority"/>
                             <field name="address_id" context="{'contact_display':'partner'}"/>
                             <newline/>
                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                             <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"/>
                             <group col="5" colspan="2">
                     </group>
                     <newline/>
                     <group col='8' colspan='14' expand="1" string="Tracking Lots">
-                       <field name="tracking_id" context="{'tracking_id': self}" />
+                       <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>
             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"