Merge lp:~openerp-dev/openobject-server/7.0-opw-603382-ado into lp:openobject-server/7.0

[Amit Dodiya (OpenERP)]

Hello,

[FIX] ir_ui_menu: while adding domain value using 'time.strftime("%Y-%m-%d")' in domain of window action it gives trace-back, NameError: name 'time' is not defined

Steps to reproduce:
1). Goto: Setting-> Technical-> Action-> Window Action
2). Now search for 'Quotation' you will find some result, now open the action which has tree view ref. added
3). add one condition on existing domain like 'date_order','=',time.strftime("%Y-%m-%d"), save it and click on Sales menu you will get trace-back.

Regards,
Amit

[Olivier Dony (Odoo) (odo-openerp)]

This is not a complete fix. If you want to support most of the custom action domains that are supported on the client-side, you need to provide the same evaluation context (look at the way contexts and domains are evaluated on the client-side). You will need datetime.datetime, relativedelta, timedelta, etc.
In any case it would be a good idea to put a try/except around this eval, and fallback to having an empty `dom` if the eval fails. At least this will avoid breaking the need_action system too easily.

Thanks!

review: Needs Fixing

[Amit Dodiya (OpenERP) (ado-openerp)]

Hello Olivier Dony,

I have changed the code as per your suggestion.

Regards,
Amit

review: Needs Resubmitting

[Olivier Dony (Odoo) (odo-openerp)]

Hi,

Thanks for updating the merge proposal.

It looks better now, but:
 - you don't need backslashes within a literal dict declaration
 - the one-liner with the eval is difficult to read now, could you split it in multiple lines (but keep the lazy creation of the eval dict, i.e. only eval the domain if menu.action.domain is set
 - in case an exception occurs, it could be useful to log a warning, something like:
    _logger.warning("Action domain '%s' could not be processed to filter need-action data, ignoring it.", exc_info=True)

Thanks,

review: Needs Fixing

[lp:~openerp-dev/openobject-server/7.0-opw-603382-ado]

5214. By Martin Trigaux (OpenERP) on 2014-01-27

[MERGE] [FIX] expression: do not look at translation in parse when searching with empty string or false
This fixes traceback when applying filter 'is not set' on a translatable field

5215. By Amit Dodiya (OpenERP) on 2014-01-28

[FIX] ir_ui_menu: while adding domain value using python time in domain of window action it gives traceback

[Amit Dodiya (OpenERP) (ado-openerp)]

Hello,

I have changed the code as per the comment.

Thanks,
Amit

review: Needs Resubmitting

Unmerged revisions

5215. By Amit Dodiya (OpenERP) on 2014-01-28

[FIX] ir_ui_menu: while adding domain value using python time in domain of window action it gives traceback

=== modified file 'openerp/addons/base/ir/ir_ui_menu.py'
--- openerp/addons/base/ir/ir_ui_menu.py	2013-05-07 10:40:25 +0000
+++ openerp/addons/base/ir/ir_ui_menu.py	2014-01-28 07:03:32 +0000
@@ -20,6 +20,10 @@
 #
 ##############################################################################
 
+import time
+from datetime import datetime, timedelta
+from dateutil.relativedelta import relativedelta
+from openerp.tools.misc import DEFAULT_SERVER_DATE_FORMAT
 import base64
 import re
 import threading
@@ -333,7 +337,22 @@
                 obj = self.pool.get(menu.action.res_model)
                 if obj and obj._needaction:
                     if menu.action.type == 'ir.actions.act_window':
-                        dom = menu.action.domain and eval(menu.action.domain, {'uid': uid}) or []
+                        #if menu.action.domain is not there set dom blank
+                        dom = []
+                        #evaluate the action domain if menu.action.domain is there
+                        if menu.action.domain:
+                            try:
+                                dom = eval(menu.action.domain, {
+                                                                'uid': uid, 
+                                                                'context_today': fields.date.context_today, 
+                                                                'datetime': datetime, 
+                                                                'time': time,
+                                                                'relativedelta': relativedelta, 
+                                                                'current_date': time.strftime(DEFAULT_SERVER_DATE_FORMAT)
+                                                                })
+                            except Exception:
+                                _logger.warning("Action domain '%s' could not be processed to filter need-action data, ignoring it.", dom, exc_info=True)
+                                dom = []
                     else:
                         dom = eval(menu.action.params_store or '{}', {'uid': uid}).get('domain')
                     res[menu.id]['needaction_enabled'] = obj._needaction