From d6b1c171756294ea66b15778a8504995242f0f89 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 21 Sep 2010 18:39:51 +0200
Subject: [PATCH] fix

bzr revid: fp@tinyerp.com-20100921163951-0abtsd9apds8lj2e
---
 addons/crm/board_crm_demo.xml                 |  18 +--
 addons/crm/board_crm_view.xml                 | 132 +++++++++---------
 addons/crm/crm.py                             |  35 ++---
 addons/crm/crm_lead.py                        |  12 +-
 addons/crm/crm_lead_data.xml                  |  18 +--
 addons/crm/crm_lead_view.xml                  |  15 +-
 addons/crm/crm_meeting_view.xml               |   4 +-
 addons/crm/crm_opportunity_data.xml           |   6 +-
 addons/crm/crm_opportunity_view.xml           |  13 +-
 addons/crm/crm_phonecall.py                   |   2 +-
 addons/crm/crm_phonecall_view.xml             |  34 +++--
 addons/crm/crm_view.xml                       |  14 +-
 addons/crm/report/crm_lead_report.py          |   6 +-
 addons/crm/report/crm_lead_report_view.xml    |  34 +++--
 .../report/crm_lead_report.py                 |   2 +-
 15 files changed, 176 insertions(+), 169 deletions(-)

diff --git a/addons/crm/board_crm_demo.xml b/addons/crm/board_crm_demo.xml
index 9151d787af9..fd8bb480d68 100644
--- a/addons/crm/board_crm_demo.xml
+++ b/addons/crm/board_crm_demo.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">
+    <data noupdate="1">
 
-		<!--
-		 Administrator shortcut
-		 Demo user startup menu
-		 -->
-		<record model="res.users" id="base.user_root">
-			<field name="action_id" ref="open_board_crm"/>
-		</record>
+        <!--
+         Administrator shortcut
+         Demo user startup menu
+         -->
+        <record model="res.users" id="base.user_root">
+            <field name="action_id" ref="open_board_crm"/>
+        </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index f0cd7cfdefb..8aa1d96d403 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-		<record model="board.note.type" id="note_crm_type">
-			<field name="name">CRM Configuration</field>
-		</record>
+     <data>
+          <record model="board.note.type" id="note_crm_type">
+               <field name="name">CRM Configuration</field>
+          </record>
 
-		<record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
-			<field name="name">crm.opportunity.user.graph1</field>
-			<field name="model">crm.lead.report</field>
-			<field name="type">graph</field>
-			<field name="arch" type="xml">
-				<graph string="Opportunities by User and Section" type="bar">
-					<field name="stage_id"/>
-					<field name="nbr" operator="+"/>
-					<field name="user_id" group="True"/>
-				</graph>
-			</field>
-		</record>
-		
+          <record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
+               <field name="name">crm.opportunity.user.graph1</field>
+               <field name="model">crm.lead.report</field>
+               <field name="type">graph</field>
+               <field name="arch" type="xml">
+                    <graph string="Opportunities by User and Team" type="bar">
+                         <field name="stage_id"/>
+                         <field name="nbr" operator="+"/>
+                         <field name="user_id" group="True"/>
+                    </graph>
+               </field>
+          </record>
+          
         <record id="view_report_crm_oppor_graph" model="ir.ui.view">
             <field name="name">crm.lead.report.graph</field>
             <field name="model">crm.lead.report</field>
@@ -31,7 +31,7 @@
         </record>
         
         <record model="ir.ui.view" id="crm_case_my_open_oppor">
-            <field name="name">My Open Opportunities</field>
+            <field name="name">Opportunities</field>
             <field name="model">crm.lead</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
@@ -64,13 +64,13 @@
             </field>
         </record>
 
-		<record model="ir.actions.act_window" id="act_my_oppor">
-		    <field name="name">My Open Opportunities</field>
-			<field name="res_model">crm.lead</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
+          <record model="ir.actions.act_window" id="act_my_oppor">
+              <field name="name">My Open Opportunities</field>
+               <field name="res_model">crm.lead</field>
+               <field name="view_type">form</field>
+               <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid),('state','=','open'), ('type', '=', 'opportunity')]</field>
-		</record>
+          </record>
         
         <record model="ir.actions.act_window.view" id="act_my_oppor_tree_view">
           <field name="sequence" eval="1"/>
