From 44284e33ff674738f9c01f43a330578e4648eca0 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Fri, 23 Apr 2010 17:44:35 +0530 Subject: [PATCH 01/19] [IMP]: crm: Improvement in demo of meeting: Changed wrong date deadlines according to duration bzr revid: rpa@tinyerp.com-20100423121435-1bqs3bn38bwqr9j0 --- addons/crm/crm_meeting_demo.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/crm/crm_meeting_demo.xml b/addons/crm/crm_meeting_demo.xml index a43f3e0d571..87d49d2f635 100644 --- a/addons/crm/crm_meeting_demo.xml +++ b/addons/crm/crm_meeting_demo.xml @@ -17,7 +17,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -48,9 +48,9 @@ - + - + @@ -62,9 +62,9 @@ - + - + @@ -76,7 +76,7 @@ - + @@ -91,7 +91,7 @@ - + From be5e13ab5ac582448491aa1b3f5a255017be938a Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Fri, 23 Apr 2010 18:10:21 +0530 Subject: [PATCH 02/19] [IMP]: base_calendar: [573]: Improvment for changing duration when dates changed from sunbird bzr revid: rpa@tinyerp.com-20100423124021-0z23njkojxxrd1xk --- addons/base_calendar/base_calendar.py | 48 ++++++++++++++++++++- addons/base_calendar/base_calendar_view.xml | 2 +- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index f4f1e68a269..372218b8088 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -29,6 +29,7 @@ import pytz import re import time import tools +from caldav import caldav months = { 1: "January", 2: "February", 3: "March", 4: "April", \ @@ -1213,7 +1214,52 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ if isinstance(select, (str, int, long)): return ids and ids[0] or False return ids - + + def check_import(self, cr, uid, vals, context={}): + """ + @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 vals: Get Values + @param context: A standard dictionary for contextual values + """ + ids = [] + model_obj = self.pool.get(context.get('model')) + recur_pool = {} + try: + for val in vals: + exists, r_id = caldav.uid2openobjectid(cr, val['id'], context.get('model'), \ + val.get('recurrent_id')) + if val.has_key('create_date'): val.pop('create_date') + u_id = val.get('id', None) + val.pop('id') + if exists and r_id: + val.update({'recurrent_uid': exists}) + model_obj.write(cr, uid, [r_id], val) + ids.append(r_id) + elif exists: + # Compute value of duration + if 'date_deadline' in val and 'duration' not in val: + start = datetime.strptime(val['date'], '%Y-%m-%d %H:%M:%S') + end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S') + diff = end - start + val['duration'] = (diff.seconds/float(86400) + diff.days) * 24 + model_obj.write(cr, uid, [exists], val) + ids.append(exists) + else: + if u_id in recur_pool and val.get('recurrent_id'): + val.update({'recurrent_uid': recur_pool[u_id]}) + revent_id = model_obj.create(cr, uid, val) + ids.append(revent_id) + else: + event_id = model_obj.create(cr, uid, val) + recur_pool[u_id] = event_id + ids.append(event_id) + except Exception, e: + raise osv.except_osv(('Error !'), (str(e))) + return ids + + def compute_rule_string(self, cr, uid, datas, context=None, *args): """ Compute rule string. diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index 2a48c0be32f..d9acae67a9e 100755 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -190,7 +190,7 @@ + on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/> From a056b92602dbe59daee8e439c8dfb645581f0316 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Fri, 23 Apr 2010 19:15:33 +0530 Subject: [PATCH 03/19] [FIX]: document_ftp: Fixed problem of importing ics file bzr revid: rpa@tinyerp.com-20100423134533-t8c53tctk7zy6191 --- addons/document_ftp/ftpserver/abstracted_fs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py index 0ffa8eb80f2..1957b2db84c 100644 --- a/addons/document_ftp/ftpserver/abstracted_fs.py +++ b/addons/document_ftp/ftpserver/abstracted_fs.py @@ -97,7 +97,7 @@ class content_wrapper(StringIO.StringIO): cr = db.cursor() cr.commit() try: - getattr(self.pool.get('document.directory.content'), 'process_write_'+self.node.content.extension[1:])(cr, self.uid, self.node, self.getvalue()) + getattr(self.pool.get('document.directory.content'), 'process_write')(cr, self.uid, self.node, self.getvalue()) finally: cr.commit() cr.close() From c2fbbe586585cb2b0a7392182621e341844a40b3 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Mon, 26 Apr 2010 19:05:10 +0530 Subject: [PATCH 04/19] [IMP]: smtpclient: typo bzr revid: rpa@tinyerp.com-20100426133510-thuye8gps8wjgwix --- addons/smtpclient/smtpclient.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/smtpclient/smtpclient.py b/addons/smtpclient/smtpclient.py index eff5e240dff..643af432d4f 100644 --- a/addons/smtpclient/smtpclient.py +++ b/addons/smtpclient/smtpclient.py @@ -531,8 +531,8 @@ class smtpclient(osv.osv): sids = queue.search(cr, uid, [('state','not in',['send','sending']), ('server_id','in',ids)], order="priority", limit=30) message = "" - if len(ids) > 0: - message = "sending %s emails from message queuq !" % (len(ids)) + if len(sids) > 0: + message = "sending %s emails from message queue !" % (len(sids)) logger.notifyChannel('smtp', netsvc.LOG_INFO, message) result = self. _send_emails(cr, uid, sids, {}) From 78c9835966fceddd3a9ef42924131d79195d575d Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Mon, 26 Apr 2010 19:11:52 +0530 Subject: [PATCH 05/19] [FIX]: crm: Fixed problem of sending a new mail bzr revid: rpa@tinyerp.com-20100426134152-e961yh0s7vuxkfox --- addons/crm/wizard/crm_send_email.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py index 7054c77cb90..02a432331b5 100644 --- a/addons/crm/wizard/crm_send_email.py +++ b/addons/crm/wizard/crm_send_email.py @@ -76,7 +76,7 @@ class crm_send_new_email(osv.osv_memory): case = case_pool.browse(cr, uid, res_id) if context.get('mail', 'new') == 'new': - message_id = case.history_line[0].message_id + message_id = res_id else: hist = hist_obj.browse(cr, uid, res_id) message_id = hist.message_id From 6b404a6b4c8244e63b9faa7a569a7fcd251d5537 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Mon, 26 Apr 2010 19:13:57 +0530 Subject: [PATCH 06/19] [IMP]: crm(Meeting): Improvement for all day meeting bzr revid: rpa@tinyerp.com-20100426134357-qc1lrza962m0il7z --- addons/crm/crm_meeting_view.xml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index 35415a9d028..4c4856f46b0 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -25,12 +25,15 @@
- - + + + + + From 031d2f14929c907ad159058054dbfc206c7ec60d Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Mon, 26 Apr 2010 19:15:17 +0530 Subject: [PATCH 07/19] [IMP]: base_action_rule: Removed rule lines object and made changes accroding to it bzr revid: rpa@tinyerp.com-20100426134517-jtqsvu18vh7j3hql --- addons/base_action_rule/base_action_rule.py | 306 ++++++++---------- .../base_action_rule_view.xml | 81 ++--- .../security/ir.model.access.csv | 1 - addons/crm/crm_action_rule.py | 37 +-- addons/crm/crm_action_rule_view.xml | 18 +- 5 files changed, 188 insertions(+), 255 deletions(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index df2d43d3a53..6eb45172dbc 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -33,18 +33,115 @@ class base_action_rule(osv.osv): _name = 'base.action.rule' _description = 'Action Rules' + + def _state_get(self, cr, uid, context={}): + """ 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 """ + + return self.state_get(cr, uid, context=context) + + + def _priority_get(self, cr, uid, context={}): + """ 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 """ + + return self.priority_get(cr, uid, context=context) + + def state_get(self, cr, uid, context={}): + """ 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 """ + + return [('','')] + + def priority_get(self, cr, uid, context={}): + """ 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 """ + + return [('','')] _columns = { 'name': fields.many2one('ir.model', 'Model', required=True), 'max_level': fields.integer('Max Level', help='Specifies maximum level.'), - 'rule_lines': fields.one2many('base.action.rule.line','rule_id','Rule Lines'), 'create_date': fields.datetime('Create Date', readonly=1), - 'active': fields.boolean('Active') + 'active': fields.boolean('Active', help="If the active field is set to true,\ + it will allow you to hide the rule without removing it."), + 'sequence': fields.integer('Sequence', help="Gives the sequence order when\ + displaying a list of rules."), + + 'trg_date_type': fields.selection([ + ('none','None'), + ('create','Creation Date'), + ('action_last','Last Action Date'), + ('date','Date'), + ('deadline', 'Deadline'), + ], 'Trigger Date', size=16), + 'trg_date_range': fields.integer('Delay after trigger date',help="Delay After Trigger Date,\ + specifies you can put a negative number " \ + "if you need a delay before the trigger date, like sending a reminder 15 minutes before a meeting."), + 'trg_date_range_type': fields.selection([('minutes', 'Minutes'),('hour','Hours'),\ + ('day','Days'),('month','Months')], 'Delay type'), + + + 'trg_user_id': fields.many2one('res.users', 'Responsible'), + + 'trg_partner_id': fields.many2one('res.partner', 'Partner'), + 'trg_partner_categ_id': fields.many2one('res.partner.category', 'Partner Category'), + 'trg_state_from': fields.selection(_state_get, 'State', size=16), + 'trg_state_to': fields.selection(_state_get, 'Button Pressed', size=16), + 'trg_priority_from': fields.selection(_priority_get, 'Minimum Priority'), + 'trg_priority_to': fields.selection(_priority_get, 'Maximum Priority'), + + '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_priority': fields.selection(_priority_get, 'Set priority to'), + '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',help="Content of mail"), + 'regex_name': fields.char('Regular Expression on Model Name', size=128), + 'server_action_id': fields.many2one('ir.actions.server','Server Action',help="Describes the\ + action name." \ + "eg:on which object which action to be taken on basis of which condition"), } _defaults = { 'active': lambda *a: True, 'max_level': lambda *a: 15, + '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, } def format_body(self, body): @@ -201,175 +298,56 @@ class base_action_rule(osv.osv): if not scrit: scrit = [] - rule_line_obj = self.pool.get('base.action.rule.line') - for rule in self.browse(cr, uid, ids): - level = rule.max_level + for action in self.browse(cr, uid, ids): + level = action.max_level if not level: break - newactions = [] - scrit += [('rule_id','=',rule.id)] - line_ids = rule_line_obj.search(cr, uid, scrit) - actions = rule_line_obj.browse(cr, uid, line_ids, context=context) - model_obj = self.pool.get(rule.name.model) + model_obj = self.pool.get(action.name.model) for obj in objects: - for action in actions: - ok = self.do_check(cr, uid, action, obj, context=context) - if not ok: - continue + ok = self.do_check(cr, uid, action, obj, context=context) + if not ok: + continue - base = False - if hasattr(obj, 'create_date') and action.trg_date_type=='create': - base = mx.DateTime.strptime(obj.create_date[:19], '%Y-%m-%d %H:%M:%S') - elif hasattr(obj, 'create_date') and action.trg_date_type=='action_last': - if hasattr(obj, 'date_action_last') and obj.date_action_last: - base = mx.DateTime.strptime(obj.date_action_last, '%Y-%m-%d %H:%M:%S') - else: - base = mx.DateTime.strptime(obj.create_date[:19], '%Y-%m-%d %H:%M:%S') - elif hasattr(obj, 'date_deadline') and action.trg_date_type=='deadline' \ - and obj.date_deadline: - base = mx.DateTime.strptime(obj.date_deadline, '%Y-%m-%d %H:%M:%S') - elif hasattr(obj, 'date') and action.trg_date_type=='date' and obj.date: - base = mx.DateTime.strptime(obj.date, '%Y-%m-%d %H:%M:%S') - if base: - fnct = { - 'minutes': lambda interval: mx.DateTime.RelativeDateTime(minutes=interval), - 'day': lambda interval: mx.DateTime.RelativeDateTime(days=interval), - 'hour': lambda interval: mx.DateTime.RelativeDateTime(hours=interval), - 'month': lambda interval: mx.DateTime.RelativeDateTime(months=interval), - } - d = base + fnct[action.trg_date_range_type](action.trg_date_range) - dt = d.strftime('%Y-%m-%d %H:%M:%S') - ok = False - if hasattr(obj, 'date_action_last') and hasattr(obj, 'date_action_next'): - ok = (dt <= time.strftime('%Y-%m-%d %H:%M:%S')) and \ - ((not obj.date_action_next) or \ - (dt >= obj.date_action_next and \ - obj.date_action_last < obj.date_action_next)) - if not ok: - if not obj.date_action_next or dt < obj.date_action_next: - obj.date_action_next = dt - model_obj.write(cr, uid, [obj.id], {'date_action_next': dt}, context) + base = False + if hasattr(obj, 'create_date') and action.trg_date_type=='create': + base = mx.DateTime.strptime(obj.create_date[:19], '%Y-%m-%d %H:%M:%S') + elif hasattr(obj, 'create_date') and action.trg_date_type=='action_last': + if hasattr(obj, 'date_action_last') and obj.date_action_last: + base = mx.DateTime.strptime(obj.date_action_last, '%Y-%m-%d %H:%M:%S') else: - ok = action.trg_date_type=='none' + base = mx.DateTime.strptime(obj.create_date[:19], '%Y-%m-%d %H:%M:%S') + elif hasattr(obj, 'date_deadline') and action.trg_date_type=='deadline' \ + and obj.date_deadline: + base = mx.DateTime.strptime(obj.date_deadline, '%Y-%m-%d %H:%M:%S') + elif hasattr(obj, 'date') and action.trg_date_type=='date' and obj.date: + base = mx.DateTime.strptime(obj.date, '%Y-%m-%d %H:%M:%S') + if base: + fnct = { + 'minutes': lambda interval: mx.DateTime.RelativeDateTime(minutes=interval), + 'day': lambda interval: mx.DateTime.RelativeDateTime(days=interval), + 'hour': lambda interval: mx.DateTime.RelativeDateTime(hours=interval), + 'month': lambda interval: mx.DateTime.RelativeDateTime(months=interval), + } + d = base + fnct[action.trg_date_range_type](action.trg_date_range) + dt = d.strftime('%Y-%m-%d %H:%M:%S') + ok = False + if hasattr(obj, 'date_action_last') and hasattr(obj, 'date_action_next'): + ok = (dt <= time.strftime('%Y-%m-%d %H:%M:%S')) and \ + ((not obj.date_action_next) or \ + (dt >= obj.date_action_next and \ + obj.date_action_last < obj.date_action_next)) + if not ok: + if not obj.date_action_next or dt < obj.date_action_next: + obj.date_action_next = dt + model_obj.write(cr, uid, [obj.id], {'date_action_next': dt}, context) + else: + ok = action.trg_date_type=='none' - if ok: - self.do_action(cr, uid, action, model_obj, obj, context) - break + if ok: + self.do_action(cr, uid, action, model_obj, obj, context) + break level -= 1 return True -base_action_rule() - -class base_action_rule_line(osv.osv): - _name = 'base.action.rule.line' - _description = 'Action Rule Lines' - - def _state_get(self, cr, uid, context={}): - """ 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 """ - - return self.state_get(cr, uid, context=context) - def _priority_get(self, cr, uid, context={}): - """ 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 """ - - return self.priority_get(cr, uid, context=context) - - def state_get(self, cr, uid, context={}): - """ 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 """ - - return [('','')] - def priority_get(self, cr, uid, context={}): - """ 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 """ - - return [('','')] - - _columns = { - 'name': fields.char('Rule Name',size=64, required=True), - 'rule_id': fields.many2one('base.action.rule','Rule'), - 'active': fields.boolean('Active', help="If the active field is set to true,\ - it will allow you to hide the rule without removing it."), - 'sequence': fields.integer('Sequence', help="Gives the sequence order when\ - displaying a list of rules."), - - 'trg_date_type': fields.selection([ - ('none','None'), - ('create','Creation Date'), - ('action_last','Last Action Date'), - ('date','Date'), - ('deadline', 'Deadline'), - ], 'Trigger Date', size=16), - 'trg_date_range': fields.integer('Delay after trigger date',help="Delay After Trigger Date,\ - specifies you can put a negative number " \ - "if you need a delay before the trigger date, like sending a reminder 15 minutes before a meeting."), - 'trg_date_range_type': fields.selection([('minutes', 'Minutes'),('hour','Hours'),\ - ('day','Days'),('month','Months')], 'Delay type'), - - - 'trg_user_id': fields.many2one('res.users', 'Responsible'), - - 'trg_partner_id': fields.many2one('res.partner', 'Partner'), - 'trg_partner_categ_id': fields.many2one('res.partner.category', 'Partner Category'), - 'trg_state_from': fields.selection(_state_get, 'State', size=16), - 'trg_state_to': fields.selection(_state_get, 'Button Pressed', size=16), - 'trg_priority_from': fields.selection(_priority_get, 'Minimum Priority'), - 'trg_priority_to': fields.selection(_priority_get, 'Maximum Priority'), - - '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_priority': fields.selection(_priority_get, 'Set priority to'), - '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',help="Content of mail"), - 'regex_name': fields.char('Regular Expression on Model Name', size=128), - 'server_action_id': fields.many2one('ir.actions.server','Server Action',help="Describes the\ - action name." \ - "eg:on which object which action to be taken on basis of which condition"), - } - - _defaults = { - 'active': lambda *a: 1, - '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 _check_mail(self, cr, uid, ids, context=None): """ Check Mail @@ -393,6 +371,6 @@ class base_action_rule_line(osv.osv): (_check_mail, 'Error: The mail is not well formated', ['act_mail_body']), ] -base_action_rule_line() +base_action_rule() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml index 09bbb2e2f5f..72cf3e5a9fb 100644 --- a/addons/base_action_rule/base_action_rule_view.xml +++ b/addons/base_action_rule/base_action_rule_view.xml @@ -17,51 +17,6 @@ - - - - - - - - - - base.action.rule.tree - base.action.rule - tree - - - - - - - - - - - - - Action Rules - base.action.rule - form - tree,form - - - - - - - - base.action.rule.line.form - base.action.rule.line - form - -
- - @@ -133,29 +88,35 @@ -
+ - + - - base.action.rule.line.tree - base.action.rule.line + + base.action.rule.tree + base.action.rule tree - - - + + + + + + + + + Action Rules + base.action.rule + form + tree,form + - + + diff --git a/addons/base_action_rule/security/ir.model.access.csv b/addons/base_action_rule/security/ir.model.access.csv index 982dfdebfb5..99e4fc07c4b 100644 --- a/addons/base_action_rule/security/ir.model.access.csv +++ b/addons/base_action_rule/security/ir.model.access.csv @@ -1,3 +1,2 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "access_base_action_rule","base.action.rule","model_base_action_rule",,1,1,1,1 -"access_base_action_rule_line","base.action.rule.line","model_base_action_rule_line",,1,1,1,1 diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py index 718b12bb9c3..dd2372a3bf8 100644 --- a/addons/crm/crm_action_rule.py +++ b/addons/crm/crm_action_rule.py @@ -152,6 +152,18 @@ class base_action_rule(osv.osv): """ Base Action Rule """ _inherit = 'base.action.rule' _description = 'Action Rules' + + _columns = { + 'trg_section_id': fields.many2one('crm.case.section', 'Sales Team'), + 'trg_max_history': fields.integer('Maximum Communication History'), + 'trg_categ_id': fields.many2one('crm.case.categ', 'Category'), + '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={}): body = self.format_mail(obj, body) @@ -207,7 +219,7 @@ class base_action_rule(osv.osv): 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: + 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 @@ -231,13 +243,6 @@ class base_action_rule(osv.osv): return True -base_action_rule() - -class base_action_rule_line(osv.osv): - """ Base Action Rule Line """ - _inherit = 'base.action.rule.line' - _description = 'Base Action Rule Line' - def state_get(self, cr, uid, context={}): """@param self: The object pointer @@ -245,7 +250,7 @@ class base_action_rule_line(osv.osv): @param uid: the current user’s ID for security checks, @param context: A standard dictionary for contextual values """ - res = super(base_action_rule_line, self).state_get(cr, uid, context=context) + res = super(base_action_rule, self).state_get(cr, uid, context=context) return res + [('escalate','Escalate')] + crm.AVAILABLE_STATES def priority_get(self, cr, uid, context={}): @@ -255,18 +260,8 @@ class base_action_rule_line(osv.osv): @param uid: the current user’s ID for security checks, @param context: A standard dictionary for contextual values """ - res = super(base_action_rule_line, self).priority_get(cr, uid, context=context) + res = super(base_action_rule, self).priority_get(cr, uid, context=context) return res + crm.AVAILABLE_PRIORITIES - _columns = { - 'trg_section_id': fields.many2one('crm.case.section', 'Sales Team'), - 'trg_max_history': fields.integer('Maximum Communication History'), - 'trg_categ_id': fields.many2one('crm.case.categ', 'Category'), - '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."), - } -base_action_rule_line() +base_action_rule() diff --git a/addons/crm/crm_action_rule_view.xml b/addons/crm/crm_action_rule_view.xml index 78767a2f795..6211714232c 100644 --- a/addons/crm/crm_action_rule_view.xml +++ b/addons/crm/crm_action_rule_view.xml @@ -3,9 +3,9 @@ - base.action.rule.line.form.inherit - base.action.rule.line - + base.action.rule.form.inherit + base.action.rule + form @@ -19,9 +19,9 @@ - base.action.rule.line.form2.inherit - base.action.rule.line - + base.action.rule.form2.inherit + base.action.rule + form @@ -35,9 +35,9 @@ - base.action.rule.line.form3.inherit - base.action.rule.line - + base.action.rule.form3.inherit + base.action.rule + form From c2b5890db237a5a288cb70a5846b0e34f899354d Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Tue, 27 Apr 2010 15:49:34 +0530 Subject: [PATCH 08/19] [IMP]: base_action_rule: * Removed fields that are not in the crm.case, * Added a domain to be applied on the object, for the conditions bzr revid: rpa@tinyerp.com-20100427101934-3envktbthc7w3n3o --- addons/base_action_rule/base_action_rule.py | 47 +++++-------------- .../base_action_rule_view.xml | 14 +++--- addons/crm/crm_action_rule.py | 23 ++++----- 3 files changed, 31 insertions(+), 53 deletions(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 6eb45172dbc..77446c633ee 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -44,15 +44,6 @@ class base_action_rule(osv.osv): return self.state_get(cr, uid, context=context) - def _priority_get(self, cr, uid, context={}): - """ 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 """ - - return self.priority_get(cr, uid, context=context) - def state_get(self, cr, uid, context={}): """ Get State @param self: The object pointer @@ -62,15 +53,6 @@ class base_action_rule(osv.osv): return [('','')] - def priority_get(self, cr, uid, context={}): - """ 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 """ - - return [('','')] - _columns = { 'name': fields.many2one('ir.model', 'Model', required=True), 'max_level': fields.integer('Max Level', help='Specifies maximum level.'), @@ -79,7 +61,6 @@ class base_action_rule(osv.osv): it will allow you to hide the rule without removing it."), 'sequence': fields.integer('Sequence', help="Gives the sequence order when\ displaying a list of rules."), - 'trg_date_type': fields.selection([ ('none','None'), ('create','Creation Date'), @@ -100,13 +81,10 @@ class base_action_rule(osv.osv): 'trg_partner_categ_id': fields.many2one('res.partner.category', 'Partner Category'), 'trg_state_from': fields.selection(_state_get, 'State', size=16), 'trg_state_to': fields.selection(_state_get, 'Button Pressed', size=16), - 'trg_priority_from': fields.selection(_priority_get, 'Minimum Priority'), - 'trg_priority_to': fields.selection(_priority_get, 'Maximum Priority'), '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_priority': fields.selection(_priority_get, 'Set priority to'), '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"), @@ -131,6 +109,7 @@ class base_action_rule(osv.osv): 'server_action_id': fields.many2one('ir.actions.server','Server Action',help="Describes the\ action name." \ "eg:on which object which action to be taken on basis of which condition"), + 'domain':fields.char('Domain', size=124, required=False, readonly=False), } _defaults = { @@ -142,8 +121,11 @@ class base_action_rule(osv.osv): 'act_remind_partner': lambda *a: 0, 'act_remind_user': lambda *a: 0, 'act_mail_to_watchers': lambda *a: 0, + 'domain': lambda *a: '[]' } - + + _order = 'sequence' + def format_body(self, body): """ Foramat Action rule's body @param self: The object pointer """ @@ -153,7 +135,6 @@ class base_action_rule(osv.osv): def format_mail(self, obj, body): """ Foramat Mail @param self: The object pointer """ - data = { 'object_id': obj.id, 'object_subject': hasattr(obj, 'name') and obj.name or False, @@ -202,6 +183,10 @@ class base_action_rule(osv.osv): @param context: A standard dictionary for contextual values """ ok = True + if eval(action.domain): + obj_ids = obj._table.search(cr, uid, eval(action.domain), context=context) + if not obj.id in obj_ids: + ok = False if hasattr(obj, 'user_id'): ok = ok and (not action.trg_user_id.id or action.trg_user_id.id==obj.user_id.id) if hasattr(obj, 'partner_id'): @@ -219,10 +204,6 @@ class base_action_rule(osv.osv): if state_to: ok = ok and (not action.trg_state_to or action.trg_state_to==state_to) - if hasattr(obj, 'priority'): - ok = ok and (not action.trg_priority_from or action.trg_priority_from>=obj.priority) - ok = ok and (not action.trg_priority_to or action.trg_priority_to<=obj.priority) - reg_name = action.regex_name result_name = True if reg_name: @@ -260,10 +241,6 @@ class base_action_rule(osv.osv): obj.categ_id = action.act_categ_id write['categ_id'] = action.act_categ_id.id - if hasattr(obj, 'priority') and action.act_priority: - obj.priority = action.act_priority - write['priority'] = action.act_priority - model_obj.write(cr, uid, [obj.id], write, context) if hasattr(model_obj, 'remind_user') and action.act_remind_user: @@ -295,10 +272,11 @@ class base_action_rule(osv.osv): @param ids: List of Basic Action Rule’s IDs, @param objects: pass objects @param context: A standard dictionary for contextual values """ - if not scrit: scrit = [] - for action in self.browse(cr, uid, ids): + cr.execute("select id from base_action_rule order by sequence") + rule_ids = map(lambda x: x[0], cr.fetchall()) + for action in self.browse(cr, uid, rule_ids): level = action.max_level if not level: break @@ -342,7 +320,6 @@ class base_action_rule(osv.osv): model_obj.write(cr, uid, [obj.id], {'date_action_next': dt}, context) else: ok = action.trg_date_type=='none' - if ok: self.do_action(cr, uid, action, model_obj, obj, context) break diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml index 72cf3e5a9fb..f7a476fd09e 100644 --- a/addons/base_action_rule/base_action_rule_view.xml +++ b/addons/base_action_rule/base_action_rule_view.xml @@ -16,7 +16,9 @@
+ + @@ -34,11 +36,6 @@ - - - - - @@ -55,7 +52,6 @@ - @@ -72,7 +68,9 @@ - + +