From 64229a2a93a25c57ddc4ed421827c6a06e72675d Mon Sep 17 00:00:00 2001 From: Vijaykumar Baladaniya Date: Thu, 4 Oct 2012 12:13:47 +0530 Subject: [PATCH 01/15] Employee create time, not have a default email address. bzr revid: vba@tinyerp.com-20121004064347-b6oiab179q4smhs1 --- addons/hr/hr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr/hr.py b/addons/hr/hr.py index eafe5d09844..d2214f5e14f 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -231,7 +231,7 @@ class hr_employee(osv.osv): def onchange_address_id(self, cr, uid, ids, address, context=None): if address: address = self.pool.get('res.partner').browse(cr, uid, address, context=context) - return {'value': {'work_email': address.email, 'work_phone': address.phone, 'mobile_phone': address.mobile}} + return {'value': {'work_phone': address.phone, 'mobile_phone': address.mobile}} return {'value': {}} def onchange_company(self, cr, uid, ids, company, context=None): From 1c243a435f0256bddf7dabd8a087b8c881ed9e38 Mon Sep 17 00:00:00 2001 From: Vijaykumar Baladaniya Date: Thu, 4 Oct 2012 13:03:32 +0530 Subject: [PATCH 02/15] View improvement of autometed action form. bzr revid: vba@tinyerp.com-20121004073332-1bdvfmsc18ev8r1e --- addons/base_action_rule/base_action_rule.py | 2 +- .../base_action_rule_view.xml | 27 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 7e9bbacab13..fa606fdeefc 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -117,7 +117,7 @@ this if you want the rule to send a reminder by email to the user."), the rule to mark CC(mail to any other person defined in actions)."), 'act_mail_to_email': fields.char('Mail to these Emails', size=128, \ help="Email-id of the persons whom mail is to be sent"), - 'act_mail_body': fields.text('Mail body', help="Content of mail"), + 'act_mail_body': fields.text('Mail body', translate=True, help="Content of mail"), 'regex_name': fields.char('Regex on Resource Name', size=128, help="Regular expression for matching name of the resource\ \ne.g.: 'urgent.*' will search for records having name starting with the string 'urgent'\ \nNote: This is case sensitive search."), diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml index 0d268438a41..64d65434cfc 100644 --- a/addons/base_action_rule/base_action_rule_view.xml +++ b/addons/base_action_rule/base_action_rule_view.xml @@ -56,21 +56,20 @@ - - - - - - - + + + + + + + + + + + + + - - - - - - - From b33ca4139a77a87de36e6a20e1682c1fd80148f1 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Thu, 4 Oct 2012 17:37:19 +0530 Subject: [PATCH 03/15] [IMP] base_action_rule: reminder by email: remove fields related to remainder. for that we can configure email server action watchers emails: remove fields related to CC,TO. added followers to set as a followers of documents improve view of action rule bzr revid: hmo@tinyerp.com-20121004120719-5btx7h1jp2398jra --- addons/base_action_rule/base_action_rule.py | 223 +++--------------- .../base_action_rule_view.xml | 116 ++++----- addons/base_status/base_stage.py | 40 +--- addons/crm/crm_action_rule.py | 40 +--- addons/crm/crm_action_rule_view.xml | 50 +--- 5 files changed, 88 insertions(+), 381 deletions(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index fa606fdeefc..cb2239f76a7 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -19,15 +19,16 @@ # ############################################################################## -from osv import fields, osv, orm -from tools.translate import _ from datetime import datetime from datetime import timedelta +import re +import time + +from osv import fields, osv, orm +from tools.translate import _ from tools.safe_eval import safe_eval from tools import ustr import pooler -import re -import time import tools @@ -48,32 +49,20 @@ class base_action_rule(osv.osv): _description = 'Action Rules' def _state_get(self, cr, uid, context=None): - """ Get State - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param context: A standard dictionary for contextual values """ + """ Get State """ return self.state_get(cr, uid, context=context) def state_get(self, cr, uid, context=None): - """ Get State - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param context: A standard dictionary for contextual values """ + """ Get State """ return [('', '')] def priority_get(self, cr, uid, context=None): - """ Get Priority - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param context: A standard dictionary for contextual values """ + """ Get Priority """ return [('', '')] _columns = { 'name': fields.char('Rule Name', size=64, required=True), - 'model_id': fields.many2one('ir.model', 'Object', required=True), + 'model_id': fields.many2one('ir.model', 'Related Document Model', required=True, domain=[('osv_memory','=', False)]), 'create_date': fields.datetime('Create Date', readonly=1), 'active': fields.boolean('Active', help="If the active field is set to False,\ it will allow you to hide the rule without removing it."), @@ -98,35 +87,14 @@ trigger date, like sending a reminder 15 minutes before a meeting."), 'trg_state_from': fields.selection(_state_get, 'Status', size=16), 'trg_state_to': fields.selection(_state_get, 'Button Pressed', size=16), - 'act_method': fields.char('Call Object Method', size=64), 'act_user_id': fields.many2one('res.users', 'Set Responsible to'), 'act_state': fields.selection(_state_get, 'Set State to', size=16), - 'act_email_cc': fields.char('Add Watchers (Cc)', size=250, help="\ -These people will receive a copy of the future communication between partner \ -and users by email"), - 'act_remind_partner': fields.boolean('Remind Partner', help="Check \ -this if you want the rule to send a reminder by email to the partner."), - 'act_remind_user': fields.boolean('Remind Responsible', help="Check \ -this if you want the rule to send a reminder by email to the user."), - 'act_reply_to': fields.char('Reply-To', size=64), - 'act_remind_attach': fields.boolean('Remind with Attachment', help="Check this if you want that all documents attached to the object be attached to the reminder email sent."), - 'act_mail_to_user': fields.boolean('Mail to Responsible', help="Check\ - this if you want the rule to send an email to the responsible person."), - 'act_mail_to_watchers': fields.boolean('Mail to Watchers (CC)', - help="Check this if you want \ -the rule to mark CC(mail to any other person defined in actions)."), - 'act_mail_to_email': fields.char('Mail to these Emails', size=128, \ - help="Email-id of the persons whom mail is to be sent"), - 'act_mail_body': fields.text('Mail body', translate=True, help="Content of mail"), + 'act_followers': fields.many2many("res.partner", string="Set Followers"), 'regex_name': fields.char('Regex on Resource Name', size=128, help="Regular expression for matching name of the resource\ \ne.g.: 'urgent.*' will search for records having name starting with the string 'urgent'\ \nNote: This is case sensitive search."), 'server_action_id': fields.many2one('ir.actions.server', 'Server Action', help="Describes the action name.\neg:on which object which action to be taken on basis of which condition"), - 'filter_id':fields.many2one('ir.filters', 'Filter', required=False), - 'act_email_from' : fields.char('Email From', size=64, required=False, - help="Use a python expression to specify the right field on which one than we will use for the 'From' field of the header"), - 'act_email_to' : fields.char('Email To', size=64, required=False, - help="Use a python expression to specify the right field on which one than we will use for the 'To' field of the header"), + 'filter_id':fields.many2one('ir.filters', 'Filter', required=False), #TODO: set domain [('model_id','=',model)] 'last_run': fields.datetime('Last Run', readonly=1), } @@ -134,42 +102,24 @@ the rule to mark CC(mail to any other person defined in actions)."), 'active': lambda *a: True, 'trg_date_type': lambda *a: 'none', 'trg_date_range_type': lambda *a: 'day', - 'act_mail_to_user': lambda *a: 0, - 'act_remind_partner': lambda *a: 0, - 'act_remind_user': lambda *a: 0, - 'act_mail_to_watchers': lambda *a: 0, } _order = 'sequence' - def onchange_model_id(self, cr, uid, ids, name): - #This is not a good solution as it will affect the domain only on onchange - res = {'domain':{'filter_id':[]}} - if name: - model_name = self.pool.get('ir.model').read(cr, uid, [name], ['model']) - if model_name: - mod_name = model_name[0]['model'] - res['domain'] = {'filter_id': [('model_id','=',mod_name)]} - else: - res['value'] = {'filter_id':False} - return res def post_action(self, cr, uid, ids, model, context=None): # Searching for action rules cr.execute("SELECT model.model, rule.id FROM base_action_rule rule \ LEFT JOIN ir_model model on (model.id = rule.model_id) \ - WHERE active") + WHERE active and model = %%s", model) res = cr.fetchall() # Check if any rule matching with current object for obj_name, rule_id in res: - if not (model == obj_name): - continue # TODO add this condition in the WHERE clause above. - else: - obj = self.pool.get(obj_name) - # If the rule doesn't involve a time condition, run it immediately - # Otherwise we let the scheduler run the action - if self.browse(cr, uid, rule_id, context=context).trg_date_type == 'none': - self._action(cr, uid, [rule_id], obj.browse(cr, uid, ids, context=context), context=context) + obj = self.pool.get(obj_name) + # If the rule doesn't involve a time condition, run it immediately + # Otherwise we let the scheduler run the action + if self.browse(cr, uid, rule_id, context=context).trg_date_type == 'none': + self._action(cr, uid, [rule_id], obj.browse(cr, uid, ids, context=context), context=context) return True def _create(self, old_create, model, context=None): @@ -279,58 +229,8 @@ the rule to mark CC(mail to any other person defined in actions)."), rule_pool.write(cr, uid, [rule.id], {'last_run': now}, context=context) - def format_body(self, body): - """ Foramat Action rule's body - @param self: The object pointer """ - return body and tools.ustr(body) or '' - - def format_mail(self, obj, body): - data = { - 'object_id': obj.id, - 'object_subject': hasattr(obj, 'name') and obj.name or False, - 'object_date': hasattr(obj, 'date') and obj.date or False, - 'object_description': hasattr(obj, 'description') and obj.description or False, - 'object_user': hasattr(obj, 'user_id') and (obj.user_id and obj.user_id.name) or '/', - 'object_user_email': hasattr(obj, 'user_id') and (obj.user_id and \ - obj.user_id.email) or '/', - 'object_user_phone': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and \ - obj.partner_address_id.phone) or '/', - 'partner': hasattr(obj, 'partner_id') and (obj.partner_id and obj.partner_id.name) or '/', - 'partner_email': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and\ - obj.partner_address_id.email) or '/', - } - return self.format_body(body % data) - - def email_send(self, cr, uid, obj, emails, body, emailfrom=None, context=None): - if not emailfrom: - emailfrom = tools.config.get('email_from') - body = self.format_mail(obj, body) - if not emailfrom and hasattr(obj, 'user_id') and obj.user_id and obj.user_id.email: - emailfrom = obj.user_id.email - emailfrom = tools.ustr(emailfrom) - reply_to = emailfrom - if not emailfrom: - raise osv.except_osv(_('Error!'), - _("Missing default email address or missing email on responsible user")) - return self.pool.get('mail.mail').create(cr, uid, - { 'email_from': emailfrom, - 'email_to': emails.join(','), - 'reply_to': reply_to, - 'state': 'outgoing', - 'subject': '[%d] %s' % (obj.id, tools.ustr(obj.name)), - 'body_html': '
%s
' % body, - 'res_id': obj.id, - 'model': obj._table_name, - 'auto_delete': True - }, context=context) - - def do_check(self, cr, uid, action, obj, context=None): - """ check Action - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param context: A standard dictionary for contextual values """ + """ check Action """ if context is None: context = {} ok = True @@ -373,79 +273,32 @@ the rule to mark CC(mail to any other person defined in actions)."), return ok def do_action(self, cr, uid, action, model_obj, obj, context=None): - """ Do Action - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param action: pass action - @param model_obj: pass Model object - @param context: A standard dictionary for contextual values """ + """ Do Action """ if context is None: context = {} if action.server_action_id: context.update({'active_id':obj.id, 'active_ids':[obj.id]}) self.pool.get('ir.actions.server').run(cr, uid, [action.server_action_id.id], context) - write = {} + write = {} if hasattr(obj, 'user_id') and action.act_user_id: - obj.user_id = action.act_user_id write['user_id'] = action.act_user_id.id if hasattr(obj, 'date_action_last'): write['date_action_last'] = time.strftime('%Y-%m-%d %H:%M:%S') if hasattr(obj, 'state') and action.act_state: - obj.state = action.act_state write['state'] = action.act_state - - if hasattr(obj, 'categ_id') and action.act_categ_id: - obj.categ_id = action.act_categ_id - write['categ_id'] = action.act_categ_id.id - + model_obj.write(cr, uid, [obj.id], write, context) - - if hasattr(model_obj, 'remind_user') and action.act_remind_user: - model_obj.remind_user(cr, uid, [obj.id], context, attach=action.act_remind_attach) - if hasattr(model_obj, 'remind_partner') and action.act_remind_partner: - model_obj.remind_partner(cr, uid, [obj.id], context, attach=action.act_remind_attach) - if action.act_method: - getattr(model_obj, 'act_method')(cr, uid, [obj.id], action, context) - - emails = [] - if hasattr(obj, 'user_id') and action.act_mail_to_user: - if obj.user_id: - emails.append(obj.user_id.email) - - if action.act_mail_to_watchers: - emails += (action.act_email_cc or '').split(',') - if action.act_mail_to_email: - emails += (action.act_mail_to_email or '').split(',') - - locals_for_emails = { - 'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context), - 'obj' : obj, - } - - if action.act_email_to: - emails.append(safe_eval(action.act_email_to, {}, locals_for_emails)) - - emails = filter(None, emails) - if len(emails) and action.act_mail_body: - emails = list(set(emails)) - email_from = safe_eval(action.act_email_from, {}, locals_for_emails) - emails = tools.email_split(','.join(filter(None, emails))) - email_froms = tools.email_split(email_from) - if email_froms: - self.email_send(cr, uid, obj, emails, action.act_mail_body, emailfrom=email_froms[0]) + if hasattr(obj, 'state') and hasattr(obj, 'message_post') and action.act_state: + model_obj.message_post(cr, uid, [obj], _(action.act_state), context=context) + + if hasattr(obj, 'message_subscribe') and action.act_followers: + model_obj.message_subscribe(cr, uid, [obj.id], [x.id for x in action.act_followers], context=context) return True def _action(self, cr, uid, ids, objects, scrit=None, context=None): - """ Do Action - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of Basic Action Rule’s IDs, - @param objects: pass objects - @param context: A standard dictionary for contextual values """ + """ Do Action """ if context is None: context = {} @@ -462,28 +315,6 @@ the rule to mark CC(mail to any other person defined in actions)."), context.update({'action': False}) return True - def _check_mail(self, cr, uid, ids, context=None): - """ Check Mail - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of Action Rule’s IDs - @param context: A standard dictionary for contextual values """ - - empty = orm.browse_null() - rule_obj = self.pool.get('base.action.rule') - for rule in self.browse(cr, uid, ids, context=context): - if rule.act_mail_body: - try: - rule_obj.format_mail(empty, rule.act_mail_body) - except (ValueError, KeyError, TypeError): - return False - return True - - _constraints = [ - (_check_mail, 'Error ! The mail is not well formated.', ['act_mail_body']), - ] - base_action_rule() diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml index 64d65434cfc..b35818ee8d9 100644 --- a/addons/base_action_rule/base_action_rule_view.xml +++ b/addons/base_action_rule/base_action_rule_view.xml @@ -12,81 +12,53 @@ base.action.rule
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py index 617af125215..999da23c560 100644 --- a/addons/base_status/base_stage.py +++ b/addons/base_status/base_stage.py @@ -302,50 +302,14 @@ class base_stage(object): rule_ids = rule_obj.search(cr, uid, [('model_id','=',model_ids[0])], context=context) return rule_obj._action(cr, uid, rule_ids, cases, scrit=scrit, context=context) - def remind_partner(self, cr, uid, ids, context=None, attach=False): - return self.remind_user(cr, uid, ids, context, attach, - destination=False) - - def remind_user(self, cr, uid, ids, context=None, attach=False, destination=True): - if hasattr(self, 'message_post'): - for case in self.browse(cr, uid, ids, context=context): - if destination: - recipient_id = case.user_id.partner_id.id - else: - if not case.email_from: - return False - recipient_id = self.pool.get('res.partner').find_or_create(cr, uid, case.email_from, context=context) - - body = case.description or "" - for message in case.message_ids: - if message.type == 'email' and message.body: - body = message.body - break - body = self.format_body(body) - attach_to_send = {} - if attach: - attach_ids = self.pool.get('ir.attachment').search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', case.id)]) - attach_to_send = self.pool.get('ir.attachment').read(cr, uid, attach_ids, ['datas_fname', 'datas']) - attach_to_send = dict(map(lambda x: (x['datas_fname'], x['datas'].decode('base64')), attach_to_send)) - - subject = "Reminder: [%s] %s" % (case.id, case.name) - self.message_post(cr, uid, case.id, body=body, - subject=subject, attachments=attach_to_send, - partner_ids=[recipient_id], context=context) - return True - + def _check(self, cr, uid, ids=False, context=None): """ Function called by the scheduler to process cases for date actions. Must be overriden by inheriting classes. """ return True - def format_body(self, body): - return self.pool.get('base.action.rule').format_body(body) - - def format_mail(self, obj, body): - return self.pool.get('base.action.rule').format_mail(obj, body) - + # ****************************** # Notifications # ****************************** diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py index 8b1ba655afc..49af2f74eeb 100644 --- a/addons/crm/crm_action_rule.py +++ b/addons/crm/crm_action_rule.py @@ -41,24 +41,15 @@ class base_action_rule(osv.osv): 'regex_history' : fields.char('Regular Expression on Case History', size=128), 'act_section_id': fields.many2one('crm.case.section', 'Set Team to'), 'act_categ_id': fields.many2one('crm.case.categ', 'Set Category to'), - 'act_mail_to_partner': fields.boolean('Mail to Partner', - help="Check this if you want the rule to send an email to the partner."), } - def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context=None): - mail_id = super(base_action_rule, self).email_send(cr, uid, obj, emails, body, emailfrom=emailfrom, context=context) - if mail_id and hasattr(obj, 'section_id') and obj.section_id and obj.section_id.alias_id: - reply_to = obj.section_id.alias_id.name_get()[0][1] - self.pool.get('mail.mail').write(cr, uid, [mail_id], {'reply_to': reply_to}, context=context) - return mail_id - def do_check(self, cr, uid, action, obj, context=None): ok = super(base_action_rule, self).do_check(cr, uid, action, obj, context=context) if hasattr(obj, 'section_id'): ok = ok and (not action.trg_section_id or action.trg_section_id.id == obj.section_id.id) - if hasattr(obj, 'categ_id'): - ok = ok and (not action.trg_categ_id or action.trg_categ_id.id == obj.categ_id.id) + if hasattr(obj, 'categ_ids'): + ok = ok and (not action.trg_categ_id or action.trg_categ_id.id in [x.id for x in obj.categ_ids]) #Cheking for history regex = action.regex_history @@ -81,35 +72,16 @@ class base_action_rule(osv.osv): return ok def do_action(self, cr, uid, action, model_obj, obj, context=None): + res = super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context) write = {} if hasattr(action, 'act_section_id') and action.act_section_id: - obj.section_id = action.act_section_id write['section_id'] = action.act_section_id.id - if hasattr(obj, 'email_cc') and action.act_email_cc: - if '@' in (obj.email_cc or ''): - emails = obj.email_cc.split(",") - if obj.act_email_cc not in emails:# and '<'+str(action.act_email_cc)+">" not in emails: - write['email_cc'] = obj.email_cc + ',' + obj.act_email_cc - else: - write['email_cc'] = obj.act_email_cc - - # Put state change by rule in communication history - if hasattr(obj, 'state') and hasattr(obj, 'message_post') and action.act_state: - model_obj.message_post(cr, uid, [obj], _(action.act_state), context=context) + if hasattr(action, 'act_categ_id') and action.act_categ_id: + write['categ_ids'] = [4, action.act_categ_id] model_obj.write(cr, uid, [obj.id], write, context) - super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context) - emails = [] - - if hasattr(obj, 'email_from') and action.act_mail_to_partner: - emails.append(obj.email_from) - emails = filter(None, emails) - if len(emails) and action.act_mail_body: - emails = list(set(emails)) - self.email_send(cr, uid, obj, emails, action.act_mail_body) - return True - + return res def state_get(self, cr, uid, context=None): """Gets available states for crm""" diff --git a/addons/crm/crm_action_rule_view.xml b/addons/crm/crm_action_rule_view.xml index f2a5f57702d..b7ac5037c31 100644 --- a/addons/crm/crm_action_rule_view.xml +++ b/addons/crm/crm_action_rule_view.xml @@ -7,53 +7,21 @@ base.action.rule - - - + + + + + + - - - - - - base.action.rule.form2.inherit - base.action.rule - - - - - - - - - - - - - - base.action.rule.form3.inherit - base.action.rule - - - + + - + - - - base.action.rule.form4.inherit - base.action.rule - - - - - - - - From 5738c0cca8a3247de8e4b064c372d7c8ee06a941 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Thu, 4 Oct 2012 18:13:52 +0530 Subject: [PATCH 04/15] [FIX] base_action_rule: fix bzr revid: hmo@tinyerp.com-20121004124352-r0nz9mihc5cmbh34 --- addons/base_action_rule/base_action_rule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index cb2239f76a7..2328bf94cfd 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -111,7 +111,7 @@ trigger date, like sending a reminder 15 minutes before a meeting."), # Searching for action rules cr.execute("SELECT model.model, rule.id FROM base_action_rule rule \ LEFT JOIN ir_model model on (model.id = rule.model_id) \ - WHERE active and model = %%s", model) + WHERE active and model = %s", (model,)) res = cr.fetchall() # Check if any rule matching with current object for obj_name, rule_id in res: From ca052f42357a87de6e4756377e646049d57a29e4 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Fri, 5 Oct 2012 12:42:29 +0530 Subject: [PATCH 05/15] [IMP] base_action_rule: now able to run multiple server actions in rule bzr revid: hmo@tinyerp.com-20121005071229-6jmrghoz1nkcnnwh --- addons/base_action_rule/base_action_rule.py | 11 ++++++----- addons/base_action_rule/base_action_rule_view.xml | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 2328bf94cfd..dc56b85439c 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -93,7 +93,7 @@ trigger date, like sending a reminder 15 minutes before a meeting."), 'regex_name': fields.char('Regex on Resource Name', size=128, help="Regular expression for matching name of the resource\ \ne.g.: 'urgent.*' will search for records having name starting with the string 'urgent'\ \nNote: This is case sensitive search."), - 'server_action_id': fields.many2one('ir.actions.server', 'Server Action', help="Describes the action name.\neg:on which object which action to be taken on basis of which condition"), + 'server_action_ids': fields.many2many('ir.actions.server', 'Server Action', help="Define Server actions.\neg:Email Reminders, Call Object Service, etc.."), 'filter_id':fields.many2one('ir.filters', 'Filter', required=False), #TODO: set domain [('model_id','=',model)] 'last_run': fields.datetime('Last Run', readonly=1), } @@ -276,10 +276,11 @@ trigger date, like sending a reminder 15 minutes before a meeting."), """ Do Action """ if context is None: context = {} - - if action.server_action_id: - context.update({'active_id':obj.id, 'active_ids':[obj.id]}) - self.pool.get('ir.actions.server').run(cr, uid, [action.server_action_id.id], context) + ctx = dict(context) + action_server_obj = self.pool.get('ir.actions.server') + if action.server_action_ids: + ctx.update({'active_id':obj.id, 'active_ids':[obj.id]}) + action_server_obj.run(cr, uid, [x.id for x in action.server_action_ids], context=ctx) write = {} if hasattr(obj, 'user_id') and action.act_user_id: diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml index b35818ee8d9..bd5b868e3f9 100644 --- a/addons/base_action_rule/base_action_rule_view.xml +++ b/addons/base_action_rule/base_action_rule_view.xml @@ -52,7 +52,7 @@ - + From ac4a1375765760d800b32ace2e0d51eee87c67b8 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Fri, 5 Oct 2012 12:50:01 +0530 Subject: [PATCH 06/15] [FIX] base_action_rule: do not subscribe again if already follow document bzr revid: hmo@tinyerp.com-20121005072001-6qy5yusrpw4n5xno --- addons/base_action_rule/base_action_rule.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index dc56b85439c..13617cd42d9 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -295,7 +295,10 @@ trigger date, like sending a reminder 15 minutes before a meeting."), model_obj.message_post(cr, uid, [obj], _(action.act_state), context=context) if hasattr(obj, 'message_subscribe') and action.act_followers: - model_obj.message_subscribe(cr, uid, [obj.id], [x.id for x in action.act_followers], context=context) + exits_followers = [x.id for x in obj.message_follower_ids] + new_followers = [x.id for x in action.act_followers if x.id not in exits_followers] + if new_followers: + model_obj.message_subscribe(cr, uid, [obj.id], new_followers, context=context) return True def _action(self, cr, uid, ids, objects, scrit=None, context=None): From 82ab8bf9a3294a95debfc8f6f2fca2d4ded6decb Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Fri, 5 Oct 2012 13:33:25 +0530 Subject: [PATCH 07/15] [IMP] base_action_rule: improve view and server action should be one2many instead of many2many bzr revid: hmo@tinyerp.com-20121005080325-3vcja1mog3yfthtr --- addons/base_action_rule/base_action_rule.py | 8 ++++++- .../base_action_rule_view.xml | 21 ++++++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 13617cd42d9..ebc4c02a938 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -93,7 +93,7 @@ trigger date, like sending a reminder 15 minutes before a meeting."), 'regex_name': fields.char('Regex on Resource Name', size=128, help="Regular expression for matching name of the resource\ \ne.g.: 'urgent.*' will search for records having name starting with the string 'urgent'\ \nNote: This is case sensitive search."), - 'server_action_ids': fields.many2many('ir.actions.server', 'Server Action', help="Define Server actions.\neg:Email Reminders, Call Object Service, etc.."), + 'server_action_ids': fields.one2many('ir.actions.server', 'action_rule_id', 'Server Action', help="Define Server actions.\neg:Email Reminders, Call Object Service, etc.."), 'filter_id':fields.many2one('ir.filters', 'Filter', required=False), #TODO: set domain [('model_id','=',model)] 'last_run': fields.datetime('Last Run', readonly=1), } @@ -321,6 +321,12 @@ trigger date, like sending a reminder 15 minutes before a meeting."), base_action_rule() +class actions_server(osv.osv): + _inherit = 'ir.actions.server' + _columns = { + 'action_rule_id': fields.many2one("base.action.rule", string="Action Rule") + } +actions_server() class ir_cron(osv.osv): _inherit = 'ir.cron' diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml index bd5b868e3f9..7c1b6c43b0e 100644 --- a/addons/base_action_rule/base_action_rule_view.xml +++ b/addons/base_action_rule/base_action_rule_view.xml @@ -15,7 +15,7 @@ - + @@ -47,16 +47,23 @@ - + + + + - - - - - + + + + + + + + + From 4dc1a8b348999ab94eabd4c46ddef27ae12717ee Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Fri, 5 Oct 2012 13:38:41 +0530 Subject: [PATCH 08/15] [FIX] crm: typo bzr revid: hmo@tinyerp.com-20121005080841-bti2swdj7kosxse7 --- addons/crm/crm_action_rule_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm/crm_action_rule_view.xml b/addons/crm/crm_action_rule_view.xml index b7ac5037c31..e21b74de382 100644 --- a/addons/crm/crm_action_rule_view.xml +++ b/addons/crm/crm_action_rule_view.xml @@ -8,11 +8,11 @@ - + - + From 54c66ff0ff9e4ab3aca0a58a31e9a3cd47039640 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Fri, 5 Oct 2012 14:04:24 +0530 Subject: [PATCH 09/15] [IMP] base_action_rule: improve view bzr revid: hmo@tinyerp.com-20121005083424-pback5jfsvjb0dlo --- addons/base_action_rule/base_action_rule_view.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml index 7c1b6c43b0e..2bffbf5b92c 100644 --- a/addons/base_action_rule/base_action_rule_view.xml +++ b/addons/base_action_rule/base_action_rule_view.xml @@ -36,10 +36,8 @@ - - - - + + From e84b3f24932fee41e00ba3605cab3b043351d2f4 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Tue, 9 Oct 2012 13:23:40 +0530 Subject: [PATCH 10/15] [IMP] crm: demo data of action rule bzr revid: hmo@tinyerp.com-20121009075340-ogm51x9z2irmzijt --- addons/base_action_rule/base_action_rule.py | 14 ++-- .../base_action_rule_view.xml | 3 +- addons/crm/__openerp__.py | 1 + addons/crm/crm_action_rule_demo.xml | 73 +++++++++++++++++++ 4 files changed, 85 insertions(+), 6 deletions(-) create mode 100644 addons/crm/crm_action_rule_demo.xml diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index ebc4c02a938..8b56bb9c909 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -63,6 +63,7 @@ class base_action_rule(osv.osv): _columns = { 'name': fields.char('Rule Name', size=64, required=True), 'model_id': fields.many2one('ir.model', 'Related Document Model', required=True, domain=[('osv_memory','=', False)]), + 'model': fields.related('model_id', 'model', type="char", size=256, string='Model'), 'create_date': fields.datetime('Create Date', readonly=1), 'active': fields.boolean('Active', help="If the active field is set to False,\ it will allow you to hide the rule without removing it."), @@ -71,6 +72,7 @@ when displaying a list of rules."), 'trg_date_type': fields.selection([ ('none', 'None'), ('create', 'Creation Date'), + ('write', 'Last Modified Date'), ('action_last', 'Last Action Date'), ('date', 'Date'), ('deadline', 'Deadline'), @@ -93,15 +95,15 @@ trigger date, like sending a reminder 15 minutes before a meeting."), 'regex_name': fields.char('Regex on Resource Name', size=128, help="Regular expression for matching name of the resource\ \ne.g.: 'urgent.*' will search for records having name starting with the string 'urgent'\ \nNote: This is case sensitive search."), - 'server_action_ids': fields.one2many('ir.actions.server', 'action_rule_id', 'Server Action', help="Define Server actions.\neg:Email Reminders, Call Object Service, etc.."), - 'filter_id':fields.many2one('ir.filters', 'Filter', required=False), #TODO: set domain [('model_id','=',model)] + 'server_action_ids': fields.one2many('ir.actions.server', 'action_rule_id', 'Server Action', help="Define Server actions.\neg:Email Reminders, Call Object Service, etc.."), #TODO: set domain [('model_id','=',model_id)] + 'filter_id':fields.many2one('ir.filters', 'Filter', required=False), #TODO: set domain [('model_id','=',model_id.model)] 'last_run': fields.datetime('Last Run', readonly=1), } _defaults = { - 'active': lambda *a: True, - 'trg_date_type': lambda *a: 'none', - 'trg_date_range_type': lambda *a: 'day', + 'active': True, + 'trg_date_type': 'none', + 'trg_date_range_type': 'day', } _order = 'sequence' @@ -200,6 +202,8 @@ trigger date, like sending a reminder 15 minutes before a meeting."), base = False if rule.trg_date_type=='create' and hasattr(obj, 'create_date'): base = obj.create_date + elif rule.trg_date_type=='write' and hasattr(obj, 'write_date'): + base = obj.write_date elif (rule.trg_date_type=='action_last' and hasattr(obj, 'create_date')): if hasattr(obj, 'date_action_last') and obj.date_action_last: diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml index 2bffbf5b92c..64b1dd4fe32 100644 --- a/addons/base_action_rule/base_action_rule_view.xml +++ b/addons/base_action_rule/base_action_rule_view.xml @@ -15,7 +15,8 @@ - + + diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index dd36aa19041..ddeded0926e 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -107,6 +107,7 @@ Dashboard for CRM will include: 'crm_demo.xml', 'crm_lead_demo.xml', 'crm_phonecall_demo.xml', + 'crm_action_rule_demo.xml', ], 'test': [ 'test/process/communication_with_customer.yml', diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml new file mode 100644 index 00000000000..e1cafbc76a6 --- /dev/null +++ b/addons/crm/crm_action_rule_demo.xml @@ -0,0 +1,73 @@ + + + + + + Reminder to User + + True + ir.actions.server + email + object.user_id.email + Reminder on Lead: [[object.name ]] of [[object.partner_id.name]] + Hello [[object.user_id.name]], +can you check following lead, it's inactive since 5 days ? + +Lead Id: [[object.id ]] +Customer: [[object.partner_id.name]] + + [[object.description]] + +Thanks, + + + + + Reminder to Customer + + True + ir.actions.server + email + object.email_from + Reminder on Lead: [[object.name ]] + Hello [[object.partner_id.name]], +your following lead inactive since 5 days. + +Lead Id: [[object.id ]] +Customer: [[object.partner_id.name]] + + [[object.description]] + +Thanks, + + + + + + Set Auto Reminder on leads which are inactive since 5 days. + + 1 + write + 5 + day + + + + + Filter on leads which come from USA. + crm.lead + [('country_id','=','United States')] + + + + Set Auto Followers on leads which are come from USA. + + 2 + urgent.* + + + + + + + From 76d93f251e679c14ab8d8d9a2a1b1a90f1961c06 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Tue, 9 Oct 2012 16:13:14 +0530 Subject: [PATCH 11/15] [IMP] base_action_rule: clean _check function and demo data. bzr revid: hmo@tinyerp.com-20121009104314-ers6tznkwiyeb3v1 --- addons/base_action_rule/base_action_rule.py | 52 ++++++++++----------- addons/crm/crm_action_rule.py | 5 +- addons/crm/crm_action_rule_demo.xml | 13 ++++-- 3 files changed, 37 insertions(+), 33 deletions(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 8b56bb9c909..d749415f0d0 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -184,20 +184,24 @@ trigger date, like sending a reminder 15 minutes before a meeting."), """ This Function is call by scheduler. """ - rule_pool = self.pool.get('base.action.rule') - rule_ids = rule_pool.search(cr, uid, [], context=context) + rule_ids = self.search(cr, uid, [], context=context) self._register_hook(cr, uid, rule_ids, context=context) - - rules = self.browse(cr, uid, rule_ids, context=context) - for rule in rules: + if context is None: + context = {} + for rule in self.browse(cr, uid, rule_ids, context=context): model = rule.model_id.model model_pool = self.pool.get(model) last_run = False if rule.last_run: last_run = get_datetime(rule.last_run) now = datetime.now() - for obj_id in model_pool.search(cr, uid, [], context=context): - obj = model_pool.browse(cr, uid, obj_id, context=context) + ctx = dict(context) + if rule.filter_id and rule.model_id.model == rule.filter_id.model_id: + ctx.update(eval(rule.filter_id.context)) + obj_ids = model_pool.search(cr, uid, eval(rule.filter_id.domain), context=ctx) + else: + obj_ids = model_pool.search(cr, uid, [], context=ctx) + for obj in model_pool.browse(cr, uid, obj_ids, context=ctx): # Calculate when this action should next occur for this object base = False if rule.trg_date_type=='create' and hasattr(obj, 'create_date'): @@ -229,23 +233,21 @@ trigger date, like sending a reminder 15 minutes before a meeting."), delay = fnct[rule.trg_date_range_type](rule.trg_date_range) action_date = base + delay if (not last_run or (last_run <= action_date < now)): - self._action(cr, uid, [rule.id], [obj], context=context) - rule_pool.write(cr, uid, [rule.id], {'last_run': now}, - context=context) + try: + self._action(cr, uid, rule, obj, context=ctx) + self.write(cr, uid, [rule.id], {'last_run': now}, context=context) + except Exception, e: + import traceback + print traceback.format_exc() + + def do_check(self, cr, uid, action, obj, context=None): """ check Action """ if context is None: context = {} ok = True - if action.filter_id: - if action.model_id.model == action.filter_id.model_id: - context.update(eval(action.filter_id.context)) - obj_ids = obj._table.search(cr, uid, eval(action.filter_id.domain), context=context) - if not obj.id in obj_ids: - ok = False - else: - ok = False + if getattr(obj, 'user_id', False): ok = ok and (not action.trg_user_id.id or action.trg_user_id.id==obj.user_id.id) if getattr(obj, 'partner_id', False): @@ -276,14 +278,15 @@ trigger date, like sending a reminder 15 minutes before a meeting."), ok = ok and regex_n return ok - def do_action(self, cr, uid, action, model_obj, obj, context=None): + def do_action(self, cr, uid, action, obj, context=None): """ Do Action """ if context is None: context = {} ctx = dict(context) + model_obj = self.pool.get(action.model_id.model) action_server_obj = self.pool.get('ir.actions.server') if action.server_action_ids: - ctx.update({'active_id':obj.id, 'active_ids':[obj.id]}) + ctx.update({'active_model': action.model_id.model, 'active_id':obj.id, 'active_ids':[obj.id]}) action_server_obj.run(cr, uid, [x.id for x in action.server_action_ids], context=ctx) write = {} @@ -305,7 +308,7 @@ trigger date, like sending a reminder 15 minutes before a meeting."), model_obj.message_subscribe(cr, uid, [obj.id], new_followers, context=context) return True - def _action(self, cr, uid, ids, objects, scrit=None, context=None): + def _action(self, cr, uid, action, obj, scrit=None, context=None): """ Do Action """ if context is None: context = {} @@ -314,11 +317,8 @@ trigger date, like sending a reminder 15 minutes before a meeting."), if not scrit: scrit = [] - for action in self.browse(cr, uid, ids, context=context): - for obj in objects: - if self.do_check(cr, uid, action, obj, context=context): - model_obj = self.pool.get(action.model_id.model) - self.do_action(cr, uid, action, model_obj, obj, context=context) + if self.do_check(cr, uid, action, obj, context=context): + self.do_action(cr, uid, action, obj, context=context) context.update({'action': False}) return True diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py index 49af2f74eeb..c923d37aa28 100644 --- a/addons/crm/crm_action_rule.py +++ b/addons/crm/crm_action_rule.py @@ -71,8 +71,9 @@ class base_action_rule(osv.osv): ok = ok and res_count return ok - def do_action(self, cr, uid, action, model_obj, obj, context=None): - res = super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context) + def do_action(self, cr, uid, action, obj, context=None): + res = super(base_action_rule, self).do_action(cr, uid, action, obj, context=context) + model_obj = self.pool.get(action.model_id.model) write = {} if hasattr(action, 'act_section_id') and action.act_section_id: write['section_id'] = action.act_section_id.id diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml index e1cafbc76a6..4adefee407d 100644 --- a/addons/crm/crm_action_rule_demo.xml +++ b/addons/crm/crm_action_rule_demo.xml @@ -9,11 +9,11 @@ ir.actions.server email object.user_id.email - Reminder on Lead: [[object.name ]] of [[object.partner_id.name]] + Reminder on Lead: [[object.id ]] of [[object.partner_id.name]] Hello [[object.user_id.name]], can you check following lead, it's inactive since 5 days ? -Lead Id: [[object.id ]] +Lead: [[object.id ]] Customer: [[object.partner_id.name]] [[object.description]] @@ -29,11 +29,11 @@ Thanks, ir.actions.server email object.email_from - Reminder on Lead: [[object.name ]] + Reminder on Lead: [[object.id ]] Hello [[object.partner_id.name]], your following lead inactive since 5 days. -Lead Id: [[object.id ]] +Lead: [[object.id ]] Customer: [[object.partner_id.name]] [[object.description]] @@ -60,7 +60,7 @@ Thanks, - Set Auto Followers on leads which are come from USA. + Set Auto Followers on leads which are urgent and come from USA. 2 urgent.* @@ -68,6 +68,9 @@ Thanks, + create + 0 + minutes From 257b3974b55059e693b83eafb62f4e5ad8454669 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Tue, 9 Oct 2012 16:42:21 +0530 Subject: [PATCH 12/15] [FIX] base_action_rule: argument in _action bzr revid: hmo@tinyerp.com-20121009111221-dris93pcszjj11es --- addons/base_action_rule/base_action_rule.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index d749415f0d0..9440716815c 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -234,7 +234,7 @@ trigger date, like sending a reminder 15 minutes before a meeting."), action_date = base + delay if (not last_run or (last_run <= action_date < now)): try: - self._action(cr, uid, rule, obj, context=ctx) + self._action(cr, uid, [rule.id], obj, context=ctx) self.write(cr, uid, [rule.id], {'last_run': now}, context=context) except Exception, e: import traceback @@ -308,7 +308,7 @@ trigger date, like sending a reminder 15 minutes before a meeting."), model_obj.message_subscribe(cr, uid, [obj.id], new_followers, context=context) return True - def _action(self, cr, uid, action, obj, scrit=None, context=None): + def _action(self, cr, uid, ids, objects, scrit=None, context=None): """ Do Action """ if context is None: context = {} @@ -316,9 +316,12 @@ trigger date, like sending a reminder 15 minutes before a meeting."), context.update({'action': True}) if not scrit: scrit = [] - - if self.do_check(cr, uid, action, obj, context=context): - self.do_action(cr, uid, action, obj, context=context) + if not isinstance(objects, list): + objects = [objects] + for action in self.browse(cr, uid, ids, context=context): + for obj in objects: + if self.do_check(cr, uid, action, obj, context=context): + self.do_action(cr, uid, action, obj, context=context) context.update({'action': False}) return True From 1b319e527d7fdf7d617a438c3ff92441c1ef93ad Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Tue, 9 Oct 2012 17:47:12 +0530 Subject: [PATCH 13/15] [IMP] base_action_rule: improve demo data bzr revid: hmo@tinyerp.com-20121009121712-r6to5oia4ikiutpi --- addons/base_action_rule/base_action_rule.py | 6 ++++- addons/crm/crm_action_rule_demo.xml | 25 +++++++++++++-------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 9440716815c..683a247c8d1 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -247,7 +247,11 @@ trigger date, like sending a reminder 15 minutes before a meeting."), if context is None: context = {} ok = True - + if action.filter_id and action.model_id.model == action.filter_id.model_id: + ctx = dict(context) + ctx.update(eval(action.filter_id.context)) + obj_ids = self.pool.get(action.model_id.model).search(cr, uid, eval(action.filter_id.domain), context=ctx) + ok = ok and obj.id in obj_ids if getattr(obj, 'user_id', False): ok = ok and (not action.trg_user_id.id or action.trg_user_id.id==obj.user_id.id) if getattr(obj, 'partner_id', False): diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml index 4adefee407d..85cb8de1ac9 100644 --- a/addons/crm/crm_action_rule_demo.xml +++ b/addons/crm/crm_action_rule_demo.xml @@ -9,17 +9,17 @@ ir.actions.server email object.user_id.email - Reminder on Lead: [[object.id ]] of [[object.partner_id.name]] + Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' +object.partner_id.name or '']] Hello [[object.user_id.name]], -can you check following lead, it's inactive since 5 days ? +can you check following lead, it's not open since 5 days ? Lead: [[object.id ]] -Customer: [[object.partner_id.name]] +Description: [[object.description]] Thanks, - + @@ -30,11 +30,11 @@ Thanks, email object.email_from Reminder on Lead: [[object.id ]] - Hello [[object.partner_id.name]], -your following lead inactive since 5 days. + Hello [[object.partner_id and object.partner_id.name or '']], +your following lead is not open since 5 days. Lead: [[object.id ]] -Customer: [[object.partner_id.name]] +Description: [[object.description]] @@ -42,12 +42,19 @@ Thanks, + + Filter on leads which are draft. + crm.lead + [('state','=','draft')] + + - Set Auto Reminder on leads which are inactive since 5 days. + Set Auto Reminder on leads which are not open since 5 days. 1 - write + + create 5 day From 5e4ddf78dacb9fa0349da31567b30b34f906a7c4 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Tue, 9 Oct 2012 17:57:39 +0530 Subject: [PATCH 14/15] [IMP] base_action_rule: action rule view should in sheet bzr revid: hmo@tinyerp.com-20121009122739-89dolzmm73o1nar5 --- .../base_action_rule_view.xml | 100 +++++++++--------- 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml index 64b1dd4fe32..fe8ff9b181f 100644 --- a/addons/base_action_rule/base_action_rule_view.xml +++ b/addons/base_action_rule/base_action_rule_view.xml @@ -12,59 +12,61 @@ base.action.rule
- - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - + + + + - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + +
From 4034afc923547d01a2c3d4c85c20fe9acaf0ecbe Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Wed, 10 Oct 2012 12:52:44 +0530 Subject: [PATCH 15/15] [FIX] crm: fix bzr revid: hmo@tinyerp.com-20121010072244-5wsnaqwpydx59dmg --- addons/crm/crm_action_rule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py index c923d37aa28..910a1fca169 100644 --- a/addons/crm/crm_action_rule.py +++ b/addons/crm/crm_action_rule.py @@ -79,7 +79,7 @@ class base_action_rule(osv.osv): write['section_id'] = action.act_section_id.id if hasattr(action, 'act_categ_id') and action.act_categ_id: - write['categ_ids'] = [4, action.act_categ_id] + write['categ_ids'] = [4, action.act_categ_id.id] model_obj.write(cr, uid, [obj.id], write, context) return res