From 0a158cf672aa145544eb4a9256e5ee30d7b807eb Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Wed, 18 Sep 2013 17:32:04 +0200
Subject: [PATCH] [IMP] Only do partial operations for available moves, domain
 on lot, fix group moves in purchase procurement group

bzr revid: jco@openerp.com-20130918153204-ettifcuet4sysbac
---
 addons/purchase/purchase.py | 2 +-
 addons/stock/stock.py       | 2 +-
 addons/stock/stock_view.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 4c0d0f16019..db93416abb5 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -739,7 +739,7 @@ class purchase_order(osv.osv):
         stock_move = self.pool.get('stock.move')
         
         new_group = False
-        if any([(x.group_id == False) for x in order_lines]):
+        if any([(not x.group_id) for x in order_lines]):
             new_group = self.pool.get("procurement.group").create(cr, uid, {'name':order.name, 'partner_id': order.partner_id.id}, context=context)
         
         
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 883248c1fa0..e8aee3931b2 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -831,7 +831,7 @@ class stock_picking(osv.osv):
                 #Find moves that correspond
                 if ops.product_id:
                     #TODO: Should have order such that things with lots and packings are searched first
-                    move_ids = move_obj.search(cr, uid, [('picking_id','=',picking.id), ('product_id', '=', ops.product_id.id), ('remaining_qty', '>', 0.0)], context=context)
+                    move_ids = move_obj.search(cr, uid, [('picking_id','=',picking.id), ('product_id', '=', ops.product_id.id), ('remaining_qty', '>', 0.0), ('state', '=', ['assigned'])], context=context)
                     qty_to_do = ops.product_qty
                     while qty_to_do > 0 and move_ids:
                         move = move_obj.browse(cr, uid, move_ids.pop(), context=context)
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2665ccd6b19..906b2129fe4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -597,7 +597,7 @@
                                 <tree editable="top">
                                     <field name="product_id"/>
                                     <field name="product_uom_id" groups="product.group_uom"/>
-                                    <field name="lot_id" groups="stock.group_production_lot"/>
+                                    <field name="lot_id" domain="[('product_id','=?', product_id)]" context="{'product_id': product_id}" groups="stock.group_production_lot"/>
                                     <field name="package_id" groups="stock.group_tracking_lot"/>
                                     <field name="owner_id" groups="stock.group_tracking_owner"/>
                                     <field name="product_qty" attrs="{'required': [('product_id', '!=', False)]}"/>