[MERGE] [FIX] crm: post message for logged/scheduled call in use timezone instead of utc (opw #600751).
Use <time> html element containing UTC time. Updated POT to contains new translation value bzr revid: mat@openerp.com-20140107154942-w3xx5914yzej4jb3
This commit is contained in:
Martin Trigaux
commit
b2fa77fd31
|
|
@ -1061,11 +1061,13 @@ class crm_lead(base_stage, format_address, osv.osv):
|
|||
def schedule_phonecall_send_note(self, cr, uid, ids, phonecall_id, action, context=None):
|
||||
phonecall = self.pool.get('crm.phonecall').browse(cr, uid, [phonecall_id], context=context)[0]
|
||||
if action == 'log':
|
||||
prefix = 'Logged'
|
||||
message = _('Logged a call for {date}. {description}')
|
||||
else:
|
||||
prefix = 'Scheduled'
|
||||
suffix = ' %s' % phonecall.description
|
||||
message = _("%s a call for %s.%s") % (prefix, phonecall.date, suffix)
|
||||
message = _('Scheduled a call for {date}. {description}')
|
||||
phonecall_date = datetime.strptime(phonecall.date, tools.DEFAULT_SERVER_DATETIME_FORMAT)
|
||||
phonecall_usertime = fields.datetime.context_timestamp(cr, uid, phonecall_date, context=context).strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
|
||||
html_time = "<time datetime='%s+00:00'>%s</time>" % (phonecall.date, phonecall_usertime)
|
||||
message = message.format(date=html_time, description=phonecall.description)
|
||||
return self.message_post(cr, uid, ids, body=message, context=context)
|
||||
|
||||
def log_meeting(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 7.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2013-06-07 19:36+0000\n"
|
||||
"POT-Creation-Date: 2014-01-07 15:37+0000\n"
|
||||
"PO-Revision-Date: 2014-01-07 15:37+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -26,7 +26,7 @@ msgid "Allows you to configure your incoming mail server, and create leads from
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:898
|
||||
#: code:addons/crm/crm_lead.py:897
|
||||
#: selection:crm.case.stage,type:0
|
||||
#: view:crm.lead:0
|
||||
#: selection:crm.lead,type:0
|
||||
|
|
@ -147,7 +147,7 @@ msgid "Rule Name"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_phonecall.py:280
|
||||
#: code:addons/crm/crm_phonecall.py:282
|
||||
#, python-format
|
||||
msgid "It's only possible to convert one phonecall at a time."
|
||||
msgstr ""
|
||||
|
|
@ -180,9 +180,10 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:640
|
||||
#: code:addons/crm/crm_lead.py:761
|
||||
#: code:addons/crm/crm_phonecall.py:280
|
||||
#: code:addons/crm/crm_lead.py:637
|
||||
#: code:addons/crm/crm_lead.py:758
|
||||
#: code:addons/crm/crm_phonecall.py:282
|
||||
#: code:addons/crm/wizard/crm_lead_to_opportunity.py:92
|
||||
#, python-format
|
||||
msgid "Warning!"
|
||||
msgstr ""
|
||||
|
|
@ -209,7 +210,7 @@ msgid "Schedule Other Call"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_phonecall.py:209
|
||||
#: code:addons/crm/crm_phonecall.py:211
|
||||
#: view:crm.phonecall:0
|
||||
#, python-format
|
||||
msgid "Phone Call"
|
||||
|
|
@ -245,11 +246,6 @@ msgstr ""
|
|||
msgid "Assigned to My Team(s)"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.segmentation:0
|
||||
msgid "Excluded Answers :"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: model:ir.model,name:crm.model_crm_merge_opportunity
|
||||
msgid "Merge opportunities"
|
||||
|
|
@ -292,7 +288,7 @@ msgid "Prospect Partner"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:1002
|
||||
#: code:addons/crm/crm_lead.py:1018
|
||||
#, python-format
|
||||
msgid "No Subject"
|
||||
msgstr ""
|
||||
|
|
@ -383,7 +379,6 @@ msgid "Unread Messages"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.segmentation:0
|
||||
#: field:crm.segmentation.line,segmentation_id:0
|
||||
#: model:ir.actions.act_window,name:crm.crm_segmentation-act
|
||||
msgid "Segmentation"
|
||||
|
|
@ -406,12 +401,6 @@ msgstr ""
|
|||
msgid "Team Leader"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:1052
|
||||
#, python-format
|
||||
msgid "%s a call for %s.%s"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: help:crm.case.stage,probability:0
|
||||
msgid "This percentage depicts the default/average probability of the Case for this stage to be a success"
|
||||
|
|
@ -433,7 +422,7 @@ msgid "#Opportunities"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:640
|
||||
#: code:addons/crm/crm_lead.py:637
|
||||
#, python-format
|
||||
msgid "Please select more than one element (lead or opportunity) from the list view."
|
||||
msgstr ""
|
||||
|
|
@ -512,7 +501,7 @@ msgid "Planned Revenue"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:988
|
||||
#: code:addons/crm/crm_lead.py:1004
|
||||
#, python-format
|
||||
msgid "Customer Email"
|
||||
msgstr ""
|
||||
|
|
@ -530,8 +519,8 @@ msgid "October"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.segmentation:0
|
||||
msgid "Included Answers :"
|
||||
#: view:crm.phonecall:0
|
||||
msgid "Reset to Todo"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
|
|
@ -567,16 +556,11 @@ msgid "Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' +object.pa
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:762
|
||||
#: code:addons/crm/crm_lead.py:759
|
||||
#, python-format
|
||||
msgid "No customer name defined. Please fill one of the following fields: Company Name, Contact Name or Email (\"Name <email@address>\")"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.segmentation:0
|
||||
msgid "Profiling Options"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.phonecall.report:0
|
||||
msgid "#Phone calls"
|
||||
|
|
@ -689,7 +673,7 @@ msgid "Statistics Dashboard"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:878
|
||||
#: code:addons/crm/crm_lead.py:877
|
||||
#: model:crm.case.stage,name:crm.stage_lead2
|
||||
#: selection:crm.case.stage,type:0
|
||||
#: view:crm.lead:0
|
||||
|
|
@ -753,7 +737,7 @@ msgid "Exclusive"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:600
|
||||
#: code:addons/crm/crm_lead.py:597
|
||||
#, python-format
|
||||
msgid "From %s : %s"
|
||||
msgstr ""
|
||||
|
|
@ -879,12 +863,6 @@ msgstr ""
|
|||
msgid "Send Email"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/wizard/crm_lead_to_opportunity.py:89
|
||||
#, python-format
|
||||
msgid "Warning !"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: help:crm.case.section,message_unread:0
|
||||
#: help:crm.lead,message_unread:0
|
||||
|
|
@ -934,7 +912,7 @@ msgid "Next Action"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:780
|
||||
#: code:addons/crm/crm_lead.py:777
|
||||
#, python-format
|
||||
msgid "<b>Partner</b> set to <em>%s</em>."
|
||||
msgstr ""
|
||||
|
|
@ -1023,7 +1001,7 @@ msgid "If opt-out is checked, this contact has refused to receive emails for mas
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:715
|
||||
#: code:addons/crm/crm_lead.py:712
|
||||
#, python-format
|
||||
msgid "Lead <b>converted into an Opportunity</b>"
|
||||
msgstr ""
|
||||
|
|
@ -1212,7 +1190,7 @@ msgid "Days to Close"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:1057
|
||||
#: code:addons/crm/crm_lead.py:1075
|
||||
#: field:crm.case.section,complete_name:0
|
||||
#, python-format
|
||||
msgid "unknown"
|
||||
|
|
@ -1265,7 +1243,7 @@ msgid "Sales Marketing Department"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:585
|
||||
#: code:addons/crm/crm_lead.py:582
|
||||
#, python-format
|
||||
msgid "Merged lead"
|
||||
msgstr ""
|
||||
|
|
@ -1281,12 +1259,7 @@ msgid "Phone Calls Assigned to the current user or with a team having the curren
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.segmentation:0
|
||||
msgid "Segmentation Description"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:581
|
||||
#: code:addons/crm/crm_lead.py:578
|
||||
#, python-format
|
||||
msgid "Merged opportunities"
|
||||
msgstr ""
|
||||
|
|
@ -1566,7 +1539,7 @@ msgid "Describe the lead..."
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_phonecall.py:290
|
||||
#: code:addons/crm/crm_phonecall.py:292
|
||||
#, python-format
|
||||
msgid "Partner has been <b>created</b>."
|
||||
msgstr ""
|
||||
|
|
@ -1781,7 +1754,7 @@ msgid "Support Department"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:1060
|
||||
#: code:addons/crm/crm_lead.py:1078
|
||||
#, python-format
|
||||
msgid "Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)"
|
||||
msgstr ""
|
||||
|
|
@ -1840,7 +1813,7 @@ msgid "Leads"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:579
|
||||
#: code:addons/crm/crm_lead.py:576
|
||||
#, python-format
|
||||
msgid "Merged leads"
|
||||
msgstr ""
|
||||
|
|
@ -2697,7 +2670,7 @@ msgid "Stage of case"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:585
|
||||
#: code:addons/crm/crm_lead.py:582
|
||||
#, python-format
|
||||
msgid "Merged opportunity"
|
||||
msgstr ""
|
||||
|
|
@ -2707,6 +2680,18 @@ msgstr ""
|
|||
msgid "Unassigned"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:1064
|
||||
#, python-format
|
||||
msgid "Logged a call for {date}. {description}"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:1064
|
||||
#, python-format
|
||||
msgid "Logged a call for {date}. {description}"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: selection:crm.opportunity2phonecall,action:0
|
||||
#: selection:crm.phonecall2phonecall,action:0
|
||||
|
|
@ -2761,6 +2746,7 @@ msgstr ""
|
|||
#. module: crm
|
||||
#: field:crm.case.section,note:0
|
||||
#: field:crm.phonecall,description:0
|
||||
#: view:crm.segmentation:0
|
||||
#: field:crm.segmentation,description:0
|
||||
msgid "Description"
|
||||
msgstr ""
|
||||
|
|
@ -2832,8 +2818,9 @@ msgid "Referred By"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.phonecall:0
|
||||
msgid "Reset to Todo"
|
||||
#: code:addons/crm/crm_lead.py:1066
|
||||
#, python-format
|
||||
msgid "Scheduled a call for {date}. {description}"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
|
|
@ -2842,7 +2829,7 @@ msgid "Working Hours"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:986
|
||||
#: code:addons/crm/crm_lead.py:1002
|
||||
#: view:crm.lead:0
|
||||
#: field:crm.lead2opportunity.partner,partner_id:0
|
||||
#: field:crm.lead2opportunity.partner.mass,partner_id:0
|
||||
|
|
@ -2870,7 +2857,7 @@ msgid "Lost"
|
|||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/wizard/crm_lead_to_opportunity.py:89
|
||||
#: code:addons/crm/wizard/crm_lead_to_opportunity.py:92
|
||||
#, python-format
|
||||
msgid "Closed/Cancelled leads cannot be converted into opportunities."
|
||||
msgstr ""
|
||||
|
|
@ -2908,11 +2895,6 @@ msgstr ""
|
|||
msgid "Campaign Name"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.segmentation:0
|
||||
msgid "Profiling"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
#: model:ir.model,name:crm.model_crm_phonecall_report
|
||||
msgid "Phone calls by user and section"
|
||||
|
|
|
|||
Loading…
Reference in New Issue