From c74c70d5ad23b06c853b1086920e2463d96a06ec Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 30 Oct 2009 11:19:47 +0530
Subject: [PATCH 1/4] [IMP]: crm_configuration: Renamed jobs action ids that
 was duplicated in helpdesk for the problem of proper form view

bzr revid: rpa@tinyerp.com-20091030054947-kq93jlcxxo1rh2n5
---
 addons/crm_configuration/crm_jobs_menu.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/crm_configuration/crm_jobs_menu.xml b/addons/crm_configuration/crm_jobs_menu.xml
index 71e65c623ae..44e6f10661f 100644
--- a/addons/crm_configuration/crm_jobs_menu.xml
+++ b/addons/crm_configuration/crm_jobs_menu.xml
@@ -4,7 +4,7 @@
     <menuitem icon="terp-hr" id="menu_hr" name="Human Resources"/>
 
     ######################## JOB OPPORTUNITIES (menu) ###########################
-     <record model="ir.actions.act_window" id="crm_case_categ0_act111">
+     <record model="ir.actions.act_window" id="crm_case_categ0_act_jobs">
         <field name="name">All Jobs Requests</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form,graph</field>
@@ -13,29 +13,29 @@
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
+    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act_jobs">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act111"/>
+        <field name="act_window_id" ref="crm_case_categ0_act_jobs"/>
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
+    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act_jobs">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
         <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act111"/>
+        <field name="act_window_id" ref="crm_case_categ0_act_jobs"/>
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_act111">
+    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_act_jobs">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
         <field name="view_id" ref="crm_case_form_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act111"/>
+        <field name="act_window_id" ref="crm_case_categ0_act_jobs"/>
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act111">
+    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act_jobs">
         <field name="sequence" eval="4"/>
         <field name="view_mode">graph</field>
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
-        <field name="act_window_id" ref="crm_case_categ0_act111"/>
+        <field name="act_window_id" ref="crm_case_categ0_act_jobs"/>
     </record>
     <menuitem
         name="Jobs - Hiring Process" 
@@ -45,7 +45,7 @@
  <!-- 
         ALL JOBS REQUESTS 
     -->
-    <menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act111" action="crm_case_categ0_act111"/>    
+    <menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act_jobs" action="crm_case_categ0_act_jobs"/>    
     
 </data>
 </openerp>

From 20784ad745622c9e964a44c2f9a55953e406d1b0 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 30 Oct 2009 11:57:27 +0530
Subject: [PATCH 2/4] [IMP]: CRM Ergonomy Improvement blueprint: Removed
 filters completly from crm and crm_configuration

bzr revid: rpa@tinyerp.com-20091030062727-3h0fr23zf7orj3py
---
 addons/crm/crm_view.xml                       |  3 --
 .../crm_configuration/crm_helpdesk_menu.xml   | 30 -------------------
 2 files changed, 33 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 156ac40aa3a..088edfcffa7 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -477,7 +477,6 @@
             <field name="res_model">crm.case</field>
             <field name="view_type">form</field>
             <field name="domain">[('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
         <menuitem action="crm_case_categ0-act_open" id="menu_crm_case_categ0-act_open" parent="crm.menu_crm_case_categ0-act" groups="base.group_extended_menu"/>
@@ -488,7 +487,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('user_id','=',uid)]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
         <menuitem action="crm_case_categ0-act_my" id="menu_crm_case_categ0-act_my" parent="crm.next_id_52" groups="base.group_extended_menu"/>
@@ -498,7 +496,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('user_id','=',uid),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
         <menuitem action="crm_case_categ0-act_my_open" id="menu_crm_case_categ0-act_my_open" parent="crm.menu_crm_case_categ0-act_my" groups="base.group_extended_menu"/>
diff --git a/addons/crm_configuration/crm_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml
index 764a694539f..7cbdeb99443 100644
--- a/addons/crm_configuration/crm_helpdesk_menu.xml
+++ b/addons/crm_configuration/crm_helpdesk_menu.xml
@@ -32,36 +32,6 @@
         <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
     </record>
     <menuitem name="Helpdesk and Support" id="menu_help_support_main" parent="menu_aftersale" action="crm_case_helpdesk_act111"/>    
-
-    <record model="ir.actions.act_window" id="crm_case_categ_help_act">
-        <field name="name">My Helpdesk</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid)]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view1">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_categ_help_act"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_helpdesk_calendar_view3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="act_window_id" ref="crm_case_categ_help_act"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view2">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_categ_help_act"/>
-    </record>
-    
     
 </data>
 </openerp>

From 82ce46422fa237af6f63211d4b1e1d40fda1e11c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 30 Oct 2009 12:23:18 +0530
Subject: [PATCH 3/4] [IMP]: CRM Ergonomy Improvement blueprint: Added CC
 wizard in all sections views

bzr revid: rpa@tinyerp.com-20091030065318-8f3ceh5a8891eqav
---
 addons/crm/crm_view.xml                           | 2 +-
 addons/crm_configuration/crm_bugs_view.xml        | 6 +++++-
 addons/crm_configuration/crm_claims_view.xml      | 6 +++++-
 addons/crm_configuration/crm_fund_view.xml        | 6 +++++-
 addons/crm_configuration/crm_helpdesk_view.xml    | 6 +++++-
 addons/crm_configuration/crm_jobs_view.xml        | 6 +++++-
 addons/crm_configuration/crm_lead_view.xml        | 6 +++++-
 addons/crm_configuration/crm_opportunity_view.xml | 6 +++++-
 8 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 088edfcffa7..7c054364583 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -422,7 +422,7 @@
                                        <field name="canal_id"/>
                                        <button
                                      string="Add a CC"
