From e01f21d04528a1b8daa2ce62cfba676362e1f4f0 Mon Sep 17 00:00:00 2001 From: mtr Date: Tue, 22 Jun 2010 15:09:41 +0530 Subject: [PATCH] [IMP] sale_delivery_report,sale,delivery:Improvements made as per the testing bzr revid: mtr@mtr-20100622093941-04w864f1c8dxh3u7 --- addons/delivery/delivery.py | 2 +- addons/sale/sale.py | 1 + .../{delivery_report.xml => sale_delivery_report.xml} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename addons/sale_delivery_report/{delivery_report.xml => sale_delivery_report.xml} (100%) diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py index 4b87e4c790e..f1fadd81bd4 100644 --- a/addons/delivery/delivery.py +++ b/addons/delivery/delivery.py @@ -149,7 +149,7 @@ class delivery_grid_line(osv.osv): 'name': fields.char('Name', size=32, required=True), 'grid_id': fields.many2one('delivery.grid', 'Grid',required=True), 'type': fields.selection([('weight','Weight'),('volume','Volume'),('wv','Weight * Volume'), ('price','Price')], 'Variable', required=True), - 'operator': fields.selection([('=','='),('<=','<='),('>=','>=')], 'Operator', required=True), + 'operator': fields.selection([('==','='),('<=','<='),('>=','>=')], 'Operator', required=True), 'max_value': fields.float('Maximum Value', required=True), 'price_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Price Type', required=True), 'variable_factor': fields.selection([('weight','Weight'),('volume','Volume'),('wv','Weight * Volume'), ('price','Price')], 'Variable Factor', required=True), diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 14282ecf355..7bc3b3fd5de 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -571,6 +571,7 @@ class sale_order(osv.osv): params = ', '.join(map(lambda x : str(x),product)) message = _('Sale order ') + " '" + o.name + "' "+ _("created on")+" '" +o.create_date + "' "+_("for")+" '" +params + "' "+_("is confirmed") self.log(cr, uid, id, message) + return True def procurement_lines_get(self, cr, uid, ids, *args): diff --git a/addons/sale_delivery_report/delivery_report.xml b/addons/sale_delivery_report/sale_delivery_report.xml similarity index 100% rename from addons/sale_delivery_report/delivery_report.xml rename to addons/sale_delivery_report/sale_delivery_report.xml