openerp-dev-web team mailing list archive

Thread
Date

lp:~openerp-dev/openobject-addons/trunk-openerp_crm_imp-campaign_type-uco into lp:~openerp-dev/openobject-addons/trunk-openerp_crm_imp

To: mp+54341@xxxxxxxxxxxxxxxxxx
From: "tfr \(Openerp\)" <tfr@xxxxxxxxxxx>
Date: Tue, 22 Mar 2011 12:53:14 -0000
Reply-to: mp+54341@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

tfr (Openerp) has proposed merging lp:~openerp-dev/openobject-addons/trunk-openerp_crm_imp-campaign_type-uco into lp:~openerp-dev/openobject-addons/trunk-openerp_crm_imp.

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

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-openerp_crm_imp-campaign_type-uco/+merge/54341
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-openerp_crm_imp-campaign_type-uco/+merge/54341
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-openerp_crm_imp-campaign_type-uco into lp:~openerp-dev/openobject-addons/trunk-openerp_crm_imp.

=== modified file 'crm/crm.py'
--- crm/crm.py	2011-03-04 12:53:34 +0000
+++ crm/crm.py	2011-03-22 12:52:30 +0000
@@ -725,9 +725,14 @@
     _name = "crm.case.resource.type"
     _description = "Campaign"
     _rec_name = "name"
+    
+    def _get_resource_type_value(self, cr, user, context=None):
+        return [('crm_case','Lead / Opportunity')]
+
     _columns = {
         'name': fields.char('Campaign Name', size=64, required=True, translate=True),
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'type': fields.selection(_get_resource_type_value, 'Type')
     }
 crm_case_resource_type()
 

=== modified file 'crm/crm_lead_data.xml'
--- crm/crm_lead_data.xml	2011-01-14 00:11:01 +0000
+++ crm/crm_lead_data.xml	2011-03-22 12:52:30 +0000
@@ -57,41 +57,49 @@
         <record model="crm.case.resource.type" id="type_lead1">
             <field name="name">Telesales</field>
             <field name="section_id" ref="section_sales_department"/>
+            <field name="type">crm_case</field>
         </record>
 
         <record model="crm.case.resource.type" id="type_lead2">
             <field name="name">Mail Campaign 1</field>
             <field name="section_id" ref="section_sales_department"/>
+            <field name="type">crm_case</field>
         </record>
 
         <record model="crm.case.resource.type" id="type_lead3">
             <field name="name">Mail Campaign 2</field>
             <field name="section_id" ref="section_sales_department"/>
+            <field name="type">crm_case</field>
         </record>
 
         <record model="crm.case.resource.type" id="type_lead4">
             <field name="name">Twitter Ads</field>
             <field name="section_id" ref="section_sales_department"/>
+            <field name="type">crm_case</field>
         </record>
 
         <record model="crm.case.resource.type" id="type_lead5">
             <field name="name">Google Adwords</field>
             <field name="section_id" ref="section_sales_department"/>
+            <field name="type">crm_case</field>
         </record>
 
         <record model="crm.case.resource.type" id="type_lead6">
             <field name="name">Google Adwords 2</field>
             <field name="section_id" ref="section_sales_department"/>
+            <field name="type">crm_case</field>
         </record>
 
         <record model="crm.case.resource.type" id="type_lead7">
             <field name="name">Television</field>
             <field name="section_id" ref="section_sales_department"/>
+            <field name="type">crm_case</field>
         </record>
 
         <record model="crm.case.resource.type" id="type_lead8">
             <field name="name">Newsletter</field>
             <field name="section_id" ref="section_sales_department"/>
+            <field name="type">crm_case</field>
         </record>
 
     </data>

=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2011-03-04 12:53:34 +0000
+++ crm/crm_lead_view.xml	2011-03-22 12:52:30 +0000
@@ -156,7 +156,7 @@
                         <field name="company_id"
                             groups="base.group_multi_company"
                             widget="selection" colspan="2" />
-                        <field name="type_id" select="1" widget="selection"/>
+                        <field name="type_id" select="1" widget="selection" domain="[('type','=','crm_case')]"/>
                         <field name="channel_id" select="1" widget="selection"/>
                         <field name="referred"/>
                     </group>

=== modified file 'crm/crm_opportunity_data.xml'
--- crm/crm_opportunity_data.xml	2011-01-14 00:11:01 +0000
+++ crm/crm_opportunity_data.xml	2011-03-22 12:52:30 +0000
@@ -99,10 +99,12 @@
 	    <record model="crm.case.resource.type" id="type_oppor1">
 	        <field name="name">Campaign 2</field>
 	        <field name="section_id" ref="section_sales_department"/>
+	        <field name="type">crm_case</field>
 	    </record>
 	    <record model="crm.case.resource.type" id="type_oppor2">
 	        <field name="name">Campaign 1</field>
 	        <field name="section_id" ref="section_sales_department"/>
+	        <field name="type">crm_case</field>
 	    </record>
 
 </data>

=== modified file 'crm/crm_opportunity_view.xml'
--- crm/crm_opportunity_view.xml	2011-03-04 12:53:34 +0000
+++ crm/crm_opportunity_view.xml	2011-03-22 12:52:30 +0000
@@ -126,7 +126,7 @@
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Categorization" colspan="2"/>
-                                <field name="type_id" widget="selection" groups="base.group_extended"/>
+                                <field name="type_id" widget="selection" groups="base.group_extended" domain="[('type','=','crm_case')]"/>
                                 <field name="channel_id" widget="selection"/>
                             </group>
                             <group colspan="2" col="2">

