diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 1c1ebca4e7a..6666c1da882 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -580,7 +580,14 @@
                                     <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="product_uom" string="UoM"/>
+                                    <field name="product_uos" groups="product.product_uos"/>
+                                    <button name="%(stock.move_scrap)d"
+                                        string="Scrap Products" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned" 
+                                        groups="base.group_extended"/>
+                                    <field name="scrapped" invisible="1"/>
                                     <field name="picking_id"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                     <button
@@ -604,12 +611,6 @@
                                     <field name="date_planned"/>
                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
-
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
-                                    <field name="scrapped" invisible="1"/>
                                 </tree>
                                 <form string="Stock Moves">
                                     <group colspan="2" col="2">
@@ -764,9 +765,21 @@
                                     <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" />
+                                    <field name="product_uom" string="UoM"/>
+                                    <field name="product_uos" groups="product.product_uos"/>
+                                   <button name="%(stock.move_scrap)d"
+                                        string="Scrap Products" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned" 
+                                        groups="base.group_extended"/>
+                                    <field name="scrapped" invisible="1"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
+                                    <button
+                                           name="%(stock.track_line)d"
+                                           string="Split in production lots"
+                                           type="action" icon="terp-stock_effects-object-colorize"
+                                           groups="base.group_extended"
+                                           states="draft,waiting,confirmed,assigned" />
                                     <field groups="base.group_extended" name="tracking_id"/>
                                     <button name="setlast_tracking" string="Put in current pack" type="object"
                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
@@ -780,19 +793,8 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
-                                     <field name="date_expected" string="Date Expected"/>
+                                    <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
-                                    <button
-                                           name="%(stock.track_line)d"
-                                           string="Split in production lots"
-                                           type="action" icon="terp-stock_effects-object-colorize"
-                                           groups="base.group_extended"
-                                           states="draft,waiting,confirmed,assigned" />
-                                   <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
-                                    <field name="scrapped" invisible="1"/>
                                 </tree>
                                 <form string="Stock Moves">
                                     <group colspan="2" col="2">
@@ -979,7 +981,8 @@
                                 <tree colors="grey:scrapped==True" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="UOM"/>
+                                    <field name="product_uom" string="UoM"/>
+                                    <field name="product_uos" groups="product.product_uos"/>
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
@@ -1191,13 +1194,18 @@
                                 <tree colors="grey:scrapped==True" string="Stock Moves">
                                     <field name="product_id" readonly="1"/>
                                     <field name="product_qty" readonly="1"/>
-                                    <field name="product_uom" string="UOM" readonly="1"/>
-                                    <field name="location_dest_id"/>
+                                    <field name="product_uom" string="UoM" readonly="1"/>
+                                    <button name="%(stock.move_scrap)d"
+                                        string="Scrap Products" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned" 
+                                        groups="base.group_extended"/>
+                                    <field name="scrapped" invisible="1"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
-                                      <button
+                                    <button
                                            name="%(stock.track_line)d"
-                                           string="Split in production ii lots"
-                                            groups="base.group_extended"
+                                           string="Split in production lots"
+                                           groups="base.group_extended"
                                            type="action" icon="terp-stock_effects-object-colorize"
                                            states="draft,waiting,confirmed,assigned" />
                                     <field name="tracking_id" groups="base.group_extended"/>
@@ -1209,12 +1217,8 @@
                                         groups="base.group_extended"
                                         icon="terp-stock_effects-object-colorize"
                                         states="draft,assigned,confirmed"/>
+                                    <field name="location_dest_id"/>
                                     <field name="state"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
-                                    <field name="scrapped" invisible="1"/>
                                 </tree>
                                 <form string="Stock Moves">
                                     <group colspan="2" col="2">
@@ -1398,19 +1402,23 @@
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancel');red:(state not in ('cancel','done')) and date_planned > current_date" string="Moves" editable="top">
-                    <field name="picking_id" select="1"/>
+                    <field name="picking_id" string="Reference"/>
+                    <field name="origin"/>
+                    <field name="partner_id"/>
                     <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="product_uos" groups="product.product_uos"/>
+                    <field name="product_uom" string="UoM"/>
+                    <field name="product_uos" groups="product.product_uos"/>
                     <button name="%(stock.move_scrap)d"
                         string="Scrap Products" type="action"
                         icon="gtk-convert" context="{'scrap': True}"
-                        states="draft,waiting,confirmed,assigned" />
+                        states="draft,waiting,confirmed,assigned"
+                        groups="base.group_extended"/>
                     <field name="prodlot_id" groups="base.group_extended"/>
-                    <button name="%(track_line)d" string="Split in Production Lots" type="action"
-                        icon="gtk-justify-fill"
-                       states="draft,waiting,confirmed,assigned,done"
+                    <button name="%(track_line)d" string="Split in production lots" type="action"
+                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
+                        states="draft,waiting,confirmed,assigned,done"
+                        context="{'default_use_exist': picking_id.type=='in'}"
                         groups="base.group_extended"/>
                     <field groups="base.group_extended" name="tracking_id"/>
                     <button name="setlast_tracking" string="Put in current pack" type="object"
@@ -1561,7 +1569,7 @@
                 <tree colors="grey:state in ('cancel')" string="Moves">
                     <field name="picking_id" string="Reference"/>
                     <field name="origin"/>
-                    <field name="partner_id" string="Supplier"/>
+                    <field name="partner_id" string="Partner"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
                     <field name="product_uom" string="UoM"/>
@@ -1587,7 +1595,8 @@
                         states="draft,assigned,confirmed,done"/>
                     <field name="date_planned"/>
                     <field name="state"/>
-                    <button name="%(action_partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/>
+                    <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
+                    <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
                     <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
                 </tree>
             </field>