← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~tfr/openobject-addons/tfr-dev-crm into lp:~openerp-dev/openobject-addons/trunk-dev-addons1

 

tfr (Openerp) has proposed merging lp:~tfr/openobject-addons/tfr-dev-crm into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP R&D Team (openerp-dev)


Change the form in CRM stage, to allow the configure sales team
+ type of stage load when the regarding module is install
-- 
https://code.launchpad.net/~tfr/openobject-addons/tfr-dev-crm/+merge/43659
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~tfr/openobject-addons/tfr-dev-crm into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.
=== modified file 'crm/crm.py'
--- crm/crm.py	2010-12-13 09:39:59 +0000
+++ crm/crm.py	2010-12-14 15:29:57 +0000
@@ -479,6 +479,12 @@
     _description = "Stage of case"
     _rec_name = 'name'
     _order = "sequence"
+    
+    
+    
+    def _get_type_value(self, cr, user, context):
+        return [('lead','Lead'),('opportunity','Opportunity')]
+
 
     _columns = {
         'name': fields.char('Stage Name', size=64, required=True, translate=True),
@@ -487,9 +493,10 @@
         'on_change': fields.boolean('Change Probability Automatically', \
                          help="Change Probability on next and previous stages."),
         'requirements': fields.text('Requirements'),
-        'type': fields.selection([('lead','Lead'),('opportunity','Opportunity'),('claim','Claim'), ('fundraising','Fundraising')], 'Type'),
+        'type': fields.selection(_get_type_value, 'Type'),
     }
