From eef634b3dc0616bc3fba6f980f022e10afe32984 Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Mon, 17 Sep 2012 11:51:00 +0530 Subject: [PATCH] [IMP]: Improve sale stock action_wait method bzr revid: atp@tinyerp.com-20120917062100-pb6msmh01t4kirca --- addons/sale/sale.py | 2 ++ addons/sale_stock/sale_stock.py | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 08fbeb87f02..1a17a389a9b 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -594,6 +594,8 @@ class sale_order(osv.osv): noprod = self.test_no_product(cr, uid, o, context) if (o.order_policy == 'manual') or noprod: self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': fields.date.context_today(self, cr, uid, context=context)}) + else: + self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': fields.date.context_today(self, cr, uid, context=context)}) self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line]) self.confirm_send_note(cr, uid, ids, context) return True diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index 29adf643d62..bd81f2b1902 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -217,8 +217,6 @@ class sale_order(osv.osv): noprod = self.test_no_product(cr, uid, o, context) if noprod and o.order_policy=='picking': self.write(cr, uid, [o.id], {'order_policy': 'manual'}, context=context) - if not (o.order_policy == 'manual') or not noprod: - self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': fields.date.context_today(self, cr, uid, context=context)}) return res def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False, context=None):