Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-clean-search-crm_claim-tpa into
lp:~openerp-dev/openobject-addons/trunk-clean-search.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-crm_claim-tpa/+merge/115907
[IMP] Improved search view of crm_claim module.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-crm_claim-tpa/+merge/115907
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-clean-search.
=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml 2012-07-19 09:02:43 +0000
+++ crm_claim/crm_claim_view.xml 2012-07-20 08:40:25 +0000
@@ -199,50 +199,22 @@
<field name="arch" type="xml">
<search string="Search Claims">
<field name="name" string="Claims"/>
- <separator orientation="vertical"/>
- <filter icon="terp-check" string="New" name="current"
- domain="[('state','=','draft')]"
- help="New Claims"/>
- <filter icon="terp-camera_test"
- string="In Progress"
- domain="[('state','=','open')]"
- help="In Progress Claims"/>
- <filter icon="terp-gtk-media-pause"
- string="Pending"
- domain="[('state','=','pending')]"/>
- <filter string="Unassigned Claims"
- icon="terp-personal-"
- domain="[('user_id','=', False)]"
- help="Unassigned Claims" />
- <separator orientation="vertical"/>
<field name="partner_id"/>
- <field name="user_id" widget="selection"/>
- <newline/>
+ <field name="user_id"/>
+ <filter icon="terp-check" string="New" name="current" domain="[('state','=','draft')]" help="New Claims"/>
+ <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="In Progress Claims"/>
+ <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
+ <separator/>
+ <filter string="Unassigned Claims" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Claims" />
<group expand="0" string="Group By...">
- <filter string="Partner" icon="terp-partner"
- domain="[]" help="Partner"
- context="{'group_by':'partner_id'}"/>
- <filter string="Responsible" icon="terp-personal"
- domain="[]" help="Responsible User"
- context="{'group_by':'user_id'}"/>
- <separator orientation="vertical"/>
- <filter string="Stage" icon="terp-stage"
- domain="[]" context="{'group_by':'stage_id'}"/>
- <filter string="Type" icon="terp-stock_symbol-selection"
- domain="[]" context="{'group_by':'categ_id'}"/>
- <filter string="Status"
- icon="terp-stock_effects-object-colorize"
- domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
- <separator orientation="vertical"/>
- <filter string="Claim Date" icon="terp-go-month"
- domain="[]" help="Claim Date"
- context="{'group_by':'date'}"/>
- <filter string="Deadline" icon="terp-go-month"
- domain="[]"
- context="{'group_by':'date_deadline'}"/>
- <filter string="Closure" icon="terp-go-month"
- domain="[]" help="Date Closed"
- context="{'group_by':'date_closed'}" groups="base.group_no_one"/>
+ <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}"/>
+ <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}"/>
+ <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+ <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
+ <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
+ <filter string="Claim Date" icon="terp-go-month" domain="[]" help="Claim Date" context="{'group_by':'date'}"/>
+ <filter string="Deadline" icon="terp-go-month" domain="[]" context="{'group_by':'date_deadline'}"/>
+ <filter string="Closure" icon="terp-go-month" domain="[]" help="Date Closed" context="{'group_by':'date_closed'}" groups="base.group_no_one"/>
</group>
</search>
</field>
=== modified file 'crm_claim/report/crm_claim_report_view.xml'
--- crm_claim/report/crm_claim_report_view.xml 2012-06-22 10:29:59 +0000
+++ crm_claim/report/crm_claim_report_view.xml 2012-07-20 08:40:25 +0000
@@ -53,93 +53,43 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search">
- <group>
- <filter icon="terp-document-new"
- string="New"
- domain="[('state','=','draft')]"/>
- <filter icon="terp-camera_test"
- string="Open"
- domain="[('state','=','open')]"/>
- <filter icon="terp-gtk-media-pause"
- string="Pending"
- domain="[('state','=','pending')]"/>
- <filter string="My Sales Team(s)"
- icon="terp-personal+"
- context="{'invisible_section': False}"
- domain="[('section_id.user_id','=',uid)]"
- help="My Sales Team(s)" />
- <filter string="My Company"
- icon="terp-go-home"
- context="{'invisible_section': False}"
- domain="[('section_id.user_id.company_id','=',uid)]"
- help="My company"/>
- <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
- <separator orientation="vertical"/>
- <field name="company_id" groups="base.group_multi_company"/>
- <field name="user_id" string="Salesperson"/>
- <field name="section_id" string="Sales Team"
- context="{'invisible_section': False}"/>
- </group>
- <newline/>
+ <field name="company_id" groups="base.group_multi_company"/>
+ <field name="user_id" string="Salesperson"/>
+ <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
+ <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
+ <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/>
+ <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
+ <separator/>
+ <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" />
+ <separator/>
+ <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
+ <separator/>
+ <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
<group expand="0" string="Extended Filters...">
- <filter icon="terp-dialog-close"
- string="Done"
- domain="[('state','=','done')]"/>
- <filter icon="gtk-cancel"
- string="Cancel"
- domain="[('state','=','cancel')]"/>
- <separator orientation="vertical"/>
<field name="partner_id"/>
- <separator orientation="vertical"/>
- <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/>
- <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
- <separator orientation="vertical"/>
- <field name="priority" />
- <field name="type_action" />
- <newline/>
+ <field name="stage_id" domain="[('section_ids', '=', 'section_id')]"/>
+ <field name="categ_id" domain="[('object_id.model', '=', 'crm.claim')]"/>
+ <field name="priority"/>
+ <field name="type_action"/>
<field name="create_date" />
<field name="date_closed" />
<field name="date_deadline" />
+ <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+ <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]"/>
</group>
- <newline/>
<group expand="1" string="Group By...">
- <filter string="Salesperson" name="Salesperson" icon="terp-personal"
- domain="[]" context="{'group_by':'user_id'}" />
- <filter string="Sales Team" icon="terp-personal+"
- domain="[]"
- context="{'group_by':'section_id'}" />
- <filter string="Partner" name="partner" icon="terp-partner"
- domain="[]" context="{'group_by':'partner_id'}" />
- <separator orientation="vertical" />
- <filter string="Stage" icon="terp-stage" domain="[]"
- context="{'group_by':'stage_id'}" />
- <filter string="Priority" icon="terp-rating-rated" domain="[]"
- context="{'group_by':'priority'}" />
- <filter string="Category" icon="terp-stock_symbol-selection"
- domain="[]" context="{'group_by':'categ_id'}" />
-
- <separator orientation="vertical"/>
- <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"
- context="{'group_by':'type_action'}" help="Action Type"/>
- <filter string="Status" icon="terp-stock_effects-object-colorize"
- domain="[]" context="{'group_by':'state'}" />
- <separator orientation="vertical" />
- <filter string="Company" icon="terp-go-home"
- domain="[]"
- context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-
- <separator orientation="vertical" />
- <filter string="Day" icon="terp-go-today"
- domain="[]" context="{'group_by':'day'}"
- help="Date of claim"/>
-
- <filter string="Month" icon="terp-go-month"
- domain="[]" context="{'group_by':'month'}"
- help="Month of claim"/>
-
- <filter string="Year" icon="terp-go-year"
- domain="[]" context="{'group_by':'name'}"
- help="Year of claim"/>
+ <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+ <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
+ <filter string="Partner" name="partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
+ <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
+ <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+ <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
+ <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_action'}" help="Action Type"/>
+ <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+ <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+ <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of claim"/>
+ <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of claim"/>
+ <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Year of claim"/>
</group>
</search>
</field>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