-		                                   	name="%(action_view_crm_email_add_cc_wizard)d"
+		                                   	name="%(crm.action_view_crm_email_add_cc_wizard)d"
 		                                   	icon="gtk-add" type="action"/>
                                    </group>
                                    <newline/>
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index 612037d1c20..f20b4761ab0 100755
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -97,10 +97,14 @@
                    </group>
                     <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="6" colspan="4">
+                            <group col="7" colspan="4">
                                 <field name="date"/>
                                 <field name="email"/>
                                 <field name="canal_id"/>
+                                <button
+								   string="Add a CC"
+								    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+								    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
diff --git a/addons/crm_configuration/crm_claims_view.xml b/addons/crm_configuration/crm_claims_view.xml
index 706e38602de..9bb8647d60d 100755
--- a/addons/crm_configuration/crm_claims_view.xml
+++ b/addons/crm_configuration/crm_claims_view.xml
@@ -111,10 +111,14 @@
                    </group>
                     <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="6" colspan="4">
+                            <group col="7" colspan="4">
                                 <field name="date"/>
                                 <field name="email"/>
                                 <field name="canal_id"/>
+                                <button
+								   string="Add a CC"
+								    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+								    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
diff --git a/addons/crm_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml
index 1e96637eee9..7d1c0fac677 100644
--- a/addons/crm_configuration/crm_fund_view.xml
+++ b/addons/crm_configuration/crm_fund_view.xml
@@ -100,10 +100,14 @@
                    </group>
                     <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                        <form string="Communication history">
-                            <group col="6" colspan="4">
+                            <group col="7" colspan="4">
                                 <field name="date"/>
                                 <field name="email"/>
                                 <field name="canal_id"/>
+                                <button
+								   string="Add a CC"
+								    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+								    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
diff --git a/addons/crm_configuration/crm_helpdesk_view.xml b/addons/crm_configuration/crm_helpdesk_view.xml
index 1a5a71981c1..6ed6154a332 100644
--- a/addons/crm_configuration/crm_helpdesk_view.xml
+++ b/addons/crm_configuration/crm_helpdesk_view.xml
@@ -95,10 +95,14 @@
                        </group>
                        <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                            <form string="Communication history">
-                               <group col="6" colspan="4">
+                               <group col="7" colspan="4">
                                    <field name="date"/>
                                    <field name="email"/>
                                    <field name="canal_id"/>
+                                   <button
+									   string="Add a CC"
+									    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+									    icon="gtk-add" type="action"/>
                                </group>
                                <newline/>
                                <field name="description" colspan="4" nolabel="1"/>
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index d8608c87437..5953b193ae6 100755
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -119,10 +119,14 @@
                        </group>
                        <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="6" colspan="4">
+                            <group col="7" colspan="4">
                                 <field name="date"/>
                                 <field name="email"/>
                                 <field name="canal_id"/>
+                                <button
+								   string="Add a CC"
+								    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+								    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 5efe38fa177..d5da665a399 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -111,10 +111,14 @@
                    </group>
                     <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="6" colspan="4">
+                            <group col="7" colspan="4">
                                 <field name="date"/>
                                 <field name="email"/>
                                 <field name="canal_id"/>
+                                <button
+								   string="Add a CC"
+								    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+								    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index 22fe5552413..5a920ad1df2 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -111,10 +111,14 @@
                    </group>
                     <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="6" colspan="4">
+                            <group col="7" colspan="4">
                                 <field name="date"/>
                                 <field name="email"/>
                                 <field name="canal_id"/>
+                                <button
+								   string="Add a CC"
+								    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+								    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>

From 3024a25c8ca7f3fbad3ab23b7a28cd81527b60e7 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 30 Oct 2009 13:01:02 +0530
Subject: [PATCH 4/4] [IMP]: crm_configuration: minor improvements

bzr revid: rpa@tinyerp.com-20091030073102-sxbc2vglpl3w5mt4
---
 addons/crm_configuration/crm_helpdesk_view.xml | 2 +-
 addons/crm_configuration/crm_jobs_view.xml     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm_configuration/crm_helpdesk_view.xml b/addons/crm_configuration/crm_helpdesk_view.xml
index 6ed6154a332..e7ac7d07def 100644
--- a/addons/crm_configuration/crm_helpdesk_view.xml
+++ b/addons/crm_configuration/crm_helpdesk_view.xml
@@ -3,7 +3,7 @@
 <data>
 
     # ------------------------------------------------------ 
-    # Opportunities
+    # HelpDesk
     # ------------------------------------------------------ 
 
     <record model="ir.ui.view" id="crm_case_form_view_helpdesk">
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index 5953b193ae6..57cf785e9b8 100755
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -169,11 +169,11 @@
 	                   <filter icon="gtk-home" string="   Today   "
 	                   	separator="1"
 	                   	domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]"
-	                   	help="Todays's Opportunities"
+	                   	help="Todays's Jobs"
 	                   />
 	                   <filter icon="gtk-media-rewind"
 	                   	string="    7 Days    " separator="1" domain="[]"
-	                   	help="Opportunities during last 7 days"
+	                   	help="Jobs during last 7 days"
 	                   />
 	                   <separator orientation="vertical"/>
 	                   <filter icon="gtk-new" string="New Jobs"