openerp-dev-web team mailing list archive

[nep-OpenERP <nep@xxxxxxxxxxx>]

nep-OpenERP has proposed merging lp:~openerp-dev/openobject-addons/6.0-crm-improvements-nep into lp:openobject-addons/6.0.

Requested reviews:
  Anup(OpenERP) (ach-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-crm-improvements-nep/+merge/62119

Hello,

   The stages Menu was displayed two times in the Sales Configuration. It's better to merge them under one menu "Leads & Opportunities"

  This fixes the issue.

Thanks.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-crm-improvements-nep/+merge/62119
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-crm-improvements-nep.

=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2011-01-14 00:11:01 +0000
+++ crm/crm_lead_view.xml	2011-05-24 12:42:09 +0000
@@ -27,9 +27,8 @@
             <field name="name">Categories</field>
             <field name="res_model">crm.case.categ</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="crm_case_categ_tree-view"/>
-            <field name="context">{'object_id': 'crm.lead'}</field>
-            <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
+            <field name="mainview" ref="crm.crm_case_stage_tree"/>  
+            <field name="search_view_id" ref="crm_case_stage_search_view"/>   
             <field name="help">Create specific categories that fit your company's activities to better classify and analyse your leads and opportunities. Such categories could for instance reflect your product structure or the different types of sales you do.</field>
         </record>
 

=== 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-05-24 12:42:09 +0000
@@ -2,21 +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">

=== modified file 'crm/crm_view.xml'
--- crm/crm_view.xml	2011-01-25 10:15:05 +0000
+++ crm/crm_view.xml	2011-05-24 12:42:09 +0000
@@ -137,6 +137,23 @@
                 </form>
             </field>
         </record>
+        
+        <!--  CRM Stage Search View -->
+        
+		<record model="ir.ui.view" id="crm_case_stage_search_view">
+		    <field name="name">crm.case.stage.search.view</field>
+		    <field name="model">crm.case.stage</field>
+		    <field name="type">search</field>
+		    <field name="arch" type="xml">
+		        <search string="Stages">
+		            <group col="4" >
+		                <filter string="Lead" domain="[('type','=', 'lead')]" icon="terp-stage" help="Lead Stage"/>
+		                <filter string="Opportunity" domain="[('type','=', 'opportunity')]" icon="terp-stage" help="Opportunity Stage"/>
+		                <field name="name" select="1"/>
+		            </group>
+		        </search>
+        	</field>
+		</record>
 
         <!-- CRM Stage Action -->