diff options
| author | Fabin Pinckaers <fp@openerp.com> | 2015-07-14 11:35:37 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2015-07-30 10:19:14 +0200 |
| commit | 49b904b6c1f5d53451d2da7f0842e967c670ffb6 (patch) | |
| tree | b865adc796edc676d60a2a3523d9f4e4850db1d8 | |
| parent | 42c5eea6771e85b35f4dcfb840abd95ddcabb319 (diff) | |
[IMP] crm: type field required
[FIX] crm: assign date_open in leads only if not set in the values.
Given values have the priority on default-like values.
| -rw-r--r-- | addons/crm/crm_lead.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 2795ba557bb..45848d5fffc 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -179,7 +179,10 @@ class crm_lead(format_address, osv.osv): 'opt_out': fields.boolean('Opt-Out', oldname='optout', help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign. " "Filter 'Available for Mass Mailing' allows users to filter the leads when performing mass mailing."), - 'type': fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', select=True, help="Type is used to separate Leads and Opportunities"), + 'type': fields.selection( + [('lead', 'Lead'), ('opportunity', 'Opportunity')], + string='Type', select=True, required=True, + help="Type is used to separate Leads and Opportunities"), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), 'date_closed': fields.datetime('Closed', readonly=True, copy=False), 'stage_id': fields.many2one('crm.stage', 'Stage', track_visibility='onchange', select=True, @@ -890,7 +893,7 @@ class crm_lead(format_address, osv.osv): context['default_type'] = vals.get('type') if vals.get('team_id') and not context.get('default_team_id'): context['default_team_id'] = vals.get('team_id') - if vals.get('user_id'): + if vals.get('user_id') and 'date_open' not in vals: vals['date_open'] = fields.datetime.now() # context: no_log, because subtype already handle this @@ -901,7 +904,7 @@ class crm_lead(format_address, osv.osv): # stage change: update date_last_stage_update if 'stage_id' in vals: vals['date_last_stage_update'] = fields.datetime.now() - if vals.get('user_id'): + if vals.get('user_id') and 'date_open' not in vals: vals['date_open'] = fields.datetime.now() # stage change with new stage: update probability and date_closed if vals.get('stage_id') and not vals.get('probability'): |