odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] crm : added missing filter string and improve indentation in search view. 

bzr revid: mdi@tinyerp.com-20120521095847-y7hcgl7v2byi7vpi
This commit is contained in:
Divyesh Makwana (Open ERP) 2012-05-21 15:28:47 +05:30
parent c933291f70
commit cd5c913576
6 changed files with 53 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/crm/crm_lead_view.xml
View File

@ -349,25 +349,28 @@
<field name="name" string="Lead / Customer" <field name="name" string="Lead / Customer"
filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/> filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
<field name="user_id"> <field name="user_id">
<filter icon="terp-personal-" <filter string="Unassigned Leads"
icon="terp-personal-"
domain="[('user_id','=', False)]" domain="[('user_id','=', False)]"
help="Unassigned Leads" /> help="Unassigned Leads" />
</field> </field>
<field name="subjects"/> <field name="subjects"/>
<field name="section_id" widget="selection" <field name="section_id" widget="selection"
context="{'invisible_section': False}"> context="{'invisible_section': False}">
<filter icon="terp-personal+" <filter string="My Sales Team(s)"
icon="terp-personal+"
context="{'invisible_section': False}" context="{'invisible_section': False}"
domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
help="My Sales Team(s)"/> help="My Sales Team(s)"/>
<filter icon="terp-personal+" <filter string="Show Sales Team"
icon="terp-personal+"
context="{'invisible_section': False}" context="{'invisible_section': False}"
domain="[]" domain="[]"
help="Show Sales Team"/> help="Show Sales Team"/>
</field> </field>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="country_id" context="{'invisible_country': False}"> <field name="country_id" context="{'invisible_country': False}">
<filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/> <filter string="Show countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
</field> </field>
<newline/> <newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
@ -597,18 +600,21 @@
<field name="name" string="Opportunity / Customer" <field name="name" string="Opportunity / Customer"
filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/> filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
<field name="user_id"> <field name="user_id">
<filter icon="terp-personal-" <filter string="Unassigned Opportunities"
icon="terp-personal-"
domain="[('user_id','=', False)]" domain="[('user_id','=', False)]"
help="Unassigned Opportunities" /> help="Unassigned Opportunities" />
</field> </field>
<field name="section_id" <field name="section_id"
context="{'invisible_section': False}" context="{'invisible_section': False}"
widget="selection"> widget="selection">
<filter icon="terp-personal+" <filter string="My Sales Team(s)"
icon="terp-personal+"
domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
context="{'invisible_section': False}" context="{'invisible_section': False}"
help="My Sales Team(s)" /> help="My Sales Team(s)" />
<filter icon="terp-personal+" <filter string="Show Sales Team"
icon="terp-personal+"
context="{'invisible_section': False}" context="{'invisible_section': False}"
domain="[]" domain="[]"
help="Show Sales Team"/> help="Show Sales Team"/>

6
addons/crm/crm_meeting_view.xml
View File

@ -278,12 +278,14 @@
<field name="name" string="Meeting / Partner" <field name="name" string="Meeting / Partner"
filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/> filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
<field name="user_id"> <field name="user_id">
<filter icon="terp-personal" <filter string="My Meetings"
icon="terp-personal"
domain="[('user_id','=',uid)]" domain="[('user_id','=',uid)]"
help="My Meetings" /> help="My Meetings" />
</field> </field>
<field name="section_id" widget="selection"> <field name="section_id" widget="selection">
<filter icon="terp-personal+" <filter string="My Sales Team(s)"
icon="terp-personal+"
domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
help="My Sales Team(s)" /> help="My Sales Team(s)" />
</field> </field>

12
addons/crm/crm_phonecall_view.xml
View File

@ -204,13 +204,15 @@
<field name="name"/> <field name="name"/>
<field name="partner_id"/> <field name="partner_id"/>
<field name="user_id"> <field name="user_id">
<filter icon="terp-personal-" <filter string="Unassigned Phonecalls"
icon="terp-personal-"
domain="[('user_id','=',False)]" domain="[('user_id','=',False)]"
help="Unassigned Phonecalls" /> help="Unassigned Phonecalls" />
</field> </field>
<field name="section_id" <field name="section_id"
widget="selection" string="Sales Team"> widget="selection" string="Sales Team">
<filter icon="terp-personal+" <filter string="My Sales Team(s)"
icon="terp-personal+"
domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
help="My Sales Team(s)" /> help="My Sales Team(s)" />
</field> </field>
@ -254,13 +256,15 @@
<field name="name"/> <field name="name"/>
<field name="partner_id"/> <field name="partner_id"/>
<field name="user_id"> <field name="user_id">
<filter icon="terp-personal-" <filter string="Unassigned Phonecalls"
icon="terp-personal-"
domain="[('user_id','=',False)]" domain="[('user_id','=',False)]"
help="Unassigned Phonecalls" /> help="Unassigned Phonecalls" />
</field> </field>
<field name="section_id" <field name="section_id"
widget="selection" string="Sales Team"> widget="selection" string="Sales Team">
<filter icon="terp-personal+" <filter string="My Sales Team(s)"
icon="terp-personal+"
domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
help="My Sales Team(s)" /> help="My Sales Team(s)" />
</field> </field>

