From bfc0ad948c4e8097ea4e131567c24b5950d27fdd Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 20 Jun 2013 17:22:31 +0200 Subject: [PATCH] [IMP]crm_channel: merge of similar files bzr revid: dle@openerp.com-20130620152231-i0t1h4v4xo689rpl --- addons/crm_channel/__openerp__.py | 1 - addons/crm_channel/crm_channel_data.xml | 77 +++++++++++-------- addons/crm_channel/crm_data.xml | 20 ----- .../data/lead_mail_template_data.xml | 39 ---------- 4 files changed, 43 insertions(+), 94 deletions(-) delete mode 100644 addons/crm_channel/crm_data.xml delete mode 100644 addons/crm_channel/data/lead_mail_template_data.xml diff --git a/addons/crm_channel/__openerp__.py b/addons/crm_channel/__openerp__.py index 2d14e7caa22..35286572271 100644 --- a/addons/crm_channel/__openerp__.py +++ b/addons/crm_channel/__openerp__.py @@ -51,7 +51,6 @@ You can also use the geolocalization without using the GPS coordinates. 'portal_data.xml', 'report/crm_lead_report_view.xml', 'report/crm_partner_report_view.xml', - 'data/lead_mail_template_data.xml', ], 'js': [ 'static/src/js/next.js', diff --git a/addons/crm_channel/crm_channel_data.xml b/addons/crm_channel/crm_channel_data.xml index 22d87293155..cac60d3a2ee 100644 --- a/addons/crm_channel/crm_channel_data.xml +++ b/addons/crm_channel/crm_channel_data.xml @@ -1,44 +1,53 @@ - + - - Lead forward - - Fwd: Lead: ${object.name} - - - + + Assigned + + + + lead + + + To Recycle + + + + lead + + + Lead Mass Mail + + ${ctx['partner_id'].email} + ${user.email or ''} + Fwd: Lead: ${ctx['partner_id'].name} -Here is a lead that might interest you. -

-

-Please keep me informed about your actions about it so that I can keep an -accurate follow-up of it and help you in the sale cycle. -

-

-Your account manager,
-${object.user_id.name},
-${object.user_id.email} -

+ +

Hello,

-

-${ctx["mail_body"].replace('\n','
') | safe} -

-% if ctx["history_mode"] in ('whole'): - % for message in object.message_ids: - ---- Original Message (${message.date or ''}) ----
- ${message.body | safe} - % endfor -% endif -% if ctx['history_mode'] == 'latest': - ---- Original Message (${object.message_ids[0].date or ''}) ----
- ${object.message_ids[0].body | safe} +

We have been contacted by those prospects that are in your region. Thus, the following leads have been assigned to ${ctx['partner_id'].name}:

+ +
    +% for lead in ctx['partner_leads']: +
  1. ${lead.lead_id.name or 'Subject Undefined'}, ${lead.lead_id.contact_name or 'Contact Name Undefined'}, ${lead.lead_id.country_id and lead.lead_id.country_id.name or 'Country Undefined' }, ${lead.lead_id.email_from or 'Email Undefined'}, ${lead.lead_id.phone or ''}

    2. +% endfor +
+ +

Please connect to your Partner Portal to get details. On each lead are two buttons on the top left corner that you should press after having contacted the lead: "I'm interested" & "I'm not interested".

+ +

The lead will be send to another partner if you do not contact the lead before 20 days.

+ +

Thanks,

+ +
+${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature or 'The OpenERP Team'}
+
+% if not ctx['partner_id'].user_id: +PS: It looks like you do not have an account manager assigned to you, please contact us. % endif ]]> - + \ No newline at end of file diff --git a/addons/crm_channel/crm_data.xml b/addons/crm_channel/crm_data.xml deleted file mode 100644 index a3a8d140f96..00000000000 --- a/addons/crm_channel/crm_data.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - Assigned - - - - lead - - - To Recycle - - - - lead - - - diff --git a/addons/crm_channel/data/lead_mail_template_data.xml b/addons/crm_channel/data/lead_mail_template_data.xml deleted file mode 100644 index 7fb38fee3aa..00000000000 --- a/addons/crm_channel/data/lead_mail_template_data.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - Lead Mass Mail - - - ${ctx['partner_id'].email} - ${user.email or ''} - Fwd: Lead: ${ctx['partner_id'].name} - Hello,

- - -

We have been contacted by those prospects that are in your region. Thus, the following leads have been assigned to ${ctx['partner_id'].name}:

- -
    -% for lead in ctx['partner_leads']: -
  1. ${lead.lead_id.name or 'Subject Undefined'}, ${lead.lead_id.contact_name or 'Contact Name Undefined'}, ${lead.lead_id.country_id and lead.lead_id.country_id.name or 'Country Undefined' }, ${lead.lead_id.email_from or 'Email Undefined'}, ${lead.lead_id.phone or ''}

    2. -% endfor -
- -

Please connect to your Partner Portal to get details. On each lead are two buttons on the top left corner that you should press after having contacted the lead: "I'm interested" & "I'm not interested".

- -

The lead will be send to another partner if you do not contact the lead before 20 days.

- -

Thanks,

- -
-${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature or 'The OpenERP Team'}
-
-% if not ctx['partner_id'].user_id: -PS: It looks like you do not have an account manager assigned to you, please contact us. -% endif - ]]> - - -