[FIX] Improved language in notifications(present perfect simple with passive form) and imrpoved coding style.
bzr revid: bth@tinyerp.com-20120312103420-hy4ln4pw0376173r
This commit is contained in:
Bhumi Thakkar (Open ERP)
parent
3bea195441
commit
edba2af7a2
|
|
@ -258,25 +258,22 @@ class crm_base(object):
|
|||
data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
|
||||
return {'value': data}
|
||||
|
||||
def _case_opportunity_meeting_notification(self, cr, uid, ids, context=None):
|
||||
def _case_open_notification(self, cr, uid, ids, context=None):
|
||||
return True
|
||||
|
||||
def _case_open_notification(self, case, context=None):
|
||||
def _case_close_notification(self, cr, uid, ids, context=None):
|
||||
return True
|
||||
|
||||
def _case_close_notification(self, case, context=None):
|
||||
def _case_cancel_notification(self, cr, uid, ids, context=None):
|
||||
return True
|
||||
|
||||
def _case_cancel_notification(self, case, context=None):
|
||||
return True
|
||||
|
||||
def _case_pending_notification(self, case, context=None):
|
||||
def _case_pending_notification(self, cr, uid, ids, context=None):
|
||||
return True
|
||||
|
||||
def _case_reset_notification(self, cr, uid, ids, context=None):
|
||||
return True
|
||||
|
||||
def _case_escalate_notification(self, case, context=None):
|
||||
def _case_escalate_notification(self, cr, uid, ids, context=None):
|
||||
return True
|
||||
|
||||
def _case_phonecall_notification(self, case, action, context=None):
|
||||
|
|
@ -292,7 +289,7 @@ class crm_base(object):
|
|||
if not case.user_id:
|
||||
data['user_id'] = uid
|
||||
self.write(cr, uid, [case.id], data)
|
||||
self._case_open_notification(case, context=context)
|
||||
self._case_open_notification(cr, uid, [case.id], context=context)
|
||||
self._action(cr, uid, cases, 'open')
|
||||
|
||||
return True
|
||||
|
|
@ -305,7 +302,7 @@ class crm_base(object):
|
|||
cases[0].state # to fill the browse record cache
|
||||
self.write(cr, uid, ids, {'state': 'done', 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'), })
|
||||
# We use the cache of cases to keep the old case state
|
||||
self._case_close_notification(cases, context=context)
|
||||
self._case_close_notification(cr, uid, ids, context=context)
|
||||
self._action(cr, uid, cases, 'done')
|
||||
return True
|
||||
|
||||
|
|
@ -317,7 +314,7 @@ class crm_base(object):
|
|||
cases[0].state # to fill the browse record cache
|
||||
self.write(cr, uid, ids, {'state': 'cancel', 'active': True})
|
||||
# We use the cache of cases to keep the old case state
|
||||
self._case_cancel_notification(cases, context=context)
|
||||
self._case_cancel_notification(cr, uid, ids, context=context)
|
||||
self._action(cr, uid, cases, 'cancel')
|
||||
return True
|
||||
|
||||
|
|
@ -328,7 +325,7 @@ class crm_base(object):
|
|||
cases = self.browse(cr, uid, ids)
|
||||
cases[0].state # to fill the browse record cache
|
||||
self.write(cr, uid, ids, {'state': 'pending', 'active': True})
|
||||
self._case_pending_notification(cases, context=context)
|
||||
self._case_pending_notification(cr, uid, ids, context=context)
|
||||
self._action(cr, uid, cases, 'pending')
|
||||
return True
|
||||
|
||||
|
|
@ -426,7 +423,7 @@ class crm_case(crm_base):
|
|||
if not case.user_id:
|
||||
data['user_id'] = uid
|
||||
self.write(cr, uid, [case.id], data)
|
||||
self._case_open_notification(case, context=context)
|
||||
self._case_open_notification(cr, uid, [case.id], context=context)
|
||||
self._action(cr, uid, cases, 'open')
|
||||
return True
|
||||
|
||||
|
|
@ -440,7 +437,7 @@ class crm_case(crm_base):
|
|||
#
|
||||
# We use the cache of cases to keep the old case state
|
||||
#
|
||||
self._case_close_notification(cases, context=context)
|
||||
self._case_close_notification(cr, uid, ids, context=context)
|
||||
self._action(cr, uid, cases, 'done')
|
||||
return True
|
||||
|
||||
|
|
@ -458,7 +455,7 @@ class crm_case(crm_base):
|
|||
raise osv.except_osv(_('Error !'), _('You can not escalate, you are already at the top level regarding your sales-team category.'))
|
||||
self.write(cr, uid, [case.id], data)
|
||||
cases = self.browse(cr, uid, ids)
|
||||
self._case_escalate_notification(cases, context=context)
|
||||
self._case_escalate_notification(cr, uid, ids, context=context)
|
||||
self._action(cr, uid, cases, 'escalate')
|
||||
return True
|
||||
|
||||
|
|
@ -468,7 +465,7 @@ class crm_case(crm_base):
|
|||
cases[0].state # to fill the browse record cache
|
||||
self.write(cr, uid, ids, {'state': 'cancel',
|
||||
'active': True})
|
||||
self._case_cancel_notification(cases, context=context)
|
||||
self._case_cancel_notification(cr, uid, ids, context=context)
|
||||
self._action(cr, uid, cases, 'cancel')
|
||||
return True
|
||||
|
||||
|
|
@ -477,7 +474,7 @@ class crm_case(crm_base):
|
|||
cases = self.browse(cr, uid, ids)
|
||||
cases[0].state # to fill the browse record cache
|
||||
self.write(cr, uid, ids, {'state': 'pending', 'active': True})
|
||||
self._case_pending_notification(cases, context=context)
|
||||
self._case_pending_notification(cr, uid, ids, context=context)
|
||||
self._action(cr, uid, cases, 'pending')
|
||||
return True
|
||||
|
||||
|
|
|
|||
|
|
@ -281,70 +281,61 @@ class crm_lead(crm_case, osv.osv):
|
|||
|
||||
def _case_reset_notification(self, cr, uid, ids, context=None):
|
||||
for lead in self.browse(cr, uid, ids, context=context):
|
||||
if lead.type == 'lead':
|
||||
message = _("Lead is <b>renewed</b>.")
|
||||
elif lead.type == 'opportunity':
|
||||
message = _("Opportunity is <b>renewed</b>.")
|
||||
message = _("%s has been <b>renewed</b>.") % ('Opportunity' if lead.type == 'opportunity' else 'Lead')
|
||||
lead.message_append_note('' ,message)
|
||||
return True
|
||||
|
||||
def _case_create_notification(self, cr, uid, ids, context=None):
|
||||
for obj in self.browse(cr, uid, ids, context=context):
|
||||
self.message_subscribe(cr, uid, ids, [obj.user_id.id], context=context)
|
||||
if obj.type=="opportunity" and obj.state=="draft":
|
||||
message = _("Opportunity is <b>created</b>.")
|
||||
elif obj.type=="lead" :
|
||||
message = _("Lead is <b>created</b>.")
|
||||
else:
|
||||
message = _("Case is <b>created</b>.")
|
||||
for lead in self.browse(cr, uid, ids, context=context):
|
||||
self.message_subscribe(cr, uid, ids, [lead.user_id.id], context=context)
|
||||
message = _("%s has been <b>created</b>.") % ('Opportunity' if lead.type == 'opportunity' and lead.state == 'draft' else 'Lead')
|
||||
self.message_append_note(cr, uid, ids, _('System notification'),
|
||||
message, type='notification', context=context)
|
||||
return True
|
||||
|
||||
def _case_open_notification(self, lead, context=None):
|
||||
if lead.state != 'draft' and lead.state != 'pending':
|
||||
return False
|
||||
if lead.type == 'lead':
|
||||
message = _("Lead is <b>opened</b>.")
|
||||
elif lead.type == 'opportunity':
|
||||
message = _("Opportunity is <b>opened</b>.")
|
||||
else:
|
||||
message = _("Case is <b>opened</b>.")
|
||||
lead.message_append_note('' ,message)
|
||||
def _case_open_notification(self, cr, uid, ids, context=None):
|
||||
for lead in self.browse(cr, uid, ids, context=context):
|
||||
if lead.state == 'draft' and lead.state == 'pending':
|
||||
return False
|
||||
message = _("%s has been <b>opened</b>.") % ('Opportunity' if lead.type == 'opportunity' else 'Lead')
|
||||
lead.message_append_note('' ,message)
|
||||
return True
|
||||
|
||||
def _case_close_notification(self, lead, context=None):
|
||||
if lead[0].type == 'lead':
|
||||
message = _("Lead is <b>closed</b>.")
|
||||
elif lead[0].type == 'opportunity':
|
||||
message = _("Opportunity is <b>closed</b>.")
|
||||
else:
|
||||
message = _("Case is <b>closed</b>.")
|
||||
lead[0].message_append_note('' ,message)
|
||||
def _case_close_notification(self, cr, uid, ids, context=None):
|
||||
for lead in self.browse(cr, uid, ids, context=context):
|
||||
message = _("%s has been <b>closed</b>.") % ('Opportunity' if lead.type == 'opportunity' else 'Lead')
|
||||
lead.message_append_note('' ,message)
|
||||
return True
|
||||
|
||||
def _case_mark_lost_notification(self, lead, context=None):
|
||||
message = _("Opportunity is <b>marked as lost</b>.")
|
||||
lead.message_append_note('' ,message)
|
||||
def _case_mark_lost_notification(self, cr, uid, ids, context=None):
|
||||
for opportunity in self.browse(cr, uid, ids, context=context):
|
||||
message = _("Opportunity has been <b>marked as lost</b>.")
|
||||
opportunity.message_append_note('' ,message)
|
||||
return True
|
||||
|
||||
def _case_mark_won_notification(self, lead, context=None):
|
||||
message = _("Opportunity is <b>won</b>.")
|
||||
lead.message_append_note('' ,message)
|
||||
def _case_mark_won_notification(self, cr, uid, ids, context=None):
|
||||
for opportunity in self.browse(cr, uid, ids, context=context):
|
||||
message = _("Opportunity has been <b>won</b>.")
|
||||
opportunity.message_append_note('' ,message)
|
||||
return True
|
||||
|
||||
def _case_cancel_notification(self, lead, context=None):
|
||||
if lead[0].type == 'lead':
|
||||
message = _("Lead is <b>cancelled</b>.")
|
||||
elif lead[0].type == 'opportunity':
|
||||
message = _("Opportunity is <b>cancelled</b>.")
|
||||
lead[0].message_append_note('' ,message)
|
||||
def _case_cancel_notification(self, cr, uid, ids, context=None):
|
||||
for lead in self.browse(cr, uid, ids, context=context):
|
||||
message = _("%s has been <b>cancelled</b>.") % ('Opportunity' if lead.type == 'opportunity' else 'Lead')
|
||||
lead.message_append_note('' ,message)
|
||||
return True
|
||||
|
||||
def _case_pending_notification(self, case, context=None):
|
||||
if case[0].type == 'lead':
|
||||
message = _("Lead is <b>pending</b>.")
|
||||
elif case[0].type == 'opportunity':
|
||||
message = _("Opportunity is <b>pending</b>.")
|
||||
case[0].message_append_note('' ,message)
|
||||
def _case_pending_notification(self, cr, uid, ids, context=None):
|
||||
for lead in self.browse(cr, uid, ids, context=context):
|
||||
message = _("%s is <b>pending</b>.") % ('Opportunity' if lead.type == 'opportunity' else 'Lead')
|
||||
lead.message_append_note('' ,message)
|
||||
return True
|
||||
|
||||
def _case_escalate_notification(self, case, context=None):
|
||||
message = _("Lead is <b>escalated</b>.")
|
||||
case.message_append_note('' ,message)
|
||||
def _case_escalate_notification(self, cr, uid, ids, context=None):
|
||||
for lead in self.browse(cr, uid, ids, context=context):
|
||||
message = _("Lead has been <b>escalated</b>.")
|
||||
lead.message_append_note('' ,message)
|
||||
return True
|
||||
|
||||
def _case_phonecall_notification(self, cr, uid, ids, case, phonecall, action, context=None):
|
||||
for obj in phonecall.browse(cr, uid, ids, context=context):
|
||||
|
|
@ -354,12 +345,11 @@ class crm_lead(crm_case, osv.osv):
|
|||
message = _("<b>%s a call</b>.") % (action)
|
||||
case.message_append_note('', message)
|
||||
|
||||
def _case_partner_notification(self, lead, context=None):
|
||||
if lead.type == 'lead':
|
||||
message = _("Partner is <b>created</b> for this lead.")
|
||||
elif lead.type == 'opportunity':
|
||||
message = _("Partner is <b>created</b> for this opportunity.")
|
||||
lead.message_append_note('' ,message)
|
||||
def _case_partner_notification(self, cr, uid, ids, context=None):
|
||||
for lead in self.browse(cr, uid, ids, context=context):
|
||||
message = _("Partner is <b>created</b> for this %s") % ('Opportunity' if lead.type == 'opportunity' else 'Lead')
|
||||
lead.message_append_note('' ,message)
|
||||
return True
|
||||
|
||||
def case_open(self, cr, uid, ids, context=None):
|
||||
res = super(crm_lead, self).case_open(cr, uid, ids, context)
|
||||
|
|
@ -412,7 +402,7 @@ class crm_lead(crm_case, osv.osv):
|
|||
stage_id = self.stage_find_won(cr, uid, lead.section_id.id or False)
|
||||
if stage_id:
|
||||
self.stage_set(cr, uid, [lead.id], stage_id)
|
||||
self._case_mark_won_notification(lead, context=context)
|
||||
self._case_mark_won_notification(cr, uid, [lead.id], context=context)
|
||||
return res
|
||||
|
||||
def set_priority(self, cr, uid, ids, priority):
|
||||
|
|
@ -674,7 +664,7 @@ class crm_lead(crm_case, osv.osv):
|
|||
res_partner.write(cr, uid, partner_id, {'section_id': lead.section_id.id or False})
|
||||
contact_id = res_partner.address_get(cr, uid, [partner_id])['default']
|
||||
res = lead.write({'partner_id' : partner_id, 'partner_address_id': contact_id}, context=context)
|
||||
self._case_partner_notification(lead,context)
|
||||
self._case_partner_notification(cr, uid, [lead.id], context)
|
||||
return res
|
||||
|
||||
def _lead_create_partner_address(self, cr, uid, lead, partner_id, context=None):
|
||||
|
|
|
|||
|
|
@ -99,34 +99,39 @@ class crm_meeting(crm_base, osv.osv):
|
|||
for obj in self.browse(cr, uid, ids, context=context):
|
||||
if(obj.opportunity_id.id):
|
||||
newid = obj.opportunity_id.id
|
||||
message = _("Meeting is <b>scheduled</b> on <em>%s</em> for opportunity.") % (obj.date)
|
||||
message = _("Meeting has been <b>scheduled</b> on <em>%s</em> for opportunity.") % (obj.date)
|
||||
for lead in lead_obj.browse(cr, uid, [newid], context=context):
|
||||
lead.message_append_note('', message)
|
||||
obj.message_append_note('', message)
|
||||
elif(obj.phonecall_id.id):
|
||||
newid = obj.phonecall_id.id
|
||||
message = _("Meeting is <b>scheduled</b> on <em>%s</em> for phonecall.") % (obj.date)
|
||||
message = _("Meeting has been <b>scheduled</b> on <em>%s</em> for phonecall.") % (obj.date)
|
||||
for phonecall in phonecall_obj.browse(cr, uid, [newid], context=context):
|
||||
phonecall.message_append_note('', message)
|
||||
obj.message_append_note('', message)
|
||||
else:
|
||||
message = _("Meeting is <b>scheduled</b> on<em> %s </em>.") % (obj.date)
|
||||
message = _("Meeting has been <b>scheduled</b> on<em> %s </em>.") % (obj.date)
|
||||
obj.message_append_note('', message)
|
||||
|
||||
def _case_close_notification(self, meeting, context=None):
|
||||
message = _("Meeting is <b>done</b>.")
|
||||
meeting[0].message_append_note('' ,message)
|
||||
|
||||
def _case_reset_notification(self, cr, uid, ids, context=None):
|
||||
def _case_close_notification(self, cr, uid, ids, context=None):
|
||||
for meeting in self.browse(cr, uid, ids, context=context):
|
||||
message = _("Meeting is <b>renewed</b>.")
|
||||
message = _("Meeting has been <b>done</b>.")
|
||||
meeting.message_append_note('' ,message)
|
||||
return True
|
||||
|
||||
def _case_open_notification(self, meeting, context=None):
|
||||
if meeting.state != 'draft':
|
||||
return False
|
||||
message = _("Meeting is <b>confirmed</b>.")
|
||||
meeting.message_append_note('' ,message)
|
||||
def _case_reset_notification(self, cr, uid, ids, context=None):
|
||||
for meeting in self.browse(cr, uid, ids, context=context):
|
||||
message = _("Meeting has been <b>renewed</b>.")
|
||||
meeting.message_append_note('' ,message)
|
||||
return True
|
||||
|
||||
def _case_open_notification(self, cr, uid, ids, context=None):
|
||||
for meeting in self.browse(cr, uid, ids, context=context):
|
||||
if meeting.state != 'draft':
|
||||
return False
|
||||
message = _("Meeting has been <b>confirmed</b>.")
|
||||
meeting.message_append_note('' ,message)
|
||||
return True
|
||||
|
||||
def case_open(self, cr, uid, ids, context=None):
|
||||
"""Confirms meeting
|
||||
|
|
|
|||
|
|
@ -99,25 +99,37 @@ class crm_phonecall(crm_base, osv.osv):
|
|||
result[obj.id] = obj.user_id.id
|
||||
return result
|
||||
|
||||
def _case_cancel_notification(self, phonecall, context=None):
|
||||
message = _("Phonecall is <b>cancelled</b>.")
|
||||
phonecall[0].message_append_note( _('System notification'),
|
||||
def _case_cancel_notification(self, cr, uid, ids, context=None):
|
||||
for phonecall in self.browse(cr, uid, ids, context=context):
|
||||
message = _("Phonecall has been <b>cancelled</b>.")
|
||||
phonecall.message_append_note( _('System notification'),
|
||||
message, type='notification', context=context)
|
||||
return True
|
||||
|
||||
def _case_pending_notification(self, phonecall, context=None):
|
||||
message = _("Phonecall is <b>pending</b>.")
|
||||
phonecall[0].message_append_note('' ,message)
|
||||
def _case_pending_notification(self, cr, uid, ids, context=None):
|
||||
for phonecall in self.browse(cr, uid, ids, context=context):
|
||||
message = _("Phonecall is <b>pending</b>.")
|
||||
phonecall.message_append_note('' ,message)
|
||||
return True
|
||||
|
||||
def done_notification(self, cr, uid, ids, context=None):
|
||||
for phonecall in self.browse(cr, uid, ids):
|
||||
message = _("Phonecall is <b>done</b>.")
|
||||
self.message_append_note(cr, uid, [phonecall.id], _('System notification'),
|
||||
message, type='notification', context=context)
|
||||
for phonecall in self.browse(cr, uid, ids, context=context):
|
||||
message = _("Phonecall has been <b>done</b>.")
|
||||
phonecall.message_append_note('', message)
|
||||
return True
|
||||
|
||||
def _case_open_notification(self, phonecall, context=None):
|
||||
phonecall.message_subscribe([phonecall.user_id.id], context=context)
|
||||
message = _("Phonecall is <b>opened</b>.")
|
||||
phonecall.message_append_note('' ,message)
|
||||
def _case_open_notification(self, cr, uid, ids, context=None):
|
||||
for phonecall in self.browse(cr, uid, ids, context=context):
|
||||
phonecall.message_subscribe([phonecall.user_id.id], context=context)
|
||||
message = _("Phonecall has been <b>opened</b>.")
|
||||
phonecall.message_append_note('' ,message)
|
||||
return True
|
||||
|
||||
def _case_partner_notification(self, cr, uid, ids, context=None):
|
||||
for phonecall in self.browse(cr, uid, ids, context=context):
|
||||
message = _("Partner is <b>created</b>")
|
||||
phonecall.message_append_note('' ,message)
|
||||
return True
|
||||
|
||||
# From crm.case
|
||||
def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
|
||||
|
|
@ -149,8 +161,7 @@ class crm_phonecall(crm_base, osv.osv):
|
|||
"""
|
||||
res = super(crm_phonecall, self).case_reset(cr, uid, ids, context)
|
||||
self.write(cr, uid, ids, {'duration': 0.0, 'state':'open'})
|
||||
for phone in self.browse(cr, uid, ids):
|
||||
self._case_open_notification(phone, context=context)
|
||||
self._case_open_notification(cr, uid, ids, context=context)
|
||||
return res
|
||||
|
||||
|
||||
|
|
@ -208,7 +219,8 @@ class crm_phonecall(crm_base, osv.osv):
|
|||
return partner_id
|
||||
|
||||
def _call_set_partner(self, cr, uid, ids, partner_id, context=None):
|
||||
return self.write(cr, uid, ids, {'partner_id' : partner_id}, context=context)
|
||||
self.write(cr, uid, ids, {'partner_id' : partner_id}, context=context)
|
||||
self._case_partner_notification(cr, uid, ids, context)
|
||||
|
||||
def _call_create_partner_address(self, cr, uid, phonecall, partner_id, context=None):
|
||||
address = self.pool.get('res.partner.address')
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ class crm_make_sale(osv.osv_memory):
|
|||
sale_order = sale_obj.browse(cr, uid, new_id, context=context)
|
||||
case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
|
||||
new_ids.append(new_id)
|
||||
message = _("Opportunity is <b>converted to Quotation</b> <em>%s</em>.") % (sale_order.name)
|
||||
message = _("Opportunity has been <b>converted to Quotation</b> <em>%s</em>.") % (sale_order.name)
|
||||
case.message_append_note('', message)
|
||||
|
||||
if make.close:
|
||||
|
|
|
|||
Loading…
Reference in New Issue