Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-clean-search-crm_partner_assign-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_partner_assign-tpa/+merge/115918
[IMP] Improved search views of the crm_partner_assign module.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-crm_partner_assign-tpa/+merge/115918
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-clean-search.
=== modified file 'crm_partner_assign/crm_lead_view.xml'
--- crm_partner_assign/crm_lead_view.xml 2012-06-28 12:18:20 +0000
+++ crm_partner_assign/crm_lead_view.xml 2012-07-20 09:26:20 +0000
@@ -62,7 +62,6 @@
</filter>
<field name="user_id" position="after">
- <separator orientation="vertical"/>
<field name="partner_assigned_id"/>
</field>
</field>
=== modified file 'crm_partner_assign/report/crm_lead_report_view.xml'
--- crm_partner_assign/report/crm_lead_report_view.xml 2012-06-20 08:38:19 +0000
+++ crm_partner_assign/report/crm_lead_report_view.xml 2012-07-20 09:26:20 +0000
@@ -9,75 +9,38 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Leads Analysis">
- <group>
- <filter icon="terp-check"
- string="Current"
- domain="[('state','in',('draft','open'))]"/>
- <filter icon="terp-dialog-close"
- string="Closed"
- domain="[('state','=','done')]"/>
- <separator orientation="vertical" />
- <field name="section_id"
- widget="selection"
- context="{'invisible_section': False}"/>
- <field name="grade_id"/>
- <field name="user_id"/>
- <field name="partner_assigned_id"/>
- </group>
- <newline/>
- <group expand="0" string="Extended Filters...">
- <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.lead')]"/>
- <separator orientation="vertical"/>
- <field name="company_id" widget="selection" groups="base.group_multi_company"/>
- <newline/>
- <field name="creation_date"/>
- <field name="opening_date"/>
- <field name="date_closed"/>
- </group>
- <newline/>
- <group expand="1" string="Group By...">
- <filter string="Salesperson" name="user" icon="terp-personal"
- domain="[]" context="{'group_by':'user_id'}" />
- <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_assigned_id'}" />
- <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
- <separator orientation="vertical" />
- <filter string="Section" icon="terp-personal+"
- domain="[]"
- context="{'group_by':'section_id'}" />
- <filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection"
- domain="[]" context="{'group_by':'grade_id'}" />
- <filter string="Category" icon="terp-stock_symbol-selection"
- domain="[]" context="{'group_by':'categ_id'}" />
-
- <separator orientation="vertical" />
+ <field name="section_id" context="{'invisible_section': False}"/>
+ <field name="grade_id"/>
+ <field name="user_id"/>
+ <field name="partner_assigned_id"/>
+ <filter icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]"/>
+ <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]"/>
+ <group expand="0" string="Extended Filters...">
+ <field name="partner_id"/>
+ <field name="stage_id" domain="[('section_ids', '=', 'section_id')]"/>
+ <field name="categ_id" domain="[('object_id.model', '=', 'crm.lead')]"/>
+ <field name="company_id" groups="base.group_multi_company"/>
+ <field name="creation_date"/>
+ <field name="opening_date"/>
+ <field name="date_closed"/>
+ </group>
+ <group expand="1" string="Group By...">
+ <filter string="Salesperson" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+ <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_assigned_id'}" />
+ <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
+ <filter string="Section" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
+ <filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'grade_id'}" />
+ <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
- <separator orientation="vertical"/>
<filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
- <separator orientation="vertical" />
- <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'}" />
- <separator orientation="vertical" />
- <filter string="Assign Date" icon="terp-go-today"
- domain="[]"
- name="group_partner_date"
- context="{'group_by':'date_assign'}"/>
- <separator orientation="vertical"/>
- <filter string="Day" icon="terp-go-today"
- domain="[]" context="{'group_by':'day'}"/>
- <filter string="Month" icon="terp-go-month"
- domain="[]" context="{'group_by':'month'}" />
- <filter string="Year" icon="terp-go-year"
- domain="[]" context="{'group_by':'year'}" />
- </group>
-
- </search>
+ <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'}" />
+ <filter string="Assign Date" icon="terp-go-today" domain="[]" name="group_partner_date" ontext="{'group_by':'date_assign'}"/>
+ <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
+ <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" />
+ <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" />
+ </group>
+ </search>
</field>
</record>
=== modified file 'crm_partner_assign/report/crm_partner_report_view.xml'
--- crm_partner_assign/report/crm_partner_report_view.xml 2012-06-19 09:16:20 +0000
+++ crm_partner_assign/report/crm_partner_report_view.xml 2012-07-20 09:26:20 +0000
@@ -9,36 +9,30 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Partner assigned Analysis">
- <group col="20" colspan="8">
- <field name="section_id"/>
- <field name="user_id"/>
- <field name="grade_id"/>
- <field name="activation"/>
- </group>
- <newline/>
- <group expand="1" string="Group By...">
- <filter string="Salesperson" name="user" icon="terp-personal"
+ <field name="section_id"/>
+ <field name="user_id"/>
+ <field name="grade_id"/>
+ <field name="activation"/>
+ <group expand="1" string="Group By...">
+ <filter string="Salesperson" name="user" icon="terp-personal"
domain="[]" context="{'group_by':'user_id'}" />
- <filter string="Country" icon="terp-go-home" name="group_country" context="{'group_by':'country_id'}" />
- <separator orientation="vertical" />
+ <filter string="Country" icon="terp-go-home" name="group_country" context="{'group_by':'country_id'}" />
<filter string="Section" icon="terp-personal+"
- domain="[]"
- context="{'group_by':'section_id'}" />
+ domain="[]" context="{'group_by':'section_id'}" />
<filter string="Activation" name="group_activation" icon="terp-stock_symbol-selection"
domain="[]" context="{'group_by':'activation'}" />
<filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection"
domain="[]" context="{'group_by':'grade_id'}" />
<filter string="Partner" name="" icon="terp-stock_symbol-selection"
domain="[]" context="{'group_by':'partner_id'}" />
- <separator orientation="vertical" />
<filter string="Date Invoice" name="group_period_id" icon="terp-stock_symbol-selection"
domain="[]" context="{'group_by':'period_id'}" />
<filter string="Date Partnership" name="group_date_partnership" icon="terp-stock_symbol-selection"
domain="[]" context="{'group_by':'date_partnership'}" />
<filter string="Date Review" name="group_date_review" icon="terp-stock_symbol-selection"
domain="[]" context="{'group_by':'date_review'}" />
- </group>
- </search>
+ </group>
+ </search>
</field>
</record>
_______________________________________________
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
