From d144d320ecd34bc1941c0a4dc85829fd155d2ed8 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Jun 2013 17:20:07 +0200
Subject: [PATCH] [FIX]crm_channel: view and typo imp

bzr revid: dle@openerp.com-20130620152007-v8yt5kwdkgeh1w8i
---
 addons/crm/crm_lead.py                             |    1 -
 addons/crm/crm_lead_data.xml                       |    6 ---
 addons/crm_channel/crm_data.xml                    |   11 ++--
 addons/crm_channel/crm_portal_view.xml             |   55 +++++++-------------
 .../crm_channel/data/lead_mail_template_data.xml   |    2 +-
 5 files changed, 24 insertions(+), 51 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index b8673e7..44ada2f 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -719,7 +719,6 @@ class crm_lead(base_stage, format_address, osv.osv):
                 continue
             vals = self._convert_opportunity_data(cr, uid, lead, customer, section_id, context=context)
             self.write(cr, uid, [lead.id], vals, context=context)
-        self.message_post(cr, uid, ids, body=_("Lead <b>converted into an Opportunity</b>"), subtype="crm.mt_lead_convert_to_opportunity", context=context)
 
         if user_ids or section_id:
             self.allocate_salesman(cr, uid, ids, user_ids, section_id, context=context)
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 0979a94..91644dc 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -163,12 +163,6 @@
             <field name="default" eval="False"/>
             <field name="description">Opportunity created</field>
         </record>
-        <record id="mt_lead_convert_to_opportunity" model="mail.message.subtype">
-            <field name="name">Lead to Opportunity</field>
-            <field name="res_model">crm.lead</field>
-            <field name="default" eval="False"/>
-            <field name="description">Lead converted into an opportunity</field>
-        </record>
         <record id="mt_lead_stage" model="mail.message.subtype">
             <field name="name">Stage Changed</field>
             <field name="res_model">crm.lead</field>
diff --git a/addons/crm_channel/crm_data.xml b/addons/crm_channel/crm_data.xml
index 31ad686..6cdb6e6 100644
--- a/addons/crm_channel/crm_data.xml
+++ b/addons/crm_channel/crm_data.xml
@@ -1,25 +1,20 @@
 <?xml version="1.0"?>
 <openerp>
-    <data noupdate="1">
-
+    <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="4" 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="6" name="sequence"/>
-        </record>
-        <record model="crm.case.stage" id="stage_portal_lead_interested">
-            <field name="name">Interested</field>
-            <field eval="1" name="case_default"/>
-            <field eval="10" name="probability"/>
-            <field eval="5" name="sequence"/>
+            <field name="type">lead</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/crm_channel/crm_portal_view.xml b/addons/crm_channel/crm_portal_view.xml
index d2fe7c4..a8d342e 100644
--- a/addons/crm_channel/crm_portal_view.xml
+++ b/addons/crm_channel/crm_portal_view.xml
@@ -38,42 +38,27 @@
                 </header>
                 <sheet>
                   <group>
-                    <field name="priority" readonly="1"/>
-                    <field name="type" invisible="1" readonly="1"/>
-                    <field name="partner_name" string="Partner Name" readonly="1"/>
-                    <field name="stage_id" string="Interest Status"/>
+                    <group>
+                      <field name="partner_name" string="Partner Name" readonly="1"/>
+                      <field name="title" widget="selection" readonly="1"/>
+                      <field name="contact_name" readonly="1"/>
+                      <field name="function" readonly="1"/>
+                      <field name="email_from" readonly="1"/>
+                      <field name="phone" readonly="1"/>
+                      <field name="fax" readonly="1"/>
+                      <field name="mobile" readonly="1"/>
+                    </group>
+                    <group>
+                      <field name="street" readonly="1"/>
+                      <field name="street2" readonly="1"/>
+                      <field name="zip" readonly="1"/>
+                      <field name="city" readonly="1"/>
+                      <field name="country_id" readonly="1"/>
+                      <field name="state_id" readonly="1"/>
+                    </group>
+                    <label for="description" colspan="2"/>
+                    <field name="description" nolabel="1" colspan="2"/>
                   </group>
-                  <notebook>
-                    <page string='Lead'>
-                      <group col="2">
-                        <separator string="Contact" colspan="2"/>
-                        <group col="2">
-                           <field name="contact_name" readonly="1"/>
-                           <field domain="[('domain', '=', 'contact')]" name="title" widget="selection" readonly="1"/>
-                           <field name="function" readonly="1"/>
-                           <field name="street" readonly="1"/>
-                           <field name="street2" readonly="1"/>
-                        </group>
-                        <group col="2">
-                           <field name="zip" readonly="1"/>
-                           <field name="city" readonly="1"/>
-                           <field name="country_id" readonly="1"/>
-                           <field name="state_id" readonly="1"/>
-                        </group>
-                      </group>
-                      <group col="2">
-                        <group col="2">
-                           <separator string="Communication" colspan="2"/>
-                           <field name="email_from" readonly="1"/>
-                           <field name="phone" readonly="1"/>
-                           <field name="fax" readonly="1"/>
-                           <field name="mobile" readonly="1"/>
-                        </group>
-                      </group>
-                      <separator string="Details" />
-                      <field name="description" nolabel="1" />
-                    </page>
-                  </notebook>
                 </sheet>
               </form>
             </field>
diff --git a/addons/crm_channel/data/lead_mail_template_data.xml b/addons/crm_channel/data/lead_mail_template_data.xml
index df9d63c..7fb38fe 100644
--- a/addons/crm_channel/data/lead_mail_template_data.xml
+++ b/addons/crm_channel/data/lead_mail_template_data.xml
@@ -23,7 +23,7 @@
 
 <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>If you did not contact the lead after 4 weeks (20 days), the lead will be send to another partner.</p>
+<p>The lead will be send to another partner if you do not contact the lead before 20 days.</p>
 
 <p>Thanks,</p>
 
-- 
1.7.10.4