@@ -86,52 +86,52 @@
             <field name="act_window_id" ref="act_my_oppor"/>
         </record>
 
-		<record model="ir.actions.act_window" id="act_my_meetings">
-			<field name="res_model">crm.meeting</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="crm.crm_case_tree_view_meet"/>
+          <record model="ir.actions.act_window" id="act_my_meetings">
+               <field name="res_model">crm.meeting</field>
+               <field name="view_type">form</field>
+               <field name="view_mode">tree,form</field>
+               <field name="view_id" ref="crm.crm_case_tree_view_meet"/>
             <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
-		</record>
+          </record>
 
-		<record model="ir.actions.act_window" id="act_my_oppor_stage">
-			<field name="res_model">crm.lead.report</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">graph,tree,form</field>
-			<field name="view_id" ref="view_report_crm_oppor_graph"/>
+          <record model="ir.actions.act_window" id="act_my_oppor_stage">
+               <field name="res_model">crm.lead.report</field>
+               <field name="view_type">form</field>
+               <field name="view_mode">graph,tree,form</field>
+               <field name="view_id" ref="view_report_crm_oppor_graph"/>
             <field name="domain">['&amp;', '&amp;', ('user_id','=',uid), ('type', '=', 'opportunity'), '!' , '&amp;', ('state', '=', 'done'),  ('date_closed','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field>
-		</record>
+          </record>
 
-		<record model="ir.actions.act_window" id="act_sales_pipeline">
-			<field name="res_model">crm.lead.report</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">graph,tree,form</field>
-			<field name="view_id" ref="view_crm_opportunity_user_graph1"/>
-			<field name="domain">['&amp;', ('user_id', '=', uid),'&amp;', ('state', '=', 'done') , '&amp;', ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%Y-%m-%d')), ('type', '=', 'opportunity')]</field>
-		</record>
+          <record model="ir.actions.act_window" id="act_sales_pipeline">
+               <field name="res_model">crm.lead.report</field>
+               <field name="view_type">form</field>
+               <field name="view_mode">graph,tree,form</field>
+               <field name="view_id" ref="view_crm_opportunity_user_graph1"/>
+               <field name="domain">['&amp;', ('user_id', '=', uid),'&amp;', ('state', '=', 'done') , '&amp;', ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%Y-%m-%d')), ('type', '=', 'opportunity')]</field>
+          </record>
 
-		<record model="ir.ui.view" id="board_crm_form">
-			<field name="name">CRM - Dashboard Form</field>
-			<field name="model">board.board</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Connecting Dashboard">
-					<hpaned>
-						<child1>
-							<action
-								string="My Open Opportunities"
-								name="%(act_my_oppor)d"
-								colspan="4"
-								height="150"
-								width="510"/>
-							<action
-								string="My Meetings"
-								name="%(act_my_meetings)d"
-								height="150"
-								colspan="4"/>
-						</child1>
-						<child2>
-							<action
+          <record model="ir.ui.view" id="board_crm_form">
+               <field name="name">CRM - Dashboard Form</field>
+               <field name="model">board.board</field>
+               <field name="type">form</field>
+               <field name="arch" type="xml">
+                    <form string="Connecting Dashboard">
+                         <hpaned>
+                              <child1>
+                                   <action
+                                        string="My Open Opportunities"
+                                        name="%(act_my_oppor)d"
+                                        colspan="4"
+                                        height="150"
+                                        width="510"/>
+                                   <action
+                                        string="My Meetings"
+                                        name="%(act_my_meetings)d"
+                                        height="150"
+                                        colspan="4"/>
+                              </child1>
+                              <child2>
+                                   <action
                                 string="My Planned Revenues by Stage"
                                 name="%(act_my_oppor_stage)d"
                                 colspan="4"/>
@@ -152,7 +152,7 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_crm_form"/>
         </record>
-	    <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
+         <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
         <menuitem
             name="Connecting Dashboard" parent="board.menu_dasboard"
             action="open_board_crm"
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index a16f749323d..c8dde37d9e5 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -613,31 +613,13 @@ crm_case_categ()
 
 class crm_case_resource_type(osv.osv):
     """ Resource Type of case """
-
     _name = "crm.case.resource.type"
-    _description = "Resource Type of case"
+    _description = "Campaign"
     _rec_name = "name"
-
     _columns = {
-        'name': fields.char('Resource Type', size=64, required=True, translate=True),
+        'name': fields.char('Campaign Name', size=64, required=True, translate=True),
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'object_id': fields.many2one('ir.model', 'Object Name'),
     }
-    def _find_object_id(self, cr, uid, context=None):
-        """Finds id for case object
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        """
-        object_id = context and context.get('object_id', False) or False
-        ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
-        return ids and ids[0]
-
-    _defaults = {
-        'object_id' : _find_object_id
-    }
-
 crm_case_resource_type()
 
 
@@ -711,17 +693,16 @@ res_partner()
 
 class crm_case_section_custom(osv.osv):
     _name = "crm.case.section.custom"
-    _description = 'Custom CRM Case Section' 
-
+    _description = 'Custom CRM Case Teams' 
     _columns = {
-        'name': fields.char('Case Section',size=64, required=True, translate=True),
-        'code': fields.char('Section Code',size=8),
+        'name': fields.char('Case Team',size=64, required=True, translate=True),
+        'code': fields.char('Team Code',size=8),
         'active': fields.boolean('Active'),
         'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"),
         'sequence': fields.integer('Sequence'),
         'user_id': fields.many2one('res.users', 'Responsible User'),
         'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by OpenERP about cases in this section"),
-        'parent_id': fields.many2one('crm.case.section.custom', 'Parent Section'), 
+        'parent_id': fields.many2one('crm.case.section.custom', 'Parent Team'), 
         'note': fields.text('Notes'),
     }
 
@@ -731,7 +712,7 @@ class crm_case_section_custom(osv.osv):
     }
 
     _sql_constraints = [
-        ('code_uniq', 'unique (code)', 'The code of the section must be unique !')
+        ('code_uniq', 'unique (code)', 'The code of the team must be unique !')
     ]
 
     def _check_recursion(self, cr, uid, ids):
@@ -763,7 +744,7 @@ class crm_case_custom(osv.osv, crm_case):
             'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
             'active': fields.boolean('Active'),
             'description': fields.text('Description'),
-            'section_id': fields.many2one('crm.case.section.custom', 'Section', required=True, select=True),
+            'section_id': fields.many2one('crm.case.section.custom', 'Team', required=True, select=True),
             'probability': fields.float('Probability (%)'),
             'email_from': fields.char('Partner Email', size=128),
             'email_cc': fields.char('CC', size=252),
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 60288ac3bf9..da09795547a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -114,17 +114,17 @@ class crm_lead(crm_case, osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which this case belongs to. Defines responsible user and e-mail address for the mail gateway.'),
         'create_date': fields.datetime('Creation Date' , readonly=True),
-        'email_cc': fields.text('Watchers Emails', size=252 , help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
+        'email_cc': fields.text('Global CC', size=252 , help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
         'description': fields.text('Notes'),
         'write_date': fields.datetime('Update Date' , readonly=True),
 
         # Lead fields
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
-                        domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.lead')]"),
-        'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', \
-                         domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.lead')]"),
+            domain="['|',('section_id','=',section_id),('section_id','=',False)]"),
+        'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
+            domain="['|',('section_id','=',section_id),('section_id','=',False)]"),
+        'channel_id': fields.many2one('res.partner.canal', 'Channel'),
+
         'partner_name': fields.char("Partner Name", size=64),
         'optin': fields.boolean('Opt-In'),
         'optout': fields.boolean('Opt-Out'),
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 566976c1d52..2616d97d612 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -56,49 +56,41 @@
         <record model="crm.case.resource.type" id="type_lead1">
             <field name="name">Telesales</field>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
         <record model="crm.case.resource.type" id="type_lead2">
-            <field name="name">Mail</field>
+            <field name="name">Mail Campaign 1</field>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
         <record model="crm.case.resource.type" id="type_lead3">
-            <field name="name">Email</field>
+            <field name="name">Mail Campaign 2</field>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
         <record model="crm.case.resource.type" id="type_lead4">
-            <field name="name">Print</field>
+            <field name="name">Twitter Ads</field>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
         <record model="crm.case.resource.type" id="type_lead5">
-            <field name="name">Web</field>
+            <field name="name">Google Adwords</field>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
         <record model="crm.case.resource.type" id="type_lead6">
-            <field name="name">Radio</field>
+            <field name="name">Google Adwords 2</field>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
         <record model="crm.case.resource.type" id="type_lead7">
             <field name="name">Television</field>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
         <record model="crm.case.resource.type" id="type_lead8">
             <field name="name">Newsletter</field>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
     </data>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index e52fd34960b..f9a3a1fb629 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -85,7 +85,7 @@
                 <page string="Lead">
                     <group colspan="2" col="4">
                         <separator string="Contact" colspan="4" col="4"/>
-                        <field name="partner_name" string="Partner Name" colspan="4"/>
+                        <field name="partner_name" colspan="4"/>
                         <newline/>
                         <field domain="[('domain', '=', 'contact')]" name="title"/>
                         <field name="function" />
@@ -146,7 +146,8 @@
                         <field name="company_id"
                             groups="base.group_multi_company"
                             widget="selection" colspan="2" />
-                        <field name="type_id" string="Campaign" select="1"/>
+                        <field name="type_id" select="1" widget="selection"/>
+                        <field name="channel_id" select="1" widget="selection"/>
                         <field name="referred"/>
                     </group>
                     <group colspan="2" col="2">
@@ -169,7 +170,7 @@
                  </page>
                  <page string="History" groups="base.group_extended">
                    <group colspan="4">
-                       <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
+                       <field colspan="4" name="email_cc" widget="char" size="512"/>
                    </group>
                     <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
                         <tree string="Communication history">
@@ -243,6 +244,7 @@
                 <field name="categ_id" invisible="1"/>
                 <field name="type_id" invisible="1"/>
                 <field name="referred" invisible="1"/>
+                <field name="channel_id" invisible="1"/>
 
                 <field name="stage_id" />
                 <button name="stage_previous" string="Previous Stage"
@@ -338,7 +340,12 @@
                 <group expand="0" string="Group By...">
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'categ_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Category" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'categ_id'}"/>
+                    <filter string="Campaign" icon="terp-stock_symbol-selection"
+                        domain="[]" context="{'group_by':'type_id'}" />
+                    <filter string="Channel" icon="terp-stock_symbol-selection"
+                        domain="[]" context="{'group_by':'channel_id'}" />
                     <separator orientation="vertical"/>
                     <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                     <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index a3556653516..55ef2c7d5e3 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -306,8 +306,8 @@
                            <separator orientation="vertical"/>
                            <field name="name" select="1" string="Subject"/>
                            <field name="categ_id" select="1"
-                           	string="Meeting Type" widget="selection"
-                           	domain="[('object_id.model', '=', 'crm.meeting')]" />
+                               string="Meeting Type" widget="selection"
+                               domain="[('object_id.model', '=', 'crm.meeting')]" />
                            <separator orientation="vertical"/>
                            <field name="partner_id" select="1" />
                            <field name="section_id" select="1" widget="selection">
diff --git a/addons/crm/crm_opportunity_data.xml b/addons/crm/crm_opportunity_data.xml
index 59e0828d0ee..3ab446440f2 100644
--- a/addons/crm/crm_opportunity_data.xml
+++ b/addons/crm/crm_opportunity_data.xml
@@ -44,14 +44,12 @@
 
 <!--        Case Resource(type_id)        -->
     <record model="crm.case.resource.type" id="type_oppor1">
-        <field name="name">Existing Business</field>
+        <field name="name">Campaign 2</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.resource.type" id="type_oppor2">
-        <field name="name">New Business</field>
+        <field name="name">Campaign 1</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
 
 </data>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 55f2f1651a6..aaf344043d7 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -29,7 +29,7 @@
 
                             <field name="planned_revenue"/>
                             <field name="probability"/>
-                            <field name="date_deadline" string="Expected Closing"/>
+                            <field name="date_deadline"/>
                             <button string="Schedule/Log Call"
                             name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action" groups="base.group_extended"/>
                             <newline/>
@@ -116,6 +116,11 @@
                                 <field name="fax"/>
                                 <field name="mobile"/>
                             </group>
+                            <group colspan="2" col="2">
+                                <separator string="Categorization" colspan="2"/>
+                                <field name="type_id" widget="selection"/>
+                                <field name="channel_id" widget="selection"/>
+                            </group>
                             <group colspan="2" col="2">
                                 <separator string="Mailings" colspan="2"/>
                                 <field name="optin"/>
@@ -216,6 +221,8 @@
                         <field name="title_action" />
                         <field name="stage_id"/>
                         <field name="partner_assigned_id" invisible="1"/>
+                        <field name="channel_id" invisible="1"/>
+                        <field name="type_id" invisible="1"/>
                         <button name="stage_previous" string="Previous Stage"
                             states="open,pending" type="object" icon="gtk-go-back" />
                         <button name="stage_next" string="Next Stage"
@@ -313,6 +320,10 @@
                                 context="{'group_by':'priority'}" />
                             <filter string="Category" icon="terp-stock_symbol-selection"
                                 domain="[]" context="{'group_by':'categ_id'}" />
+                            <filter string="Campaign" icon="terp-stock_symbol-selection"
+                                domain="[]" context="{'group_by':'type_id'}" />
+                            <filter string="Channel" icon="terp-stock_symbol-selection"
+                                domain="[]" context="{'group_by':'channel_id'}" />
                             <separator orientation="vertical" />
                             <filter string="Salesman" icon="terp-personal"
                                 domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 18a6daa0c3c..afa153fb662 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -36,7 +36,7 @@ class crm_phonecall(crm_case, osv.osv):
     _columns = {
         # From crm.case
         'id': fields.integer('ID'),
-        'name': fields.char('Name', size=64),
+        'name': fields.char('Call Summary', size=64),
         'active': fields.boolean('Active', required=False), 
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1), 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 652e17df061..4f60b91b3c2 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -19,16 +19,14 @@
 <!-- ResourceType Form View -->
 
     <record id="crm_phonecall_resource_act" model="ir.actions.act_window">
-            <field name="name">Phonecall Resource Type</field>
+            <field name="name">Phonecall Campaigns</field>
             <field name="res_model">crm.case.resource.type</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
-            <field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>
-            <field name="context">{'object_id':'crm.phonecall'}</field>
-        </record>
+    </record>
 
      <menuitem action="crm_phonecall_resource_act"
-        id="menu_crm_phonecall_resource_act" name="Resource Type"
+        id="menu_crm_phonecall_resource_act" name="Campaigns"
         parent="menu_crm_config_phonecall" />
 
 <!--  PhoneCalls Tree View -->
@@ -39,9 +37,9 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree colors="gray:state in ('cancel','done');blue:state in ('pending',)" string="Phone Calls">
-                <field name="date" string="Date"/>
-                <field name="name" string="Call Summary"/>
-                <field name="partner_id" string="Partner"/>
+                <field name="date"/>
+                <field name="name"/>
+                <field name="partner_id"/>
                 <field name="partner_contact"/>
                 <field name="partner_phone"/>
                 <field name="user_id"/>
@@ -71,12 +69,12 @@
         <field name="arch" type="xml">
             <form string="Phone Call">
                  <group colspan="6" col="7">
-                    <field name="name" string="Summary" required="1"/>
+                    <field name="name" required="1"/>
                     <field name="partner_phone" required="1"/>
                     <field name="duration" widget="float_time" required="1"/>
                     <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
 
-                    <field name="date" string="Date" required="1"/>
+                    <field name="date" required="1"/>
                     <field name="user_id"/>
                     <field name="section_id" colspan="1" widget="selection" />
                     <button string="Convert to Opportunity"
@@ -101,7 +99,7 @@
                         type="action"
                         attrs="{'invisible':[('partner_id','!=',False)]}" />
                     <newline/>
-                    <field name="partner_address_id" string="Contact"
+                    <field name="partner_address_id"
                         on_change="onchange_partner_address_id(partner_address_id, email_from)" />
                     <newline/>
                     <field name="partner_mobile" />
@@ -147,7 +145,7 @@
         <field name="arch" type="xml">
             <form string="Phone Call">
                 <group colspan="4" col="7">
-                    <field name="name" string="Summary" required="1"/>
+                    <field name="name" required="1"/>
                     <field name="partner_phone"/>
                     <field name="duration" widget="float_time"/>
                     <button string="Schedule a Meeting"
@@ -155,7 +153,7 @@
                         icon="gtk-redo"
                         type="object" />
 
-                    <field name="date" string="Date" required="1"/>
+                    <field name="date" required="1"/>
                     <field name="user_id"/>
                     <field name="section_id" colspan="1" widget="selection" />
                     <button string="Convert to Opportunity"
@@ -179,7 +177,7 @@
                         type="action"
                         attrs="{'invisible':[('partner_id','!=',False)]}" />
                     <newline/>
-                    <field name="partner_address_id" string="Contact"
+                    <field name="partner_address_id"
                         on_change="onchange_partner_address_id(partner_address_id, email_from)" />
                     <newline/>
                     <field name="partner_mobile" />
@@ -207,12 +205,12 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Phone Calls" colors="grey:state in ('cancel','done');blue:state in ('pending',)">
-                <field name="date" string="Date"/>
-                <field name="name" string="Call Summary"/>
+                <field name="date"/>
+                <field name="name"/>
                 <field name="partner_id"
                 	on_change="onchange_partner_id(partner_id, email_from)"
                 	string="Partner" />
-                <field name="partner_address_id" string="Contact"
+                <field name="partner_address_id"
                         on_change="onchange_partner_address_id(partner_address_id, email_from)" />
                 <field name="partner_phone"/>
                 <field name="user_id"/>
@@ -273,7 +271,7 @@
                />
 
                <separator orientation="vertical"/>
-               <field name="name" string="Call Summary"/>
+               <field name="name"/>
                <field name="partner_id"/>
                <field name="user_id">
                    <filter icon="terp-personal-"
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 1ea4960e787..db248be7492 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -169,9 +169,8 @@
             <field name="model">crm.case.resource.type</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Resource Type">
+                <tree string="Campaign">
                     <field name="name"/>
-                    <field name="object_id"/>
                     <field name="section_id"/>
                 </tree>
             </field>
@@ -184,10 +183,9 @@
             <field name="model">crm.case.resource.type</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Resource Type">
+                <form string="Campaign">
                     <field name="name" select="1"/>
                     <field name="section_id" select="1" widget="selection"/>
-                    <field name="object_id"  />
                 </form>
             </field>
         </record>
@@ -195,14 +193,14 @@
         <!-- Resource Type of case Action -->
 
         <record id="crm_case_resource_type_act" model="ir.actions.act_window">
-            <field name="name">Resource Type</field>
+            <field name="name">Campaigns</field>
             <field name="res_model">crm.case.resource.type</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_resource_type_tree"/>
         </record>
 
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
-            <field name="name">Cases by section</field>
+            <field name="name">Cases by Sales Team</field>
             <field name="res_model">crm.case.section</field>
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
@@ -436,7 +434,7 @@
             <field name="model">crm.case.section.custom</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Custom Case Section">
+                <tree string="Custom Case Teams">
                     <field name="name" select="1"/>
                     <field name="code" select="1"/>
                     <field name="user_id" select="1"/>
@@ -527,7 +525,7 @@
                         </page>
                         <page string="Emails" groups="base.group_extended">
                            <group colspan="4">
-                               <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
+                               <field colspan="4" name="email_cc" widget="char" size="512"/>
                            </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
 		                        <tree string="Communication history">
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 4f6f39e0690..413226f65cb 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -77,7 +77,9 @@ class crm_lead_report(osv.osv):
         'name': fields.char('Year', size=64, required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'country_id':fields.many2one('res.country', 'Country', readonly=True),
-        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
+        'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True),
+        'channel_id':fields.many2one('res.partner.canal', 'Channel', readonly=True),
+        'type_id':fields.many2one('crm.case.resource.type', 'Campaign', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
         'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
@@ -141,6 +143,8 @@ class crm_lead_report(osv.osv):
                     c.company_id,
                     c.priority,
                     c.section_id,
+                    c.channel_id,
+                    c.type_id,
                     c.categ_id,
                     c.partner_id,
                     c.country_id,
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index e6b2f6af4f1..42adda76dbe 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -14,6 +14,8 @@
                 <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
                 <field name="categ_id" invisible="1"/>
+                <field name="type_id" invisible="1"/>
+                <field name="channel_id" invisible="1"/>
                 <field name="type" invisible="1"/>
                 <field name="priority" invisible="1"/>
                 <field name="month" invisible="1"/>
@@ -69,9 +71,17 @@
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <group col="20" colspan="8">
-                        <filter string="Last 365 Days" icon="terp-go-year"
-                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter string="Last 30 Days" icon="terp-go-month" name="this_month"
+                        <filter string="Leads"
+                            icon="terp-check"
+                            name="filter_lead"
+                            groups="base.group_extended"
+                            domain="[('type','=','lead')]"/>
+                        <filter string="Opportunities"
+                            icon="terp-check"
+                            name="filter_opportunity"
+                            domain="[('type','=','opportunity')]"/>
+                        <separator orientation="vertical" />
+                        <filter string="30 Days" icon="terp-go-month" name="this_month"
                             domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
                         <filter icon="terp-go-week" string="7 Days" separator="1"
                             domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
@@ -111,6 +121,10 @@
                             context="{'group_by':'section_id'}" />
                         <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
+                        <filter string="Campaign" icon="terp-stock_symbol-selection"
+                            domain="[]" context="{'group_by':'type_id'}" />
+                        <filter string="Channel" icon="terp-stock_symbol-selection"
+                            domain="[]" context="{'group_by':'channel_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <separator orientation="vertical"/>
@@ -135,7 +149,9 @@
                       <field name="partner_id"/>
                       <separator orientation="vertical"/>
                       <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />
-                      <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                      <field name="categ_id" widget="selection"/>
+                      <field name="type_id" widget="selection"/>
+                      <field name="channel_id" widget="selection"/>
                       <separator orientation="vertical"/>
                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                       <newline/>
@@ -166,6 +182,8 @@
                 <field name="stage_id"  invisible="1"/>
                 <field name="priority"  invisible="1"/>
                 <field name="categ_id" invisible="1"/>
+                <field name="type_id" invisible="1"/>
+                <field name="channel_id" invisible="1"/>
                 <field name="type" invisible="1"/>
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="nbr" string="#Opportunities" sum="#Opportunities"/>
@@ -186,9 +204,9 @@
             <field name="name">Leads Analysis</field>
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
-            <field name="context">{'search_default_lead':1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_filter_lead': 1, 'search_default_lead':1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree,graph</field>
-            <field name="domain">[('type', '=', 'lead')]</field>
+            <field name="domain">[]</field>
             <field name="help">Leads Analysis allows you to consult different informations relative to CRM. Check for treatments delays, number of responses given and emails send. You can sort out your leads analysis on different groups to get fine grained analysis.</field>
         </record>
 
@@ -210,9 +228,9 @@
             <field name="name">Opportunities Analysis</field>
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_opportunity": 1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{"search_default_filter_opportunity":1, "search_default_opportunity": 1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree,graph</field>
-            <field name="domain">[('type', '=', 'opportunity')]</field>
+            <field name="domain">[]</field>
             <field name="help">Opportunities Analysis menu gives you an instant access to your opportunities like expected revenue, planned cost, overpassed deadline or the number of exchanges by opportunity.</field>
         </record>
 
diff --git a/addons/crm_partner_assign/report/crm_lead_report.py b/addons/crm_partner_assign/report/crm_lead_report.py
index 07da2d99411..83ac61ded5b 100644
--- a/addons/crm_partner_assign/report/crm_lead_report.py
+++ b/addons/crm_partner_assign/report/crm_lead_report.py
@@ -85,7 +85,7 @@ class crm_lead_report_assign(osv.osv):
             CRM Lead Report
             @param cr: the current row, from the database cursor
         """
-        tools.drop_view_if_exists(cr, 'crm_lead_report')
+        tools.drop_view_if_exists(cr, 'crm_lead_report_assign')
         cr.execute("""
             CREATE OR REPLACE VIEW crm_lead_report_assign AS (
                 SELECT