From ade81e37c498b8d5b08f0a86d58714663bc04876 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 9 Sep 2010 18:04:47 +0200
Subject: [PATCH] merge

bzr revid: fp@tinyerp.com-20100909160447-a00w055sl8c2f6mt
---
 addons/crm/crm_lead.py              |  4 ++--
 addons/crm/crm_lead_view.xml        | 10 +++++-----
 addons/crm/crm_opportunity_view.xml | 14 ++++++--------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 5d5fb5d3114..d4b08ad2b44 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -119,7 +119,7 @@ class crm_lead(crm_case, osv.osv):
         'write_date': fields.datetime('Update Date' , readonly=True),
 
         # Lead fields
-        'categ_id': fields.many2one('crm.case.categ', 'Lead Source', \
+        'categ_id': fields.many2one('crm.case.categ', 'Category', \
                         domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]"),
         'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', \
@@ -148,7 +148,7 @@ class crm_lead(crm_case, osv.osv):
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)], readonly=True),
+        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'partner_assigned_id': fields.many2one('res.partner', 'Assigned Partner', help="Partner this case has been forwarded/assigned to.", select=True),
         'date_assign': fields.date('Assignation Date', help="Last date this case was forwarded/assigned to a partner"),
     }
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index b70174e8989..1fd8b1483d2 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -57,6 +57,9 @@
                 <group colspan="4" col="7">
                     <field name="name" required="1" string="Name"/>
                     <field name="priority"/>
+                    <field name="categ_id"
+                        widget="selection"
+                        domain="[('object_id.model','=','crm.lead')]"/>
                     <button
                          name="convert_opportunity"
                          string="Convert to Opportunity"
@@ -71,10 +74,10 @@
                         domain="[('section_id','=',section_id), ('object_id.model', '=', 'crm.lead')]" />
                     <group col="2" colspan="1">
                         <button name="stage_previous" string="Previous"
-                            states="open,pending" type="object"
+                            states="open,pending,draft" type="object"
                             icon="gtk-go-back" />
                         <button name="stage_next" string="Next"
-                            states="open,pending" type="object"
+                            states="open,pending,draft" type="object"
                             icon="gtk-go-forward" />
                     </group>
                     <field name="type" invisible="1"/>
@@ -144,9 +147,6 @@
                         <field name="company_id"
                             groups="base.group_multi_company"
                             widget="selection" colspan="2" />
-                        <field name="categ_id"
-                            widget="selection"
-                            domain="[('object_id.model', '=', 'crm.lead')]" />
                         <field name="type_id" string="Campaign" select="1"/>
                         <field name="referred"/>
                     </group>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index f67ad93e134..4e1fb80464d 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -36,8 +36,6 @@
                             <field name="date_action"/>
                             <field name="title_action"/>
                             <field name="priority" string="Priority"/>
-                            <button string="Merge with other Opportunity"
-                                name="%(merge_opportunity_act)d" icon="gtk-add" type="action" />
                             <newline/>
                             <field name="type" invisible="1"/>
                         </group>
@@ -55,9 +53,9 @@
                                         attrs="{'invisible':[('partner_id','!=',False)]}"/>
                                 </group>
                                 <field name="partner_address_id"
-                                string="Contact"
-                                on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                                colspan="1" />
+                                    string="Contact"
+                                    on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                                    colspan="1" />
                                 <field name="email_from" string="Email" />
                                 <field name="phone"/>
                             </group>
@@ -142,9 +140,9 @@
                                     <group col="4" colspan="4">
                                         <field name="email_from"/>
                                         <field name="date"/>
-                                        <field name="email_to" widget="char" size="512"/>
-                                        <field name="email_cc" widget="char" size="512"/>
-                                        <field name="name" colspan="4" widget="char" size="512"/>
+                                        <field name="email_to" size="512"/>
+                                        <field name="email_cc" size="512"/>
+                                        <field name="name" colspan="4"/>
                                         <field name="history" invisible="1"/>
                                     </group>
                                     <notebook colspan="4">