openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #03250
[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-715797-rme into lp:openobject-addons
Ravindra Mekhiya(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-715797-rme into lp:openobject-addons.
Requested reviews:
tfr (Openerp) (tfr)
Related bugs:
#715797 [6.0] crm stages menus
https://bugs.launchpad.net/bugs/715797
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-715797-rme/+merge/50574
Hello,
-crm : leads & opportunities stages combine; no need of domain; leads & opportunities - stage search view.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-715797-rme/+merge/50574
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-715797-rme.
=== modified file 'crm/crm.py'
--- crm/crm.py 2011-02-18 09:54:19 +0000
+++ crm/crm.py 2011-02-21 10:59:23 +0000
@@ -567,7 +567,7 @@
'on_change': fields.boolean('Change Probability Automatically', \
help="Change Probability on next and previous stages."),
'requirements': fields.text('Requirements'),
- 'type': fields.selection(_get_type_value, 'Type'),
+ 'type': fields.selection(_get_type_value, 'Type', required=True),
}
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml 2011-02-18 11:40:32 +0000
+++ crm/crm_lead_view.xml 2011-02-21 10:59:23 +0000
@@ -2,6 +2,23 @@
<openerp>
<data>
+ <!-- Stage Search view -->
+
+ <record id="crm_lead_stage_search" model="ir.ui.view">
+ <field name="name">Stage - Search</field>
+ <field name="model">crm.case.stage</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Stage Search">
+ <filter icon="terp-personal" name="lead"
+ string="Lead" domain="[('type', '=', 'lead')]" context="{'type' : 'lead'}"/>
+ <filter icon="terp-personal+" name="opportunity"
+ string="Opportunity" domain="[('type', '=', 'opportunity')]" context="{'type' : 'opportunity'}"/>
+ <field name="name"/>
+ </search>
+ </field>
+ </record>
+
<!--Lead Stage Form view -->
<record id="crm_lead_stage_act" model="ir.actions.act_window">
@@ -9,12 +26,10 @@
<field name="res_model">crm.case.stage</field>
<field name="view_type">form</field>
<field name="view_id" ref="crm.crm_case_stage_tree"/>
- <field name="domain">[('type', '=', 'lead')]</field>
- <field name="context">{'type':'lead'}</field>
+ <field name="context">{'search_default_opportunity':1}</field>
+ <field name="search_view_id" ref="crm_lead_stage_search"/>
<field name="help">Add specific stages to leads and opportunities allowing your sales to better organise their sales pipeline. Stages will allow them to easily track how a specific lead or opportunity is positioned in the sales cycle.</field>
</record>
-
-
<menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" name="Stages"
groups="base.group_extended" sequence="0"
=== modified file 'crm/crm_opportunity_view.xml'
--- crm/crm_opportunity_view.xml 2011-01-14 00:11:01 +0000
+++ crm/crm_opportunity_view.xml 2011-02-21 10:59:23 +0000
@@ -2,22 +2,6 @@
<openerp>
<data>
- <record id="crm_opportunity_stage_act" model="ir.actions.act_window">
- <field name="name">Stages</field>
- <field name="res_model">crm.case.stage</field>
- <field name="view_type">form</field>
- <field name="view_id" ref="crm.crm_case_stage_tree"/>
- <field name="domain">[('type', '=', 'opportunity')]</field>
- <field name="context">{'type':'opportunity'}</field>
- <field name="help">Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their sales opportunities. It will allow them to easily track how is positioned a specific opportunity in the sales cycle.</field>
- </record>
-
-
-
- <menuitem action="crm_opportunity_stage_act" id="menu_crm_opportunity_stage_act" name="Stages"
- groups="base.group_extended" sequence="0"
- parent="base.menu_crm_config_opportunity" />
-
<!-- Opportunities Form View -->
<record model="ir.ui.view" id="crm_case_form_view_oppor">
<field name="name">Opportunities</field>
=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml 2011-01-14 09:34:28 +0000
+++ crm_claim/crm_claim_view.xml 2011-02-21 10:59:23 +0000
@@ -21,6 +21,22 @@
<menuitem action="crm_claim_categ_action" name="Categories"
id="menu_crm_case_claim-act" parent="menu_config_claim" />
+ <!-- Claim Stage Search view -->
+
+ <record id="claim_stage_search" model="ir.ui.view">
+ <field name="name">Claim Stage - Search</field>
+ <field name="model">crm.case.stage</field>
+ <field name="type">search</field>
+ <field name="inherit_id" ref="crm.crm_lead_stage_search"/>
+ <field name="arch" type="xml">
+ <data>
+ <xpath expr="//field[@name='name']" position="before">
+ <filter icon="terp-personal-" name="claim"
+ string="Claim" domain="[('type', '=', 'claim')]"/>
+ </xpath>
+ </data>
+ </field>
+ </record>
<!-- Claim Stages -->
@@ -29,8 +45,8 @@
<field name="res_model">crm.case.stage</field>
<field name="view_type">form</field>
<field name="view_id" ref="crm.crm_case_stage_tree"/>
- <field name="domain">[('type', '=', 'claim')]</field>
- <field name="context">{'type':'claim'}</field>
+ <field name="search_view_id" ref="claim_stage_search"/>
+ <field name="context">{'search_default_claim':1}</field>
<field name="help">You can create claim stages to categorize the status of every claim entered in the system. The stages define all the steps required for the resolution of a claim.</field>
</record>
=== modified file 'crm_fundraising/crm_fundraising_view.xml'
--- crm_fundraising/crm_fundraising_view.xml 2011-01-14 00:11:01 +0000
+++ crm_fundraising/crm_fundraising_view.xml 2011-02-21 10:59:23 +0000
@@ -6,6 +6,24 @@
groups="base.group_extended"
parent="base.menu_base_config" sequence="8" />
+ <!-- Fund Stage Search view -->
+
+ <record id="fund_stage_search" model="ir.ui.view">
+ <field name="name">Fund Stage - Search</field>
+ <field name="model">crm.case.stage</field>
+ <field name="type">search</field>
+ <field name="inherit_id" ref="crm.crm_lead_stage_search"/>
+ <field name="arch" type="xml">
+ <data>
+ <xpath expr="//field[@name='name']" position="before">
+ <filter icon="terp-dolar" name="fundraising"
+ string="Fundraising" domain="[('type', '=', 'fundraising')]"/>
+ </xpath>
+ </data>
+ </field>
+ </record>
+
+
<!-- Fund Raising Categories Form View -->
<record id="crm_fund_categ_action" model="ir.actions.act_window">
@@ -15,6 +33,7 @@
<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
<field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
<field name="context">{'object_id':'crm.fundraising'}</field>
+ <field name="search_view_id" ref="fund_stage_search"/>
<field name="help">Manage and define the fund raising categories you want to be maintained in the system.</field>
</record>
@@ -29,8 +48,7 @@
<field name="res_model">crm.case.stage</field>
<field name="view_type">form</field>
<field name="view_id" ref="crm.crm_case_stage_tree"/>
- <field name="domain">[('type', '=', 'fundraising')]</field>
- <field name="context">{'type':'fundraising'}</field>
+ <field name="context">{'search_default_fundraising':1}</field>
<field name="help">Create and manage fund raising activity categories you want to be maintained in the system.</field>
</record>
Follow ups
