From 4628a270c88c128a82e1dc9f72e2818f05e03342 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 3 Nov 2008 13:46:21 +0100
Subject: [PATCH] merge

bzr revid: fp@tinyerp.com-20081103124621-nu6unagg1unvrsb1
---
 addons/crm_configuration/crm_lead_menu.xml    | 82 +++----------------
 .../wizard/wizard_opportunity_set.py          |  1 +
 2 files changed, 12 insertions(+), 71 deletions(-)

diff --git a/addons/crm_configuration/crm_lead_menu.xml b/addons/crm_configuration/crm_lead_menu.xml
index 4bf87297658..ed6629674b4 100644
--- a/addons/crm_configuration/crm_lead_menu.xml
+++ b/addons/crm_configuration/crm_lead_menu.xml
@@ -8,7 +8,7 @@
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all">
         <field name="name">All Leads</field>
         <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
     </record>
@@ -18,12 +18,6 @@
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
-    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
@@ -36,7 +30,7 @@
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all1">
         <field name="name">Current Leads</field>
         <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
     </record>
@@ -46,12 +40,6 @@
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all1">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
-    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all1">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
@@ -63,7 +51,7 @@
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_unassigned">
         <field name="name">Unassigned Leads</field>
         <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\'),(\'user_id\',\'=\',False)]'"/>
     </record>
@@ -73,12 +61,6 @@
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_unassigned"/>
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_unassigned">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_unassigned"/>
-    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_unassigned">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
@@ -93,7 +75,7 @@
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all2">
         <field name="name">All Draft Leads</field>
         <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'draft\')]'"/>
     </record>
@@ -103,12 +85,6 @@
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all2">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
-    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all2">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
@@ -120,7 +96,7 @@
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all3">
         <field name="name">All Open Leads</field>
         <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'open\')]'"/>
     </record>
@@ -130,12 +106,6 @@
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
-    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all3">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
@@ -147,7 +117,7 @@
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all4">
         <field name="name">All Pending Leads</field>
         <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'pending\')]'"/>
     </record>
@@ -157,12 +127,6 @@
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all4">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
-    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all4">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
@@ -175,7 +139,7 @@
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my">
         <field name="name">My Leads</field>
         <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid)]'"/>
     </record>
@@ -185,12 +149,6 @@
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my"/>
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_my"/>
-    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
@@ -203,7 +161,7 @@
         <field name="name">New Lead</field>
         <field name="res_model">crm.case</field>
         <field name="view_type">form</field>
-        <field name="view_mode">form,tree,calendar</field>
+        <field name="view_mode">form,tree</field>
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
     </record>
@@ -224,7 +182,7 @@
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my1">
         <field name="name">My Current Leads</field>
         <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
     </record>
@@ -234,12 +192,6 @@
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my1">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
-    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my1">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
@@ -251,7 +203,7 @@
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my3">
         <field name="name">My Open Leads</field>
         <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
     </record>
@@ -261,12 +213,6 @@
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
-    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my3">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
@@ -278,7 +224,7 @@
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my4">
         <field name="name">My Pending Leads</field>
         <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
     </record>
@@ -288,12 +234,6 @@
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my4">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
-    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my4">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
diff --git a/addons/crm_configuration/wizard/wizard_opportunity_set.py b/addons/crm_configuration/wizard/wizard_opportunity_set.py
index 5818ab44282..2a38ac0432d 100644
--- a/addons/crm_configuration/wizard/wizard_opportunity_set.py
+++ b/addons/crm_configuration/wizard/wizard_opportunity_set.py
@@ -89,6 +89,7 @@ class make_opportunity(wizard.interface):
         })
         value = {
             'domain': "[]",
+            'name': _('Opportunity'),
             'view_type': 'form',
             'view_mode': 'form,tree',
             'res_model': 'crm.case',