=== modified file 'crm/crm_view.xml'
--- crm/crm_view.xml	2011-02-18 04:33:13 +0000
+++ crm/crm_view.xml	2011-03-22 12:52:30 +0000
@@ -187,6 +187,7 @@
                 <tree string="Campaign">
                     <field name="name"/>
                     <field name="section_id"/>
+                    <field name="type"/>
                 </tree>
             </field>
         </record>
@@ -201,6 +202,7 @@
                 <form string="Campaign">
                     <field name="name" select="1"/>
                     <field name="section_id" select="1" widget="selection"/>
+                    <field name="type"/>
                 </form>
             </field>
         </record>

=== modified file 'crm_claim/crm_claim.py'
--- crm_claim/crm_claim.py	2011-02-15 09:42:10 +0000
+++ crm_claim/crm_claim.py	2011-03-22 12:52:30 +0000
@@ -266,5 +266,21 @@
     
 crm_stage_claim()
 
+class crm_case_resource_type(osv.osv):
+    """ Resource Type of case """
+    _inherit = "crm.case.resource.type"
+    _description = "Campaign"
+    
+    def _get_resource_type_value(self, cr, user, context=None):
+        type_list = super(crm_case_resource_type, self)._get_resource_type_value(cr, user, context)
+        type_list.append(('claim','Claim'))
+        return type_list
+    
+    _columns ={
+        'type': fields.selection(_get_resource_type_value, 'Type')
+    }
+
+crm_case_resource_type()
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'crm_claim/crm_claim_data.xml'
--- crm_claim/crm_claim_data.xml	2011-01-14 00:11:01 +0000
+++ crm_claim/crm_claim_data.xml	2011-03-22 12:52:30 +0000
@@ -31,11 +31,13 @@
         <record model="crm.case.resource.type" id="type_claim1">
             <field name="name">Corrective</field>
             <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="type">claim</field>
         </record>
         
         <record model="crm.case.resource.type" id="type_claim2">
             <field name="name">Preventive</field>
             <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="type">claim</field>
         </record>
     
         <!--

=== modified file 'crm_fundraising/crm_fundraising.py'
--- crm_fundraising/crm_fundraising.py	2011-01-14 00:11:01 +0000
+++ crm_fundraising/crm_fundraising.py	2011-03-22 12:52:30 +0000
@@ -110,3 +110,19 @@
    
     
 crm_stage_fundraising()
+
+class crm_case_resource_type(osv.osv):
+    """ Resource Type of case """
+    _inherit = "crm.case.resource.type"
+    _description = "Campaign"
+    
+    def _get_resource_type_value(self, cr, user, context=None):
+        type_list = super(crm_case_resource_type, self)._get_resource_type_value(cr, user, context)
+        type_list.append(('fundraising','Fundraising'))
+        return type_list
+    
+    _columns ={
+        'type': fields.selection(_get_resource_type_value, 'Type')
+    }
+
+crm_case_resource_type()

=== modified file 'crm_fundraising/crm_fundraising_data.xml'
--- crm_fundraising/crm_fundraising_data.xml	2011-01-14 00:11:01 +0000
+++ crm_fundraising/crm_fundraising_data.xml	2011-03-22 12:52:30 +0000
@@ -33,21 +33,25 @@
     <record model="crm.case.resource.type" id="type_fund1">
         <field name="name">Cash</field>
         <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="type">fundraising</field>
     </record>
 
     <record model="crm.case.resource.type" id="type_fund2">
         <field name="name">Cheque</field>
         <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="type">fundraising</field>
     </record>
 
     <record model="crm.case.resource.type" id="type_fund3">
         <field name="name">Credit Card</field>
         <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="type">fundraising</field>
     </record>
 
     <record model="crm.case.resource.type" id="type_fund4">
         <field name="name">Demand Draft</field>
         <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="type">fundraising</field>
     </record>
 
 </data>

=== modified file 'crm_fundraising/crm_fundraising_view.xml'
--- crm_fundraising/crm_fundraising_view.xml	2011-02-22 14:15:01 +0000
+++ crm_fundraising/crm_fundraising_view.xml	2011-03-22 12:52:30 +0000
@@ -111,7 +111,7 @@
                         <field name="user_id" string="Responsible"/>
                         <field name="date"/>
                         <field name="categ_id" select="1" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
-                        <field name="type_id" string="Payment Mode" select="1" widget="selection"/>
+                        <field name="type_id" string="Payment Mode" select="1" widget="selection" domain="[('type','=','fundraising')]"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Funds">

Follow ups

lp:~openerp-dev/openobject-addons/trunk-openerp_crm_imp-campaign_type-uco into lp:~openerp-dev/openobject-addons/trunk-openerp_crm_imp
From: tfr (Openerp), 2011-03-22
lp:~openerp-dev/openobject-addons/trunk-openerp_crm_imp-campaign_type-uco into lp:~openerp-dev/openobject-addons/trunk-openerp_crm_imp
From: tfr (Openerp), 2011-03-22