[IMP] base_action_rule: use better value names for new selection field
bzr revid: rco@openerp.com-20130304094951-7452svzw0cgzu6jp
This commit is contained in:
parent
f1f15f52b3
commit
2a0245b20c
|
@ -63,7 +63,7 @@ class base_action_rule(osv.osv):
|
|||
'sequence': fields.integer('Sequence',
|
||||
help="Gives the sequence order when displaying a list of rules."),
|
||||
'kind': fields.selection(
|
||||
[('create', 'On Creation'), ('write', 'On Update'), ('cron', 'Based on Timed Condition')],
|
||||
[('on_create', 'On Creation'), ('on_write', 'On Update'), ('on_time', 'Based on Timed Condition')],
|
||||
string='When to Run'),
|
||||
'trg_date_id': fields.many2one('ir.model.fields', string='Trigger Date',
|
||||
domain="[('model_id', '=', model_id), ('ttype', 'in', ('date', 'datetime'))]"),
|
||||
|
@ -96,11 +96,11 @@ class base_action_rule(osv.osv):
|
|||
|
||||
def onchange_kind(self, cr, uid, ids, kind, context=None):
|
||||
clear_fields = []
|
||||
if kind == 'create':
|
||||
if kind == 'on_create':
|
||||
clear_fields = ['filter_pre_id', 'trg_date_id', 'trg_date_range', 'trg_date_range_type']
|
||||
elif kind == 'write':
|
||||
elif kind == 'on_write':
|
||||
clear_fields = ['trg_date_id', 'trg_date_range', 'trg_date_range_type']
|
||||
elif kind == 'cron':
|
||||
elif kind == 'on_time':
|
||||
clear_fields = ['filter_pre_id']
|
||||
return {'value': dict.fromkeys(clear_fields, False)}
|
||||
|
||||
|
@ -155,7 +155,7 @@ class base_action_rule(osv.osv):
|
|||
new_id = old_create(cr, uid, vals, context=context)
|
||||
|
||||
# retrieve the action rules to run on creation
|
||||
action_dom = [('model', '=', model), ('kind', '=', 'create')]
|
||||
action_dom = [('model', '=', model), ('kind', '=', 'on_create')]
|
||||
action_ids = self.search(cr, uid, action_dom, context=context)
|
||||
|
||||
# check postconditions, and execute actions on the records that satisfy them
|
||||
|
@ -179,7 +179,7 @@ class base_action_rule(osv.osv):
|
|||
ids = [ids] if isinstance(ids, (int, long, str)) else ids
|
||||
|
||||
# retrieve the action rules to run on update
|
||||
action_dom = [('model', '=', model), ('kind', '=', 'write')]
|
||||
action_dom = [('model', '=', model), ('kind', '=', 'on_write')]
|
||||
action_ids = self.search(cr, uid, action_dom, context=context)
|
||||
actions = self.browse(cr, uid, action_ids, context=context)
|
||||
|
||||
|
@ -231,7 +231,7 @@ class base_action_rule(osv.osv):
|
|||
""" This Function is called by scheduler. """
|
||||
context = context or {}
|
||||
# retrieve all the action rules to run based on a timed condition
|
||||
action_dom = [('kind', '=', 'cron')]
|
||||
action_dom = [('kind', '=', 'on_time')]
|
||||
action_ids = self.search(cr, uid, action_dom, context=context)
|
||||
for action in self.browse(cr, uid, action_ids, context=context):
|
||||
now = datetime.now()
|
||||
|
|
|
@ -31,12 +31,12 @@
|
|||
<field name="filter_pre_id"
|
||||
domain="[('model_id','=',model), ('user_id', '=', False)]"
|
||||
context="{'default_model_id': model}"
|
||||
attrs="{'invisible': [('kind', '!=', 'write')]}"/>
|
||||
attrs="{'invisible': [('kind', '!=', 'on_write')]}"/>
|
||||
<field name="filter_id"
|
||||
domain="[('model_id','=',model), ('user_id', '=', False)]"
|
||||
context="{'default_model_id': model}"/>
|
||||
<field name="trg_date_id"
|
||||
attrs="{'invisible': [('kind', '!=', 'cron')]}"/>
|
||||
attrs="{'invisible': [('kind', '!=', 'on_time')]}"/>
|
||||
<label for="trg_date_range" string="Delay After Trigger Date"
|
||||
attrs="{'invisible': [('trg_date_id','=',False)]}"/>
|
||||
<div attrs="{'invisible': [('trg_date_id','=',False)]}">
|
||||
|
|
|
@ -64,7 +64,7 @@ class base_action_rule_test(common.TransactionCase):
|
|||
"""
|
||||
cr, uid = self.cr, self.uid
|
||||
filter_draft = self.create_filter_draft(cr, uid)
|
||||
self.create_rule(cr, uid, 'write', filter_pre_id=filter_draft)
|
||||
self.create_rule(cr, uid, 'on_write', filter_pre_id=filter_draft)
|
||||
new_lead_id = self.create_lead_test_1(cr, uid)
|
||||
new_lead = self.model.browse(cr, uid, new_lead_id)
|
||||
self.assertEquals(new_lead.state, 'draft')
|
||||
|
@ -77,7 +77,7 @@ class base_action_rule_test(common.TransactionCase):
|
|||
"""
|
||||
cr, uid = self.cr, self.uid
|
||||
filter_draft = self.create_filter_draft(cr, uid)
|
||||
self.create_rule(cr, uid, 'create')
|
||||
self.create_rule(cr, uid, 'on_create')
|
||||
new_lead_id = self.create_lead_test_1(cr, uid)
|
||||
new_lead = self.model.browse(cr, uid, new_lead_id)
|
||||
self.assertEquals(new_lead.state, 'draft')
|
||||
|
@ -95,7 +95,7 @@ class base_action_rule_test(common.TransactionCase):
|
|||
cr, uid = self.cr, self.uid
|
||||
filter_draft = self.create_filter_draft(cr, uid)
|
||||
filter_done = self.create_filter_done(cr, uid)
|
||||
self.create_rule(cr, uid, 'write', filter_pre_id=filter_draft, filter_id=filter_done)
|
||||
self.create_rule(cr, uid, 'on_write', filter_pre_id=filter_draft, filter_id=filter_done)
|
||||
new_lead_id = self.create_lead_test_1(cr, uid)
|
||||
new_lead = self.model.browse(cr, uid, new_lead_id)
|
||||
self.assertEquals(new_lead.state, 'draft')
|
||||
|
@ -133,7 +133,7 @@ class base_action_rule_test(common.TransactionCase):
|
|||
cr, uid = self.cr, self.uid
|
||||
filter_draft = self.create_filter_draft(cr, uid)
|
||||
filter_done = self.create_filter_done(cr, uid)
|
||||
self.create_rule(cr, uid, 'write', filter_pre_id=filter_draft, filter_id=filter_done)
|
||||
self.create_rule(cr, uid, 'on_write', filter_pre_id=filter_draft, filter_id=filter_done)
|
||||
new_lead_id = self.create_lead_test_1(cr, uid)
|
||||
new_lead = self.model.browse(cr, uid, new_lead_id)
|
||||
self.assertEquals(new_lead.state, 'draft')
|
||||
|
|
|
@ -26,7 +26,7 @@ Description: [[object.description]]
|
|||
<field name="name">Set Auto Reminder on leads which are not open since 5 days.</field>
|
||||
<field name="model_id" ref="model_crm_lead"/>
|
||||
<field name="sequence">1</field>
|
||||
<field name="kind">cron</field>
|
||||
<field name="kind">on_time</field>
|
||||
<field name="filter_id" ref="filter_draft_lead"/>
|
||||
<field name="trg_date_id" ref="field_crm_lead_create_date"/>
|
||||
<field name="trg_date_range">5</field>
|
||||
|
@ -55,7 +55,7 @@ object.write({'section_id': sales_team.id})
|
|||
<field name="name">Set Auto Followers on leads which are urgent and come from USA.</field>
|
||||
<field name="model_id" ref="model_crm_lead"/>
|
||||
<field name="sequence">2</field>
|
||||
<field name="kind">create</field>
|
||||
<field name="kind">on_create</field>
|
||||
<field name="filter_id" ref="filter_usa_lead"/>
|
||||
<field name="act_user_id" ref="base.user_root"/>
|
||||
<field name="act_followers" eval="[(6,0,[ref('base.res_partner_4'), ref('base.res_partner_5'), ref('base.res_partner_6')])]"/>
|
||||
|
|
Loading…
Reference in New Issue