[MERGE] Merged from the main trunk addons

bzr revid: ach@tinyerp.com-20100917042043-6r70331avxzfnqg8

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>

addons/crm/crm_lead_data.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
 
         <!--        CASE STATUS(stage_id)        -->

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"/>

addons/crm/crm_phonecall_data.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-->
-
     <!--
     Phonecall Categories
     -->

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)'),