From 4fccab7afc9488614f26527c1573daadd2d1279a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 12 Nov 2012 19:00:40 +0100
Subject: [PATCH 1/2] [IMP] remove whitespaces

bzr revid: abo@openerp.com-20121112180040-8duawenqlvd4mw7i
---
 addons/crm/crm_view.xml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 3a764dbce13..5fa647f7253 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -24,7 +24,7 @@
             parent="base.menu_base_config" sequence="45" groups="base.group_sale_salesman"/>
 
         <menuitem id="base.next_id_64" name="Sales"
-            parent="base.menu_reporting" sequence="1" />
+            parent="base.menu_reporting" sequence="1"/>
 
         <menuitem id="base.menu_sales_configuration_misc" name="Miscellaneous" parent="base.menu_base_config" sequence="81"/>
 
@@ -86,7 +86,7 @@
                             <field name="parent_id"/>
                             <field name="code"/>
                         </group>
-                        
+
                         <group>
                             <field name="user_id"/>
                             <field name="resource_calendar_id"/>
@@ -163,7 +163,7 @@
             <field name="view_id" ref="crm_case_section_view_tree"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to define a new sales team. 
+                Click to define a new sales team.
               </p><p>
                 Use sales team to organize your different salespersons or
                 departments into separate teams. Each team will work in
@@ -203,7 +203,7 @@
                 <form string="Stage" version="7.0">
                     <group col="4">
                         <field name="name"/>
-                        <field name="state" />
+                        <field name="state"/>
                         <field name="probability"/>
                         <field name="type"/>
                         <field name="on_change"/>
@@ -228,7 +228,7 @@
         </record>
 
 
-     <!-- Case Categories Form View -->
+        <!-- Case Categories Form View -->
 
         <record id="crm_case_categ-view" model="ir.ui.view">
             <field name="name">crm.case.categ.form</field>
@@ -238,7 +238,7 @@
                     <group>
                         <field name="name"/>
                         <field name="section_id"/>
-                        <field name="object_id"  invisible="1" />
+                        <field name="object_id" invisible="1"/>
                     </group>
                 </form>
             </field>
@@ -297,7 +297,7 @@
          <menuitem action="crm_case_resource_type_act"
             id="menu_crm_case_resource_type_act" sequence="4"
             groups="base.group_no_one"
-            parent="base.menu_crm_config_lead" />
+            parent="base.menu_crm_config_lead"/>
 
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
             <field name="name">Cases by Sales Team</field>
@@ -354,13 +354,13 @@
                         <button name="process_start"
                             states="not running"
                             string="Compute Segmentation" type="object"
-                            icon="gtk-execute" />
+                            icon="gtk-execute"/>
                         <button name="process_stop" states="running"
                             string="Stop Process" type="object"
-                            icon="gtk-cancel" />
+                            icon="gtk-cancel"/>
                         <button name="process_continue" states="running"
                             string="Continue Process" type="object"
-                            icon="gtk-go-forward" />
+                            icon="gtk-go-forward"/>
                         <field name="state" widget="statusbar"/>
                     </header>
                     <group col="4">
@@ -412,7 +412,7 @@
             <field name="view_mode">tree,form</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to define a new customer segmentation. 
+                Click to define a new customer segmentation.
               </p><p>
                 Create specific categories which you can assign to your
                 contacts to better manage your interactions with them. The
@@ -425,7 +425,7 @@
        <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
             groups="base.group_no_one" sequence="15"
-            parent="base.menu_base_config" />
+            parent="base.menu_base_config"/>
 
         <!-- menu for the working time -->
         <menuitem action="resource.action_resource_calendar_form" id="menu_action_resource_calendar_form" parent="resource.menu_resource_config" sequence="1"/>
@@ -466,11 +466,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-            
+
         <menuitem action="action_crm_payment_mode"
             id="menu_crm_payment_mode_act"
             groups="base.group_no_one"
             name="Payment Modes"
-            parent="base.menu_crm_config_lead" />
+            parent="base.menu_crm_config_lead"/>
     </data>
 </openerp>

From 6db4b0b2118b4fc57451cd8b6febffe1434c807f Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 12 Nov 2012 19:01:44 +0100
Subject: [PATCH 2/2] [IMP] remove restrictions on lead deletion After a short
 conversation with fp, al, odo, abo: it seems that it would be nice for
 usability's sake to remove restrictions on leads deletion, in the CRM module.
 This condition on leads' state was introduced several years ago by fp to
 avoid unfortunate misclicks. It has been followed by another one bypassing
 the first one in case where the sales team had the allow_unlink flag set.

Since the Delete button has been thrown away in the More menu, it shouldn't get misclicked anymore, preventing damages in the CRM pipe. This will simplify access rights for users: if you want to delete a lead, you can, whatever its state, whatever its sales team.

Access restriction is still possible though by creating a record rule with a domain on the lead.state.

lp bug: https://launchpad.net/bugs/1078037 fixed

bzr revid: abo@openerp.com-20121112180144-utqcm39etuuzxdsu
---
 addons/crm/crm.py       | 2 --
 addons/crm/crm_lead.py  | 8 --------
 addons/crm/crm_view.xml | 1 -
 3 files changed, 11 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index eb602b98c09..368656224ac 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -115,7 +115,6 @@ class crm_case_section(osv.osv):
         'code': fields.char('Code', size=8),
         'active': fields.boolean('Active', help="If the active field is set to "\
                         "true, it will allow you to hide the sales team without removing it."),
-        'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"),
         'change_responsible': fields.boolean('Reassign Escalated', help="When escalating to this team override the salesman with the team leader."),
         'user_id': fields.many2one('res.users', 'Team Leader'),
         'member_ids':fields.many2many('res.users', 'sale_member_rel', 'section_id', 'member_id', 'Team Members'),
@@ -137,7 +136,6 @@ class crm_case_section(osv.osv):
 
     _defaults = {
         'active': 1,
-        'allow_unlink': 1,
         'stage_ids': _get_stage_common,
         'alias_domain': False, # always hide alias during creation
     }
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 64ba9476701..547b25af27c 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -779,14 +779,6 @@ class crm_lead(base_stage, format_address, osv.osv):
         }
         return res
 
-    def unlink(self, cr, uid, ids, context=None):
-        for lead in self.browse(cr, uid, ids, context):
-            if (not lead.section_id.allow_unlink) and (lead.state != 'draft'):
-                raise osv.except_osv(_('Error!'),
-                    _("You cannot delete lead '%s' because it is not in 'Draft' state. " \
-                      "You can still cancel it, instead of deleting it.") % lead.name)
-        return super(crm_lead, self).unlink(cr, uid, ids, context)
-
     def write(self, cr, uid, ids, vals, context=None):
         if vals.get('stage_id') and not vals.get('probability'):
             # change probability of lead(s) if required by stage
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 5fa647f7253..99d3752529e 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -102,7 +102,6 @@
                                     <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
                                  </div>
                                 <field name="change_responsible"/>
-                                <field name="allow_unlink"/>
                             </group>
                             <separator string="Team Members"/>
                             <field name="member_ids" widget="many2many_kanban">