Merge

super_calendar/super_calendar.py

@@ -25,7 +25,7 @@ import logging
 from mako.template import Template
 from datetime import datetime
 from openerp import tools
-from openerp.tools import safe_eval as eval
+from openerp.tools.safe_eval import safe_eval
 
 def _models_get(self, cr, uid, context=None):
     obj = self.pool.get('ir.model')
@@ -52,7 +52,12 @@ class super_calendar_configurator(orm.Model):
         for configurator in self.browse(cr, uid, configurator_ids, context):
             for line in configurator.line_ids:
                 current_pool = self.pool.get(line.name.model)
-                current_record_ids = current_pool.search(cr, uid, line.domain and eval(line.domain) or [], context=context)
+                current_record_ids = current_pool.search(
+                    cr,
+                    uid,
+                    line.domain and eval(line.domain) or [],
+                    context=context)
+
                 for current_record_id in current_record_ids:
                     current_record  = current_pool.browse(cr, uid, current_record_id, context=context)
                     if line.user_field_id and \