Merge lp:~openerp-dev/openobject-addons/6.0-opw-51081-rha into lp:openobject-addons/6.0

[Rifakat Husen (OpenERP)]

Hello,

Fixed problem of creating extra procurement move when order point location is chained location and also do not consider of warehouse from order point when PO is generated while running scheduler.

Thanks for review.
Let me know if any correction needed.

Regards,
Rifakat

Unmerged revisions

4973. By Rifakat Husen (OpenERP) on 2011-12-22

[FIX] procurement: fix problems raising from scheduler
* creating extra move from scheduler
* do not consider warehouse of order point for PO creating from procurement

=== modified file 'procurement/procurement.py'
--- procurement/procurement.py	2011-03-10 09:52:41 +0000
+++ procurement/procurement.py	2011-12-22 10:59:53 +0000
@@ -340,7 +340,7 @@
                         'company_id': procurement.company_id.id,
                         'auto_validate': True,
                     })
-                    move_obj.action_confirm(cr, uid, [id], context=context)
+                    move_obj.write(cr, uid, [id], {'state': 'confirmed'}, context=context)
                     self.write(cr, uid, [procurement.id], {'move_id': id, 'close_move': 1})
         self.write(cr, uid, ids, {'state': 'confirmed', 'message': ''})
         return True

=== modified file 'procurement/schedulers.py'
--- procurement/schedulers.py	2011-01-14 00:11:01 +0000
+++ procurement/schedulers.py	2011-12-22 10:59:53 +0000
@@ -266,10 +266,10 @@
                         })
                         wf_service.trg_validate(uid, 'procurement.order', proc_id,
                                 'button_confirm', cr)
-                        wf_service.trg_validate(uid, 'procurement.order', proc_id,
-                                'button_check', cr)
                         orderpoint_obj.write(cr, uid, [op.id],
                                 {'procurement_id': proc_id}, context=context)
+                        wf_service.trg_validate(uid, 'procurement.order', proc_id,
+                                'button_check', cr)
             offset += len(ids)
             if use_new_cursor:
                 cr.commit()

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-12-06 16:23:01 +0000
+++ purchase/purchase.py	2011-12-22 10:59:53 +0000
@@ -816,6 +816,9 @@
             context.update({'lang': partner.lang, 'partner_id': partner_id})
 
             product = prod_obj.browse(cr, uid, procurement.product_id.id, context=context)
+            order_point_id = self.pool.get('stock.warehouse.orderpoint').search(cr, uid, [('procurement_id','=', procurement.id)])
+            if order_point_id:
+                order_point_warehouse_id = self.pool.get('stock.warehouse.orderpoint').browse(cr, uid, order_point_id[0], context=context).warehouse_id.id
 
             line = {
                 'name': product.partner_ref,
@@ -841,7 +844,8 @@
                 'pricelist_id': pricelist_id,
                 'order_line': [(0,0,line)],
                 'company_id': procurement.company_id.id,
-                'fiscal_position': partner.property_account_position and partner.property_account_position.id or False
+                'fiscal_position': partner.property_account_position and partner.property_account_position.id or False,
+                'warehouse_id': order_point_warehouse_id or False
             })
             res[procurement.id] = purchase_id
             self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': purchase_id})