From 1171c358d85babe41842061eb5499b9b31f36653 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Tue, 7 Dec 2010 10:42:33 +0530
Subject: [PATCH 1/2] [FIX] fetchmail: Corrected typo error.

lp bug: https://launchpad.net/bugs/684527 fixed

bzr revid: uco@tinyerp.com-20101207051233-oboc6s0igti57se6
---
 addons/fetchmail/fetchmail_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 394761c09df..7d55f9f5a7a 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -7,7 +7,7 @@
             <field name="model">email.server</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('wating');gray:state in('done')" string="POP/IMAP Servers">
+                <tree colors="blue:state in ('draft');black:state in ('waiting');gray:state in('done')" string="POP/IMAP Servers">
                     <field name="name"/>
                     <field name="type"/>
                     <field name="user"/>

From 0a884868e6a02242d2cbcaac2122618be7019a79 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Tue, 7 Dec 2010 14:24:39 +0530
Subject: [PATCH 2/2] [FIX] crm: 'Company' field should be in multi company
 group.

lp bug: https://launchpad.net/bugs/683047 fixed

bzr revid: uco@tinyerp.com-20101207085439-gf95l6lozbxgg20a
---
 addons/crm/report/crm_lead_report_view.xml                   | 3 ++-
 addons/crm_claim/report/crm_claim_report_view.xml            | 2 +-
 .../crm_fundraising/report/crm_fundraising_report_view.xml   | 5 +++--
 addons/crm_helpdesk/report/crm_helpdesk_report_view.xml      | 5 +++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index fd27e55fc2e..ae3559900cb 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -134,7 +134,8 @@
                         <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
                         <filter string="Company" icon="terp-go-home"
                             domain="[]"
-                            context="{'group_by':'company_id'}" />
+                            context="{'group_by':'company_id'}" 
+                            groups="base.group_multi_company"/>
                         <separator orientation="vertical" />
                         <filter string="Stage" name="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 4128bd7b31f..8a3da032114 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -87,7 +87,7 @@
                                 help="My Sales Team(s)" />
 
                         </field>
-                        <field name="company_id">
+                        <field name="company_id" groups="base.group_multi_company">
                             <filter icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 25222a56b2d..e8893624ee0 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -106,7 +106,7 @@
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
                         </field>
-                        <field name="company_id">
+                        <field name="company_id" groups="base.group_multi_company">
                             <filter icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
@@ -147,8 +147,9 @@
                         <separator orientation="vertical" />
                         <filter string="Company" icon="terp-go-home"
                             domain="[]"
+                            groups="base.group_multi_company"
                             context="{'group_by':'company_id'}" />
-                        <separator orientation="vertical" />
+                        <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}"
                             help="Date of fundraising"/>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 1ae9224787b..8977f048faf 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -79,7 +79,7 @@
                             domain="[('section_id.user_id','=',uid)]"
                             help="My Sales Team(s)" />
                         </field>
-                        <field name="company_id">
+                        <field name="company_id" groups="base.group_multi_company">
                             <filter icon="terp-go-home"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id.company_id','=',uid)]"
@@ -117,8 +117,9 @@
                         <separator orientation="vertical" />
                         <filter string="Company" icon="terp-go-home" 
                             domain="[]"
+                            groups="base.group_multi_company"
                             context="{'group_by':'company_id'}" />
-                        <separator orientation="vertical" />
+                        <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}" help="Date of helpdesk requests"/>
                         <filter string="Month" icon="terp-go-month"