From f4e7105eb6083f40a2771d41719c90413017090a Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Thu, 21 Aug 2014 11:37:40 +0200
Subject: [PATCH] [IMP] Usability improvements by clarifying texts

---
 addons/stock/stock_view.xml                   |  4 +-
 .../stock/wizard/stock_transfer_details.xml   | 70 +++++++++++--------
 addons/stock_account/stock_account_view.xml   |  2 +-
 3 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 623e17b9d22..8d63e194dcd 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -688,7 +688,9 @@
                                     <field name="result_package_id" groups="stock.group_tracking_lot"/>
                                 </tree>
                             </field>
-                            <label class="oe_grey" string="Setting a product and a source package will result in a partial unpack of the source package (products will be taken out from that package). Set a source package without any product to move it as a whole."/>
+                            <p class="oe_grey" groups="stock.group_tracking_lot">
+                            If there is no product but a source package, this means the source package was moved entirely.  If there is a product and a source package, the product was taken from the source package.  
+                            </p>
                         </page>
                         <page string="Additional Info">
                             <group string="General Informations">
diff --git a/addons/stock/wizard/stock_transfer_details.xml b/addons/stock/wizard/stock_transfer_details.xml
index 92ddd7bdef7..c4528a0439f 100644
--- a/addons/stock/wizard/stock_transfer_details.xml
+++ b/addons/stock/wizard/stock_transfer_details.xml
@@ -8,34 +8,48 @@
                 <form string="Transfer details" version="7">
                     <field name="picking_source_location_id" invisible="True"/>
                     <field name="picking_destination_location_id" invisible="True"/>
-                    <field name="item_ids"
-                        context="{'default_sourceloc_id':picking_source_location_id,
-                                  'default_destinationloc_id':picking_destination_location_id}">
-                        <tree string="Inventory Details" editable="bottom" >
-                            <field name="package_id" groups="stock.group_tracking_lot"/>
-                            <field name="product_id" required="True"  context="{'uom':product_uom_id}" on_change="product_id_change(product_id,product_uom_id,context)"/>
-                            <field name="quantity"/>
-                            <button name="split_quantities" string="Split" type="object" icon="STOCK_PREFERENCES" attrs="{'invisible': [('quantity', '=', 1)]}"/>
-                            <field name="product_uom_id" options="{&quot;no_open&quot;: True}" groups="product.group_uom"/>
-                            <field name="sourceloc_id" domain="[('id', 'child_of', parent.picking_source_location_id)]"/>
-                            <field name="destinationloc_id" domain="[('id', 'child_of', parent.picking_destination_location_id)]"/>
-                            <field name="result_package_id" groups="stock.group_tracking_lot" context="{'location_id': destinationloc_id}"/>
-                            <button name="put_in_pack" string="Pack" type="object" icon="terp-product" attrs="{'invisible': [('result_package_id', '!=', False)]}" groups="stock.group_tracking_lot"/>
-                            <field name="lot_id" groups="stock.group_production_lot" domain="[('product_id','=?', product_id)]" context="{'product_id': product_id}"/>
-                        </tree>
-                    </field>
-                    <label class="oe_grey" string="Setting a product and a source package will result in a partial unpack of the source package (products will be taken out from that package)."/>
-                    <field name="packop_ids" groups="stock.group_tracking_lot"
-                        context="{'default_sourceloc_id':picking_source_location_id,
-                                  'default_destinationloc_id':picking_destination_location_id}">
-                        <tree editable="bottom">
-                            <field name="package_id" required="True" on_change="source_package_change(package_id)"/>
-                            <field name="sourceloc_id" domain="[('id', 'child_of', parent.picking_source_location_id)]"/>
-                            <field name="destinationloc_id" domain="[('id', 'child_of', parent.picking_destination_location_id)]"/>
-                            <field name="result_package_id"/>
-                            <button name="put_in_pack" string="Pack" type="object" icon="terp-product" attrs="{'invisible': [('result_package_id', '!=', False)]}"/>
-                        </tree>
-                    </field>
+                    <group string="Products To Move">
+                        <div class="oe_grey" groups="stock.group_tracking_lot">
+                            Setting a product and a source package means that the product will be taken
+                            out of the package.  
+                        </div>
+                    </group>
+                    <group>
+                        <field name="item_ids"
+                            context="{'default_sourceloc_id':picking_source_location_id,
+                                      'default_destinationloc_id':picking_destination_location_id}" nolabel="1">
+                            <tree string="Inventory Details" editable="bottom" >
+                                <field name="package_id" groups="stock.group_tracking_lot"/>
+                                <field name="product_id" required="True"  context="{'uom':product_uom_id}" on_change="product_id_change(product_id,product_uom_id,context)"/>
+                                <field name="quantity"/>
+                                <button name="split_quantities" string="Split" type="object" icon="STOCK_PREFERENCES" attrs="{'invisible': [('quantity', '=', 1)]}"/>
+                                <field name="product_uom_id" options="{&quot;no_open&quot;: True}" groups="product.group_uom"/>
+                                <field name="sourceloc_id" domain="[('id', 'child_of', parent.picking_source_location_id)]"/>
+                                <field name="destinationloc_id" domain="[('id', 'child_of', parent.picking_destination_location_id)]"/>
+                                <field name="result_package_id" groups="stock.group_tracking_lot" context="{'location_id': destinationloc_id}"/>
+                                <button name="put_in_pack" string="Pack" type="object" icon="terp-product" attrs="{'invisible': [('result_package_id', '!=', False)]}" groups="stock.group_tracking_lot"/>
+                                <field name="lot_id" groups="stock.group_production_lot" domain="[('product_id','=?', product_id)]" context="{'product_id': product_id}"/>
+                            </tree>
+                        </field>
+                    </group>
+                    <group string="Packages To Move" groups="stock.group_tracking_lot">
+                        <div class="oe_grey">
+                            The source package will be moved entirely.  If you specify a destination package, the source package will be put in the destination package.  
+                        </div>
+                    </group>
+                    <group>
+                        <field name="packop_ids" 
+                            context="{'default_sourceloc_id':picking_source_location_id,
+                                      'default_destinationloc_id':picking_destination_location_id}" nolabel="1">
+                            <tree editable="bottom">
+                                <field name="package_id" required="True" on_change="source_package_change(package_id)"/>
+                                <field name="sourceloc_id" domain="[('id', 'child_of', parent.picking_source_location_id)]"/>
+                                <field name="destinationloc_id" domain="[('id', 'child_of', parent.picking_destination_location_id)]"/>
+                                <field name="result_package_id"/>
+                                <button name="put_in_pack" string="Pack" type="object" icon="terp-product" attrs="{'invisible': [('result_package_id', '!=', False)]}"/>
+                            </tree>
+                        </field>
+                    </group>
                     <footer>
                         <button name="do_detailed_transfer" string="_Apply" type="object" class="oe_highlight"/>
                         or
diff --git a/addons/stock_account/stock_account_view.xml b/addons/stock_account/stock_account_view.xml
index 4f8c2122e55..a35a75144bc 100644
--- a/addons/stock_account/stock_account_view.xml
+++ b/addons/stock_account/stock_account_view.xml
@@ -31,7 +31,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//button[@name='do_partial_open_barcode']" position="after">
+                <xpath expr="//button[@name='do_unreserve']" position="after">
                     <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|',('state','&lt;&gt;','done'),('invoice_state','&lt;&gt;','2binvoiced')]}" type="action" class="oe_highlight" groups="base.group_user"/>
                 </xpath>
                 <xpath expr="//field[@name='move_type']" position="after">