From 61d7b4a0836be209ab67f2b6ef80879160c4008c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 16 Sep 2010 17:26:24 +0200
Subject: [PATCH 1/2] [IMP] marketing_campaign: prevent deletion of a segment's
 ir_filter as it opens the segment completely

bzr revid: odo@openerp.com-20100916152624-1rgfgmarqna28ko8
---
 addons/marketing_campaign/marketing_campaign.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 4fd4fda5253..bdfe825781c 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -223,7 +223,8 @@ class marketing_campaign_segment(osv.osv):
         'name': fields.char('Name', size=64,required=True),
         'campaign_id': fields.many2one('marketing.campaign', 'Campaign', required=True, select=1, ondelete="cascade"),
         'object_id': fields.related('campaign_id','object_id', type='many2one', relation='ir.model', string='Resource'),
-        'ir_filter_id': fields.many2one('ir.filters', 'Filter', help="Filter to select the matching resource records that belong to this segment. New filters can be created and saved using the advanced search on the list view of the Resource. If no filter is set, all records are selected without filtering. The synchronization mode may also add a criterion to the filter."),
+        'ir_filter_id': fields.many2one('ir.filters', 'Filter', ondelete="restrict",
+                            help="Filter to select the matching resource records that belong to this segment. New filters can be created and saved using the advanced search on the list view of the Resource. If no filter is set, all records are selected without filtering. The synchronization mode may also add a criterion to the filter."),
         'sync_last_date': fields.datetime('Last Synchronization', help="Date on which this segment was synchronized last time (automatically or manually)"),
         'sync_mode': fields.selection([('create_date', 'Only records created after last sync'),
                                       ('write_date', 'Only records modified after last sync (no duplicates)'),

From f78c1bd613edb2673aaaaa32d2101707350975bf Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 16 Sep 2010 18:45:13 +0200
Subject: [PATCH 2/2] [IMP] crm: all crm default data (sales team, categories)
 must be in noupdate mode

bzr revid: odo@openerp.com-20100916164513-fwl69wsikb0mtjp9
---
 addons/crm/crm_data.xml             | 2 +-
 addons/crm/crm_lead_data.xml        | 2 +-
 addons/crm/crm_opportunity_data.xml | 2 +-
 addons/crm/crm_phonecall_data.xml   | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 60af74e9359..e494db325e5 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
         <record model="crm.case.section" id="section_sales_department">
             <field name="name">Sales Department</field>
             <field name="code">Sales</field>
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 41eeb529154..566976c1d52 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
 
         <!--        CASE STATUS(stage_id)        -->
diff --git a/addons/crm/crm_opportunity_data.xml b/addons/crm/crm_opportunity_data.xml
index fd4d76d5865..59e0828d0ee 100644
--- a/addons/crm/crm_opportunity_data.xml
+++ b/addons/crm/crm_opportunity_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
+<data noupdate="1">
     <record model="crm.case.categ" id="categ_oppor1">
         <field name="name">Existing Customer</field>
         <field name="section_id" ref="section_sales_department"/>
diff --git a/addons/crm/crm_phonecall_data.xml b/addons/crm/crm_phonecall_data.xml
index 723cfeaca26..097540bada4 100644
--- a/addons/crm/crm_phonecall_data.xml
+++ b/addons/crm/crm_phonecall_data.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-->
-
     <!--
     Phonecall Categories
     -->