From 11d6850f16c97c1cac53b4e68b459f749a796cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 1 Jun 2012 16:40:59 +0200 Subject: [PATCH] [CLEAN] Final code review and fixing before merging. bzr revid: tde@openerp.com-20120601144059-ut9922dquiip4c4u --- addons/crm_claim/crm_claim.py | 11 ++++------- addons/crm_fundraising/crm_fundraising.py | 3 ++- addons/crm_helpdesk/crm_helpdesk.py | 2 +- addons/mrp/procurement.py | 2 +- addons/procurement/procurement.py | 24 +++++++++-------------- addons/procurement/schedulers.py | 23 +++++++++++----------- 6 files changed, 29 insertions(+), 36 deletions(-) diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py index 7f634f4642c..808ad2e2055 100644 --- a/addons/crm_claim/crm_claim.py +++ b/addons/crm_claim/crm_claim.py @@ -246,15 +246,12 @@ class crm_claim(base_stage, osv.osv): return 'Claim' def create_send_note(self, cr, uid, ids, context=None): - msg = '%s has been created.' % (self.case_get_note_msg_prefix(cr, uid, ids, context=context)) - self.message_append_note(cr, uid, ids, body=msg, context=context) - return True + msg = _('Claim has been created.') + return self.message_append_note(cr, uid, ids, body=msg, context=context) def case_refuse_send_note(self, cr, uid, ids, context=None): - for id in ids: - msg = _('%s has been refused.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context)) - self.message_append_note(cr, uid, [id], body=msg, context=context) - return True + msg = _('Claim has been refused.') + return self.message_append_note(cr, uid, ids, body=msg, context=context) def stage_set_send_note(self, cr, uid, ids, stage_id, context=None): """ Override of the (void) default notification method. """ diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py index 359a8abb2d7..73f72979730 100644 --- a/addons/crm_fundraising/crm_fundraising.py +++ b/addons/crm_fundraising/crm_fundraising.py @@ -23,6 +23,7 @@ from base_status.base_stage import base_stage from crm import crm from crm import wizard from osv import fields, osv +from tools.translate import _ wizard.mail_compose_message.SUPPORTED_MODELS.append('crm.fundraising') @@ -151,7 +152,7 @@ class crm_fundraising(base_stage, osv.osv): return 'Fundraising' def create_send_note(self, cr, uid, ids, context=None): - msg = '%s has been created.' % (self.case_get_note_msg_prefix(cr, uid, ids, context=context)) + msg = _('Fundraising has been created.') self.message_append_note(cr, uid, ids, body=msg, context=context) return True diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py index 7a3d73e85f3..f0d98efebb3 100644 --- a/addons/crm_helpdesk/crm_helpdesk.py +++ b/addons/crm_helpdesk/crm_helpdesk.py @@ -154,7 +154,7 @@ class crm_helpdesk(base_state, osv.osv): return 'Case' def create_send_note(self, cr, uid, ids, context=None): - msg = '%s has been created.' % (self.case_get_note_msg_prefix(cr, uid, ids, context=context)) + msg = _('Case has been created.') self.message_append_note(cr, uid, ids, body=msg, context=context) return True diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py index dc40715a08a..363f98e35d1 100644 --- a/addons/mrp/procurement.py +++ b/addons/mrp/procurement.py @@ -43,7 +43,7 @@ class procurement_order(osv.osv): cr.execute('update procurement_order set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id)) for (id, name) in self.name_get(cr, uid, procurement.id): message = _("Procurement '%s' has an exception: 'No BoM defined for this product !'") % name - self.procurement_message(cr, uid, [procurement.id], message, context=context) + self.message_append_note(cr, uid, [procurement.id], body=message, context=context) return False return True diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 61175782395..8b82f71edad 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -289,14 +289,14 @@ class procurement_order(osv.osv): return False if not procurement.product_id.seller_ids: message = _('No supplier defined for this product !') - self.procurement_message(cr, uid, [procurement.id], message) + self.message_append_note(cr, uid, [procurement.id], body=message, context=context) cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id)) return False partner = procurement.product_id.seller_id #Taken Main Supplier of Product of Procurement. if not partner: message = _('No default supplier defined for this product') - self.procurement_message(cr, uid, [procurement.id], message) + self.message_append_note(cr, uid, [procurement.id], body=message, context=context) cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id)) return False if user.company_id and user.company_id.partner_id: @@ -306,17 +306,11 @@ class procurement_order(osv.osv): address_id = partner_obj.address_get(cr, uid, [partner.id], ['delivery'])['delivery'] if not address_id: message = _('No address defined for the supplier') - self.procurement_message(cr, uid, [procurement.id], message) + self.message_append_note(cr, uid, [procurement.id], body=message, context=context) cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id)) return False return True - def procurement_message(self,cr,uid,ids,message,context=None): - for proc in self.browse(cr,uid,ids): - message_ids=False - message_ids= self.pool.get('mail.message').search(cr,uid,[('res_id','=',proc.id),('model','=',self._name),('body_html','=',message)]) - if not message_ids: - self.message_append_note(cr, uid, [proc.id], body=message) - return True + def test_cancel(self, cr, uid, ids): """ Tests whether state of move is cancelled or not. @return: True or False @@ -362,11 +356,11 @@ class procurement_order(osv.osv): """ Changes procurement state to Running and writes message. @return: True """ - message = _('from stock: products assigned.') + message = _('From stock: products assigned.') self.write(cr, uid, ids, {'state': 'running', - 'message': message}) - self.procurement_message(cr, uid, ids, message, context=context) - self.running_send_note(cr, uid, ids, context=None) + 'message': message}, context=context) + self.message_append_note(cr, uid, ids, body=message, context=context) + self.running_send_note(cr, uid, ids, context=context) return True def _check_make_to_stock_service(self, cr, uid, procurement, context=None): @@ -398,7 +392,7 @@ class procurement_order(osv.osv): if message: message = _("Procurement '%s' is in exception: ") % (procurement.name) + message cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id)) - self.procurement_message(cr, uid, [procurement.id], message, context=context) + self.message_append_note(cr, uid, [procurement.id], body=message, context=context) return ok def action_produce_assign_service(self, cr, uid, ids, context=None): diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py index cc29f5662e0..410a802c810 100644 --- a/addons/procurement/schedulers.py +++ b/addons/procurement/schedulers.py @@ -112,10 +112,16 @@ class procurement_order(osv.osv): (proc.id, proc.product_qty, proc.product_uom.name, proc.product_id.name,)) report_except += 1 - if uid: - # Chatter: old res.request is now a chatter on res.users, id=uid - end_date = fields.datetime.now() - summary = _("""Here is the procurement scheduling report. + + + if use_new_cursor: + cr.commit() + offset += len(ids) + if not ids: break + end_date = fields.datetime.now() + if uid: + # Chatter: old res.request is now a chatter on res.users, id=uid + summary = _("""Here is the procurement scheduling report. Start Time: %s End Time: %s @@ -124,13 +130,8 @@ class procurement_order(osv.osv): Skipped Procurements (scheduled date outside of scheduler range) %d Exceptions:\n""") % (start_date, end_date, report_total, report_except, report_later) - summary += '\n'.join(report) - self.pool.get('res.users').message_append_note(cr, uid, [uid], body=summary, context=context) - if use_new_cursor: - cr.commit() - offset += len(ids) - if not ids: break - + summary += '\n'.join(report) + self.pool.get('res.users').message_append_note(cr, uid, [uid], body=summary, context=context) if use_new_cursor: cr.commit()