From cd65644a18b04fb8c44c888956eba5499fc3962b Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 7 Apr 2009 08:26:45 +0200 Subject: [PATCH] bugfix_356697 bzr revid: fp@tinyerp.com-20090407062645-urhakz1f2jpznw03 --- addons/mrp/mrp.py | 7 ++++--- addons/mrp/schedulers.py | 2 +- addons/stock/stock_view.xml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 47d4081..303f849 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -1088,10 +1088,11 @@ class mrp_procurement(osv.osv): todo = [] todo2 = [] for proc in self.browse(cr, uid, ids): - if proc.move_id and proc.move_id.state=='waiting': - if proc.close_move: + if proc.close_move: + if proc.move_id.state not in ('done','cancel'): todo2.append(proc.move_id.id) - else: + else: + if proc.move_id and proc.move_id.state=='waiting': todo.append(proc.move_id.id) if len(todo2): self.pool.get('stock.move').action_cancel(cr, uid, todo2) diff --git a/addons/mrp/schedulers.py b/addons/mrp/schedulers.py index 510f9ec..14fbb12 100644 --- a/addons/mrp/schedulers.py +++ b/addons/mrp/schedulers.py @@ -151,7 +151,7 @@ class mrp_procurement(osv.osv): else: continue proc_id = proc_obj.create(cr, uid, { - 'name': 'PROC:Automatic OP for product:%s' % product.name, + 'name': 'Automatic OP: %s' % product.name, 'origin': 'SCHEDULER', 'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'), 'product_id': product.id, diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index c0c465a..65fa1fc 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1254,7 +1254,7 @@