From 2afd749e32a6cd0cc12b577762519115b87592e9 Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Tue, 30 Aug 2011 14:21:36 +0530
Subject: [PATCH 1/3] [FIX] STOCK:Partial Picking Wizard - Non-available move
 lines are not shown in partial picking

lp bug: https://launchpad.net/bugs/833770 fixed

bzr revid: aag@tinyerp.com-20110830085136-g4yx1c0lmksqvm23
---
 addons/stock/wizard/stock_partial_picking.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 421bcae10ba..c57f23a1434 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -67,7 +67,8 @@ class stock_partial_picking(osv.osv_memory):
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
                     continue
-                result.append(self.__create_partial_picking_memory(m, pick_type))
+                if m.state == 'assigned':
+                    result.append(self.__create_partial_picking_memory(m, pick_type))
                 
         if 'product_moves_in' in fields:
             res.update({'product_moves_in': result})
@@ -101,7 +102,6 @@ class stock_partial_picking(osv.osv_memory):
         _moves_fields.update({
                             'product_moves_' + picking_type: {'relation': 'stock.move.memory.'+picking_type, 'type' : 'one2many', 'string' : 'Product Moves'}, 
                             })
-
         _moves_arch_lst += """
                 <separator string="" colspan="4" />
                 <label string="" colspan="2"/>

From e09b1ac9e40fdbb6e3c15c18fea3aaa4a09a1ff5 Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Wed, 19 Oct 2011 12:09:51 +0530
Subject: [PATCH 2/3] [REM] stock:Remove conflict

bzr revid: aag@tinyerp.com-20111019063951-zitfegd2903a7zrr
---
 addons/stock/wizard/stock_partial_picking.py | 37 --------------------
 1 file changed, 37 deletions(-)

diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 919316d6975..3580b21035d 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -72,42 +72,6 @@ class stock_partial_picking(osv.osv_memory):
         """Returns product cost and currency ID for the given move, suited for re-computing
            the average product cost.
         
-<<<<<<< TREE
-        _moves_arch_lst = """<form string="%s">
-                        <field name="date" invisible="1"/>
-                        <separator colspan="4" string="%s"/>
-                        <field name="%s" colspan="4" nolabel="1" mode="tree,form" width="550" height="200" ></field>
-                        """ % (_('Process Document'), _('Products'), "product_moves_" + picking_type)
-        _moves_fields = result['fields']
-
-        # add field related to picking type only
-        _moves_fields.update({
-                            'product_moves_' + picking_type: {'relation': 'stock.move.memory.'+picking_type, 'type' : 'one2many', 'string' : 'Product Moves'}, 
-                            })
-        _moves_arch_lst += """
-                <separator string="" colspan="4" />
-                <label string="" colspan="2"/>
-                <group col="2" colspan="2">
-                <button icon='gtk-cancel' special="cancel"
-                    string="_Cancel" />
-                <button name="do_partial" string="_Validate"
-                    colspan="1" type="object" icon="gtk-go-forward" />
-            </group>
-        </form>"""
-        result['arch'] = _moves_arch_lst
-        result['fields'] = _moves_fields
-        return result
-
-    def __create_partial_picking_memory(self, picking, pick_type):
-        move_memory = {
-            'product_id' : picking.product_id.id, 
-            'quantity' : picking.product_qty, 
-            'product_uom' : picking.product_uom.id, 
-            'prodlot_id' : picking.prodlot_id.id, 
-            'move_id' : picking.id,
-            'location_id' : picking.location_id.id, 
-            'location_dest_id' : picking.location_dest_id.id,  
-=======
            :return: map of the form::
 
                 {'cost': 123.34,
@@ -130,7 +94,6 @@ class stock_partial_picking(osv.osv_memory):
             'move_id' : move.id,
             'location_id' : move.location_id.id,
             'location_dest_id' : move.location_dest_id.id,
->>>>>>> MERGE-SOURCE
         }
         if move.picking_id.type == 'in' and move.product_id.cost_method == 'average':
             partial_move.update(update_cost=True, **self._product_cost_for_average_update(cr, uid, move))

From ff4c7238af820322cd8dd596ceeace8349f1e3d7 Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Wed, 19 Oct 2011 14:23:26 +0530
Subject: [PATCH 3/3] [FIX] STOCK:Partial Picking Wizard - Non-available move
 lines are not shown in partial picking

lp bug: https://launchpad.net/bugs/833770 fixed

bzr revid: aag@tinyerp.com-20111019085326-j1o96lulwa42dfr2
---
 addons/stock/wizard/stock_partial_picking.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 3580b21035d..dd810ae7182 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -62,7 +62,7 @@ class stock_partial_picking(osv.osv_memory):
             res.update(picking_id=picking_id)
         if 'move_ids' in fields:
             picking = self.pool.get('stock.picking').browse(cr, uid, picking_id, context=context)
-            moves = [self._partial_move_for(cr, uid, m) for m in picking.move_lines if m.state not in ('done','cancel')]
+            moves = [self._partial_move_for(cr, uid, m) for m in picking.move_lines if m.state == 'assigned']
             res.update(move_ids=moves)
         if 'date' in fields:
             res.update(date=time.strftime(DEFAULT_SERVER_DATETIME_FORMAT))