From 8700b860cd5971ab0041de6be7d858e1025ffcbf Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 15 Nov 2011 11:29:06 +0530 Subject: [PATCH 1/4] [FIX] sale : Sale order can be confirmed without any sale lines defined lp bug: https://launchpad.net/bugs/890156 fixed bzr revid: mdi@tinyerp.com-20111115055906-q9kykhpouo2myqw8 --- addons/sale/sale.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 8963942dbff..7c0d5e0252c 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -619,6 +619,8 @@ class sale_order(osv.osv): def action_wait(self, cr, uid, ids, *args): for o in self.browse(cr, uid, ids): + if not o.order_line: + raise osv.except_osv(_('No Sale Order Lines !'), _('Please create sale order lines.')) if (o.order_policy == 'manual'): self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': time.strftime(DEFAULT_SERVER_DATE_FORMAT)}) else: From c28edd18625cfd5b866ee9dff86e353635a07599 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 16 Nov 2011 14:44:35 +0530 Subject: [PATCH 2/4] [IMP] sale : Sale order can be confirmed without any sale lines defined bzr revid: mdi@tinyerp.com-20111116091435-wmon99c4oibevr40 --- addons/sale/sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 7c0d5e0252c..3645aac84c7 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -620,7 +620,7 @@ class sale_order(osv.osv): def action_wait(self, cr, uid, ids, *args): for o in self.browse(cr, uid, ids): if not o.order_line: - raise osv.except_osv(_('No Sale Order Lines !'), _('Please create sale order lines.')) + raise osv.except_osv(_('Error !'),_('You cannot confirm a sale order without any lines.')) if (o.order_policy == 'manual'): self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': time.strftime(DEFAULT_SERVER_DATE_FORMAT)}) else: From fbfe0054a5614dba7bfecdb4b0bceeaaf5ffd47e Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 16 Nov 2011 14:50:39 +0530 Subject: [PATCH 3/4] [IMP] sale : Sale order can be confirmed without any sale lines defined bzr revid: mdi@tinyerp.com-20111116092039-vce0iye6pgsed5y7 --- addons/sale/sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 3645aac84c7..610f20b6c67 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -620,7 +620,7 @@ class sale_order(osv.osv): def action_wait(self, cr, uid, ids, *args): for o in self.browse(cr, uid, ids): if not o.order_line: - raise osv.except_osv(_('Error !'),_('You cannot confirm a sale order without any lines.')) + raise osv.except_osv(_('Error !'),_('You cannot confirm a sale order which has no line..')) if (o.order_policy == 'manual'): self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': time.strftime(DEFAULT_SERVER_DATE_FORMAT)}) else: From 2537f7b6ea2a156a738a286d8fb6061b3df39edb Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 16 Nov 2011 14:55:55 +0530 Subject: [PATCH 4/4] [IMP] Improve the error message bzr revid: mdi@tinyerp.com-20111116092555-k94x9cnpm4e5qsbp --- addons/sale/sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 610f20b6c67..7a854c9e927 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -620,7 +620,7 @@ class sale_order(osv.osv): def action_wait(self, cr, uid, ids, *args): for o in self.browse(cr, uid, ids): if not o.order_line: - raise osv.except_osv(_('Error !'),_('You cannot confirm a sale order which has no line..')) + raise osv.except_osv(_('Error !'),_('You cannot confirm a sale order which has no line.')) if (o.order_policy == 'manual'): self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': time.strftime(DEFAULT_SERVER_DATE_FORMAT)}) else: