From f322e6303d3a1afb0956b82ea50546d3668cfc35 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Fri, 18 Apr 2014 14:14:26 +0200 Subject: [PATCH] [WIP] Fix orderpoint bzr revid: jco@openerp.com-20140418121426-bebr3h2l96hf1ro7 --- addons/stock/procurement.py | 1 + addons/stock/stock.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/stock/procurement.py b/addons/stock/procurement.py index b9d8a52b4c6..cf60f9646b7 100644 --- a/addons/stock/procurement.py +++ b/addons/stock/procurement.py @@ -386,6 +386,7 @@ class procurement_order(osv.osv): if op.product_id.type not in ('consu'): qty -= orderpoint_obj.subtract_procurements(cr, uid, op, context=context) + print op.product_id.name, qty if qty > 0: proc_id = procurement_obj.create(cr, uid, self._prepare_orderpoint_procurement(cr, uid, op, qty, context=context), diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 046b6a4944e..963f974173e 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -3860,11 +3860,13 @@ class stock_warehouse_orderpoint(osv.osv): ''' qty = 0 for procurement in orderpoint.procurement_ids: - if procurement in ('cancel', 'done'): + if procurement.state in ('cancel', 'done'): continue + qty2 = procurement.product_qty for move in procurement.move_ids: if move.state not in ('draft', 'cancel'): - qty += move.product_qty + qty2 -= move.product_qty + qty += qty2 return qty def _check_product_uom(self, cr, uid, ids, context=None):