pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Merge] Merge bug fix lp:683047,lp:684527

Browse Source 
bzr revid: sbh@tinyerp.com-20101207103429-6eix18iy00kh4462
This commit is contained in:
Sbh (OpenERP)
2010-12-07 16:04:29 +05:30
parent fd7173ceb6 0a884868e6
commit 19eacd6e81
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/report/crm_lead_report_view.xml
+2 -1
View File
@@ -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'}" />
addons/crm_claim/report/crm_claim_report_view.xml
+1 -1
View File
@@ -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)]"
addons/crm_fundraising/report/crm_fundraising_report_view.xml
+3 -2
View File
@@ -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"/>
addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+3 -2
View File
@@ -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"
addons/fetchmail/fetchmail_view.xml
+1 -1
View File
@@ -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"/>