[IMP]crm_channel: merge of similar files

bzr revid: dle@openerp.com-20130620152231-i0t1h4v4xo689rpl

4 files changed, 43 insertions, 94 deletions

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 @@
-<?xml version="1.0" encoding='UTF-8'?>
+<?xml version="1.0" ?>
 <openerp>
     <data>
-        <record id="crm_channel_email_template" model="email.template">
-            <field name="name">Lead forward</field>
-            <field name="email_from"></field>
-            <field name="subject">Fwd: Lead: ${object.name}</field>
-            <field name="email_to"></field>
-            <field name="lang"></field>
-            <field name="model_id" ref="crm.model_crm_lead"/>
+        <record model="crm.case.stage" id="stage_portal_lead_assigned">
+            <field name="name">Assigned</field>
+            <field eval="1" name="case_default"/>
+            <field eval="0" name="probability"/>
+            <field eval="12" name="sequence"/>
+            <field name="type">lead</field>
+        </record>
+        <record model="crm.case.stage" id="stage_portal_lead_recycle">
+            <field name="name">To Recycle</field>
+            <field eval="1" name="case_default"/>
+            <field eval="0" name="probability"/>
+            <field eval="11" name="sequence"/>
+            <field name="type">lead</field>
+        </record>
+        <record id="email_template_lead_forward_mail" model="email.template">
+            <field name="name">Lead Mass Mail</field>
+            <field name="model_id" model="ir.model" search="[('name', '=', 'crm.lead.forward.to.partner')]"></field>
             <field name="auto_delete" eval="True"/>
+            <field name="email_to">${ctx['partner_id'].email}</field>
+            <field name="email_from">${user.email or ''}</field>
+            <field name="subject">Fwd: Lead: ${ctx['partner_id'].name}</field>
             <field name="body_html"><![CDATA[
-Hello ${object.partner_assigned_id.name},
-<p>
-Here is a lead that might interest you.
-</p>
-<p>
-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.
-</p>
-<p>
-Your account manager,<br/>
-${object.user_id.name},<br/>
-${object.user_id.email}
-</p>
+            
+<p>Hello,</p>
 
-<p>
-${ctx["mail_body"].replace('\n','<br>') | safe}
-</p>
 
-% if ctx["history_mode"] in ('whole'):
-    % for message in object.message_ids:
-        ---- Original Message (${message.date or ''}) ----<br/>
-        ${message.body | safe}
-    % endfor
-% endif
-% if ctx['history_mode'] == 'latest':
-    ---- Original Message (${object.message_ids[0].date or ''}) ----<br/>
-    ${object.message_ids[0].body | safe}
+<p>We have been contacted by those prospects that are in your region. Thus, the following leads have been assigned to ${ctx['partner_id'].name}:</p>
+
+<ol>
+% for lead in ctx['partner_leads']:
+     <li><a href="${lead.lead_link}">${lead.lead_id.name or 'Subject Undefined'}</a>, ${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 ''} </li></br>
+% endfor
+</ol>
+
+<p>Please connect to your <a href="${object.get_portal_url()}">Partner Portal</a> 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".</p>
+
+<p>The lead will be send to another partner if you do not contact the lead before 20 days.</p>
+
+<p>Thanks,</p>
+
+<pre>
+${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature or 'The OpenERP Team'}
+</pre>
+% 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
             ]]></field>
         </record>
     </data>
-</openerp>
+</openerp>
\ 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 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <!-- Crm stages -->
-        <record model="crm.case.stage" id="stage_portal_lead_assigned">
-            <field name="name">Assigned</field>
-            <field eval="1" name="case_default"/>
-            <field eval="0" name="probability"/>
-            <field eval="12" name="sequence"/>
-            <field name="type">lead</field>
-        </record>
-        <record model="crm.case.stage" id="stage_portal_lead_recycle">
-            <field name="name">To Recycle</field>
-            <field eval="1" name="case_default"/>
-            <field eval="0" name="probability"/>
-            <field eval="11" name="sequence"/>
-            <field name="type">lead</field>
-        </record>
-    </data>
-</openerp>
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 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data noupdate="0">
-      <record id="email_template_lead_forward_mail" model="email.template">
-            <field name="name">Lead Mass Mail</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'crm.lead.forward.to.partner')]"></field>
-            <field name="auto_delete" eval="True"/>
-            <field name="email_to">${ctx['partner_id'].email}</field>
-            <field name="email_from">${user.email or ''}</field>
-            <field name="subject">Fwd: Lead: ${ctx['partner_id'].name}</field>
-            <field name="body_html"><![CDATA[
-            
-<p>Hello,</p>
-
-
-<p>We have been contacted by those prospects that are in your region. Thus, the following leads have been assigned to ${ctx['partner_id'].name}:</p>
-
-<ol>
-% for lead in ctx['partner_leads']:
-     <li><a href="${lead.lead_link}">${lead.lead_id.name or 'Subject Undefined'}</a>, ${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 ''} </li></br>
-% endfor
-</ol>
-
-<p>Please connect to your <a href="${object.get_portal_url()}">Partner Portal</a> 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".</p>
-
-<p>The lead will be send to another partner if you do not contact the lead before 20 days.</p>
-
-<p>Thanks,</p>
-
-<pre>
-${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature or 'The OpenERP Team'}
-</pre>
-% 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
-            ]]></field>
-        </record>
-    </data>
-</openerp>