-
+    
+    
     def _find_stage_type(self, cr, uid, context=None):
         """Finds type of stage according to object.
         @param self: The object pointer

=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2010-12-13 09:39:59 +0000
+++ crm/crm_lead_view.xml	2010-12-14 15:29:57 +0000
@@ -13,6 +13,20 @@
         <field name="context">{'type':'lead'}</field>
         <field name="help">Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their leads and sales opportunities. It will allow them to easily track how is positioned a specific lead or opportunity in the sales cycle.</field>
     </record>
+    
+    <record id="action_stage_tree_view1" model="ir.actions.act_window.view">
+        <field eval="1" name="sequence"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_stage_tree"/>
+        <field name="act_window_id" ref="crm_lead_stage_act"/>
+    </record>
+        
+    <record id="action_stage_form_view1" model="ir.actions.act_window.view">
+    	<field eval="2" name="sequence"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_stage_form_full"/>
+        <field name="act_window_id" ref="crm_lead_stage_act"/>
+    </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	2010-12-13 10:07:18 +0000
+++ crm/crm_opportunity_view.xml	2010-12-14 15:29:57 +0000
@@ -11,6 +11,20 @@
         <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>
+    
+     <record id="action_stage_tree_view2" model="ir.actions.act_window.view">
+        <field eval="1" name="sequence"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_stage_tree"/>
+        <field name="act_window_id" ref="crm_opportunity_stage_act"/>
+    </record>
+        
+    <record id="action_stage_form_view2" model="ir.actions.act_window.view">
+    	<field eval="2" name="sequence"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_stage_form_full"/>
+        <field name="act_window_id" ref="crm_opportunity_stage_act"/>
+    </record>
 
      <menuitem action="crm_opportunity_stage_act" id="menu_crm_opportunity_stage_act" name="Stages"
         groups="base.group_extended" sequence="0"

=== modified file 'crm/crm_view.xml'
--- crm/crm_view.xml	2010-12-14 11:12:30 +0000
+++ crm/crm_view.xml	2010-12-14 15:29:57 +0000
@@ -118,6 +118,7 @@
             <field name="name">crm.case.stage.form</field>
             <field name="model">crm.case.stage</field>
             <field name="type">form</field>
+            <field name="priority" eval="1"/>
             <field name="arch" type="xml">
                 <form string="Stage">
                     <separator string="Stage Definition" colspan="4"/>
@@ -132,6 +133,36 @@
                 </form>
             </field>
         </record>
+        
+         <record model="ir.ui.view" id="crm_case_stage_form_full">
+            <field name="name">crm.case.stage.form</field>
+            <field name="model">crm.case.stage</field>
+            <field name="type">form</field>
+            <field name="priority" eval="10"/>
+            <field name="arch" type="xml">
+                <form string="Stage">
+                	<group>
+                    	<separator string="Stage Definition" colspan="4" />
+	                    <field name="name" select="1"/>
+	                    <field name="sequence"/>
+                   	 	<field name="type" invisible="1" />
+                   	 	 <field name="probability"/>
+                   		<field name="on_change"/>
+                   	 </group>
+                     
+                    
+                   
+                    
+                    <separator string="Requirements" colspan="4"/>
+                    <field name="requirements" nolabel="1" colspan="4"/>
+                    
+                    <group attrs="{'invisible':[('type','in',['claim', 'fundraising', False])]}">
+	                    <separator string="Sales Team" colspan="4"/>
+	                    <field name="section_ids" nolabel="1"  />
+                	</group>
+                </form>
+            </field>
+        </record>
 
         <!-- CRM Stage Action -->
 
@@ -141,6 +172,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_stage_tree"/>
         </record>
+       
 
  <!-- Case Categories Form View -->
 

=== modified file 'crm_claim/crm_claim.py'
--- crm_claim/crm_claim.py	2010-12-10 06:24:35 +0000
+++ crm_claim/crm_claim.py	2010-12-14 15:29:57 +0000
@@ -135,4 +135,21 @@
 
 crm_claim()
 
+
+class crm_stage_claim(osv.osv):
+    
+    def _get_type_value(self, cr, user, context):
+        list = super(crm_stage_claim, self)._get_type_value(cr, user, context)
+        list.append(('claim','Claim'))
+        return list
+    
+    _inherit = "crm.case.stage"
+    _columns = {
+            'type': fields.selection(_get_type_value, 'Type'),
+    }
+   
+    
+crm_stage_claim()
+
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml	2010-12-09 12:56:35 +0000
+++ crm_claim/crm_claim_view.xml	2010-12-14 15:29:57 +0000
@@ -33,7 +33,20 @@
             <field name="context">{'type':'claim'}</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>
-
+        
+        <record id="action_stage_tree_view3" model="ir.actions.act_window.view">
+	        <field eval="1" name="sequence"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="crm.crm_case_stage_tree"/>
+	        <field name="act_window_id" ref="crm_claim_stage_act"/>
+	    </record>
+	        
+	    <record id="action_stage_form_view3" model="ir.actions.act_window.view">
+	    	<field eval="2" name="sequence"/>
+	        <field name="view_mode">form</field>
+	        <field name="view_id" ref="crm.crm_case_stage_form_full"/>
+	        <field name="act_window_id" ref="crm_claim_stage_act"/>
+		</record>
          <menuitem action="crm_claim_stage_act" name="Stages"
                 id="menu_crm_claim_stage_act" parent="menu_config_claim" />
 

=== modified file 'crm_fundraising/crm_fundraising.py'
--- crm_fundraising/crm_fundraising.py	2010-12-09 12:56:35 +0000
+++ crm_fundraising/crm_fundraising.py	2010-12-14 15:29:57 +0000
@@ -94,3 +94,19 @@
             }
 
 crm_fundraising()
+
+
+class crm_stage_fundraising(osv.osv):
+    
+    def _get_type_value(self, cr, user, context):
+        list = super(crm_stage_fundraising, self)._get_type_value(cr, user, context)
+        list.append(('fundraising','Fundraising'))
+        return list
+    
+    _inherit = "crm.case.stage"
+    _columns = {
+            'type': fields.selection(_get_type_value, 'Type'),
+    }
+   
+    
+crm_stage_fundraising()

=== modified file 'crm_fundraising/crm_fundraising_view.xml'
--- crm_fundraising/crm_fundraising_view.xml	2010-12-09 12:56:35 +0000
+++ crm_fundraising/crm_fundraising_view.xml	2010-12-14 15:29:57 +0000
@@ -33,6 +33,20 @@
             <field name="context">{'type':'fundraising'}</field>
             <field name="help">Create and manage fund raising activity categories you want to be maintained in the system.</field>
         </record>
+        
+        <record id="action_stage_tree_view4" model="ir.actions.act_window.view">
+	        <field eval="1" name="sequence"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="crm.crm_case_stage_tree"/>
+	        <field name="act_window_id" ref="crm_fundraising_stage_act"/>
+	    </record>
+	        
+	    <record id="action_stage_form_view4" model="ir.actions.act_window.view">
+	    	<field eval="2" name="sequence"/>
+	        <field name="view_mode">form</field>
+	        <field name="view_id" ref="crm.crm_case_stage_form_full"/>
+	        <field name="act_window_id" ref="crm_fundraising_stage_act"/>
+		</record>
 
          <menuitem action="crm_fundraising_stage_act"
             groups="base.group_extended" name="Stages"