From f2ded428006670e45e7dd4c67fcc6bbd814e4837 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Mon, 26 Jul 2010 16:15:53 +0530 Subject: [PATCH 1/3] [FIX]: mrp: Fix log message for production order bzr revid: rpa@tinyerp.com-20100726104553-vme18hbsvfds3i1n --- addons/mrp/mrp.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index cb2010a7352..225856b1405 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -738,7 +738,8 @@ class mrp_production(osv.osv): wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, 'mrp.production', production_id, 'button_produce_done', cr) - message = str(production_qty) + " '[" + production.product_id.code + '] ' + production.product_id.name + _("' have been manufactured for ") + production.name + for (id, name) in self.pool.get('product.product').name_get(cr, uid, [production.product_id.id]): + message = str(production_qty) + ' ' + production.product_uom.name +" '" + name + _("' have been manufactured for ") + production.name self.log(cr, uid, production_id, message) return True From a069671a8aacdad098a635c39c10c5481a4ab397 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Mon, 26 Jul 2010 16:29:49 +0530 Subject: [PATCH 2/3] [FIX]: crm: Name in domain for base_action_rule bzr revid: rpa@tinyerp.com-20100726105949-fop8p9d2vdq6iwef --- addons/base_action_rule/base_action_rule.py | 2 ++ addons/crm/crm.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index df57bc86ce8..a80297e2b94 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -282,6 +282,8 @@ the rule to mark CC(mail to any other person defined in actions)."), ok = ok and (not action.trg_state_from or action.trg_state_from==obj.state) if state_to: ok = ok and (not action.trg_state_to or action.trg_state_to==state_to) + elif action.trg_state_to: + ok = False reg_name = action.regex_name result_name = True if reg_name: diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 478cd7b2986..2db380f1c93 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -429,7 +429,7 @@ class crm_case(object): rule_obj = self.pool.get('base.action.rule') model_obj = self.pool.get('ir.model') model_ids = model_obj.search(cr, uid, [('model','=',self._name)]) - rule_ids = rule_obj.search(cr, uid, [('name','=',model_ids[0])]) + rule_ids = rule_obj.search(cr, uid, [('model_id','=',model_ids[0])]) return rule_obj._action(cr, uid, rule_ids, cases, scrit=scrit, context=context) def format_body(self, body): From 248682874623c36a5b83302d6c13f363ecafaa77 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Mon, 26 Jul 2010 16:36:59 +0530 Subject: [PATCH 3/3] [FIX] Sale_order_dates : Corrected datetime library reference lp bug: https://launchpad.net/bugs/609042 fixed bzr revid: jvo@tinyerp.com-20100726110659-nhsuszom66idt7q6 --- addons/sale_order_dates/sale_order_dates.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py index c58e68bdbe7..ad36d7c582d 100644 --- a/addons/sale_order_dates/sale_order_dates.py +++ b/addons/sale_order_dates/sale_order_dates.py @@ -21,7 +21,9 @@ from osv import fields, osv import time -from mx import DateTime +from datetime import datetime +from dateutil.relativedelta import relativedelta + class sale_order_dates(osv.osv): _inherit = 'sale.order' _name = 'sale.order' @@ -45,7 +47,7 @@ class sale_order_dates(osv.osv): for order in self.browse(cr, uid, ids): dates_list = [] for line in order.order_line: - dt=DateTime.strptime(order.date_order, '%Y-%m-%d') + DateTime.RelativeDateTime(days=line.delay or 0.0) + dt = datetime.strptime(order.date_order, '%Y-%m-%d') + relativedelta(days=line.delay or 0.0) dt_s = dt.strftime('%Y-%m-%d') dates_list.append(dt_s) if dates_list: