[FIX]should not show remaining qty on move when picking is done + better name for...

bzr revid: csn@openerp.com-20140130163651-audc4ndjx4ysys3h

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 708f53d..00b53a4 100644 (file)
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1316,7 +1316,7 @@ class stock_move(osv.osv):
             if move.picking_id:
                 if move.picking_id.state in ('draft', 'confirmed', 'partially_available'):
                     info = info_available + info
-                if move.picking_id.pack_operation_exist:
+                if move.picking_id.pack_operation_exist and state != 'done':
                     info += info_remaining
             res[move.id] = info
         return res

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6173db1..ee9f171 100644 (file)
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -783,7 +783,7 @@
                     </group>
                     <notebook>
                         <page string="Products">
-                            <separator string="Expected Quantities" attrs="{'invisible': [('pack_operation_exist', '=', False)]}"/>
+                            <separator string="Stock Moves" attrs="{'invisible': [('pack_operation_exist', '=', False)]}"/>
                             <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'stock.view_move_picking_form', 'tree_view_ref':'view_move_picking_tree', 'default_picking_type_id': picking_type_id,'default_picking_id': active_id}"/>
                             <group>
                                 <group col="3">