51
addons/crm/crm_report_view.xml
View File

@ -163,13 +163,13 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Cases by Team and Stage"> <search string="Cases by Team and Stage">
<group> <group>
<filter string="This Year" icon="terp-go-year" <filter string="This Year" icon="terp-go-year"
domain="[('name','=',time.localtime()[0])]" domain="[('name','=',time.localtime()[0])]"
help="Cases by Team and Stage for this year" /> help="Cases by Team and Stage for this year" />
<filter string="This Month" icon="terp-go-month" <filter string="This Month" icon="terp-go-month"
domain="[('month','=',time.localtime()[1])]" domain="[('month','=',time.localtime()[1])]"
help="Cases by Team and Stage for this month" /> help="Cases by Team and Stage for this month" />
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="section_id" widget="selection"/> <field name="section_id" widget="selection"/>
<field name="nbr"/> <field name="nbr"/>
<field name="state"/> <field name="state"/>
@ -238,19 +238,18 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Cases by Section, Category and Stage"> <search string="Cases by Section, Category and Stage">
<group> <group>
<filter string="This Year" icon="terp-go-year" <filter string="This Year" icon="terp-go-year"
domain="[('name','=',time.localtime()[0])]" domain="[('name','=',time.localtime()[0])]"
help="Cases by Section, Category and Stage for this year" /> help="Cases by Section, Category and Stage for this year" />
<filter string="This Month" icon="terp-go-month" <filter string="This Month" icon="terp-go-month"
domain="[('month','=',time.localtime()[1])]" domain="[('month','=',time.localtime()[1])]"
help="Cases by Section, Category and Stage for this month" /> help="Cases by Section, Category and Stage for this month" />
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="section_id" widget="selection"/> <field name="section_id" widget="selection"/>
<field name="nbr"/> <field name="nbr"/>
<field name="state"/> <field name="state"/>
</group>
</group>
</search> </search>
</field> </field>
</record> </record>
@ -332,18 +331,18 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Cases by User"> <search string="Search Cases by User">
<group> <group>
<filter string="This Year" icon="terp-go-year" <filter string="This Year" icon="terp-go-year"
domain="[('name','=',time.localtime()[0])]" domain="[('name','=',time.localtime()[0])]"
help="Cases by User for this year" /> help="Cases by User for this year" />
<filter string="This Month" icon="terp-go-month" <filter string="This Month" icon="terp-go-month"
domain="[('month','=',time.localtime()[1])]" domain="[('month','=',time.localtime()[1])]"
help="Cases by User for this month" /> help="Cases by User for this month" />
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="section_id" widget="selection"/> <field name="section_id" widget="selection"/>
<field name="nbr"/> <field name="nbr"/>
<field name="state"/> <field name="state"/>
</group> </group>
</search> </search>
</field> </field>
</record> </record>

2
addons/crm/report/crm_lead_report_view.xml
View File

@ -114,7 +114,7 @@
<separator orientation="vertical" /> <separator orientation="vertical" />
<field name="section_id" <field name="section_id"
context="{'invisible_section': False}"> context="{'invisible_section': False}">
<filter icon="terp-personal+" <filter string="My Sales Team(s)" icon="terp-personal+"
context="{'invisible_section': False}" context="{'invisible_section': False}"
domain="[('section_id.user_id','=',uid)]" domain="[('section_id.user_id','=',uid)]"
help="My Sales Team(s)" /> help="My Sales Team(s)" />

3
addons/crm/report/crm_phonecall_report_view.xml
View File

@ -78,7 +78,8 @@
<separator orientation="vertical" /> <separator orientation="vertical" />
<field name="section_id" string="Sales Team" <field name="section_id" string="Sales Team"
context="{'invisible_section': False}"> context="{'invisible_section': False}">
<filter icon="terp-personal+" <filter string="My Sales Team(s)"
icon="terp-personal+"
context="{'invisible_section': False}" context="{'invisible_section': False}"
domain="[('section_id.user_id','=',uid)]" domain="[('section_id.user_id','=',uid)]"
help="My Sales Team(s)" /> help="My Sales Team(s)" />