openerp-dev-web team mailing list archive

["uco \(OpenERP\)" <uco@xxxxxxxxxxx>]

uco (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/uco-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #644325 In Lead shows HTML from email rather than plain text
  https://bugs.launchpad.net/bugs/644325
  #655034 Project : Progressbar of project should be updated based on task changes.
  https://bugs.launchpad.net/bugs/655034
  #657688 [trunk] fetchmail services need help text
  https://bugs.launchpad.net/bugs/657688
  #670904 CRM : Create opportunity wizard crashes
  https://bugs.launchpad.net/bugs/670904
  #670914 [6.0] Error when a task is delegated if task's name have an accent
  https://bugs.launchpad.net/bugs/670914
  #676857 [6.0RC1] documents - separation per company 
  https://bugs.launchpad.net/bugs/676857
  #680884 [6.0] fetchmail module should use user_id defined in email.server to do process_email
  https://bugs.launchpad.net/bugs/680884
  #680957 bad tooltip on "Convert to opportunity" button in inbound phone call
  https://bugs.launchpad.net/bugs/680957
  #680961 state changes of all crm object shouldn't be in Email section of partner's history
  https://bugs.launchpad.net/bugs/680961
  #683047 keep "Company" field in multi company group
  https://bugs.launchpad.net/bugs/683047
  #684472 Converting an issue to a task  or create a ne task [V6.0 3977-GTK Client]
  https://bugs.launchpad.net/bugs/684472
  #684527 [trunk] Minor typo in fetchmail
  https://bugs.launchpad.net/bugs/684527


* [FIX] 
  lp:683047 : [crm] 'Company' field should be in multi company group.
  

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/uco-dev-addons1/+merge/42918
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/uco-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

=== modified file 'crm/report/crm_lead_report_view.xml'
--- crm/report/crm_lead_report_view.xml	2010-11-23 13:15:31 +0000
+++ crm/report/crm_lead_report_view.xml	2010-12-07 08:59:11 +0000
@@ -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'}" />

=== modified file 'crm_claim/report/crm_claim_report_view.xml'
--- crm_claim/report/crm_claim_report_view.xml	2010-10-18 19:40:54 +0000
+++ crm_claim/report/crm_claim_report_view.xml	2010-12-07 08:59:11 +0000
@@ -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)]"

=== modified file 'crm_fundraising/report/crm_fundraising_report_view.xml'
--- crm_fundraising/report/crm_fundraising_report_view.xml	2010-10-15 14:05:28 +0000
+++ crm_fundraising/report/crm_fundraising_report_view.xml	2010-12-07 08:59:11 +0000
@@ -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"/>

=== modified file 'crm_helpdesk/report/crm_helpdesk_report_view.xml'
--- crm_helpdesk/report/crm_helpdesk_report_view.xml	2010-10-18 19:40:54 +0000
+++ crm_helpdesk/report/crm_helpdesk_report_view.xml	2010-12-07 08:59:11 +0000
@@ -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"

=== modified file 'fetchmail/fetchmail_view.xml'
--- fetchmail/fetchmail_view.xml	2010-12-03 12:44:09 +0000
+++ fetchmail/fetchmail_view.xml	2010-12-07 08:59:11 +0000
@@ -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"/>