[MERGE] forward port branch saas-14 up to 556b59bce1

addons/mail/models/mail_mail.py

@@ -148,6 +148,7 @@ class MailMail(models.Model):
         if notif_emails:
             notifications = self.env['mail.notification'].search([
                 ('mail_message_id', 'in', notif_emails.mapped('mail_message_id').ids),
+                ('res_partner_id', 'in', notif_emails.mapped('recipient_ids').ids),
                 ('is_email', '=', True)])
             if mail_sent:
                 notifications.write({
@@ -322,6 +323,7 @@ class MailMail(models.Model):
                 notifs = self.env['mail.notification'].search([
                     ('is_email', '=', True),
                     ('mail_message_id', 'in', mail.mapped('mail_message_id').ids),
+                    ('res_partner_id', 'in', mail.mapped('recipient_ids').ids),
                     ('email_status', 'not in', ('sent', 'canceled'))
                 ])
                 if notifs:

odoo/addons/test_convert/__init__.py

@@ -0,0 +1 @@
+from . import models

odoo/addons/test_convert/__manifest__.py

@@ -5,4 +5,5 @@
     'name': 'test_convert',
     'description': "Data for xml conversion tests",
     'version': '0.0.1',
+    'data': ['ir.model.access.csv'],
 }

odoo/addons/test_convert/ir.model.access.csv

@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_test_convert_test_model,access_test_convert_test_model,model_test_convert_test_model,,1,1,1,1

odoo/addons/test_convert/models.py

@@ -0,0 +1,16 @@
+from odoo import api, models
+
+class TestModel(models.Model):
+    _name = 'test_convert.test_model'
+
+    @api.model
+    def action_test_date(self, today_date):
+        return True
+
+    @api.model
+    def action_test_time(self, cur_time):
+        return True
+
+    @api.model
+    def action_test_timezone(self, timezone):
+        return True

odoo/addons/test_convert/tests/test_convert.py

@@ -4,8 +4,10 @@
 import collections
 import unittest
 
+from lxml import etree as ET
 from lxml.builder import E
 
+import odoo
 from odoo.tests import common
 from odoo.tools.convert import _eval_xml
 
@@ -16,6 +18,25 @@ class TestEvalXML(common.TransactionCase):
     def eval_xml(self, node, obj=None):
         return _eval_xml(obj, node, self.env)
 
+    def test_function_eval(self):
+        def id_get(): pass
+        Obj = collections.namedtuple('Obj', ['module', 'idref', 'id_get'])
+        obj = Obj('test_convert', {}, id_get)
+
+        try:
+            test_datetime = ET.XML("<function name='action_test_date' model='test_convert.test_model' eval='[datetime.now().strftime(\"%Y-%m-%d %H:%M:%S\")]'/>")
+            self.eval_xml(node=test_datetime, obj=obj)
+            test_time = ET.XML("<function name='action_test_time' model='test_convert.test_model' eval='[time.strftime(\"%Y-%m-%d %H:%M:%S\")]'/>")
+            self.eval_xml(node=test_time, obj=obj)
+            test_timedelta = ET.XML("<function name='action_test_date' model='test_convert.test_model' eval='[(datetime.today()-timedelta(days=365)).strftime(\"%Y-%m-%d %H:%M:%S\")]'/>")
+            self.eval_xml(node=test_timedelta, obj=obj)
+            test_relativedelta = ET.XML("<function name='action_test_date' model='test_convert.test_model' eval='[(datetime.today()+relativedelta(months=3)).strftime(\"%Y-%m-%d %H:%M:%S\")]'/>")
+            self.eval_xml(node=test_relativedelta, obj=obj)
+            test_timezone = ET.XML("<function name='action_test_timezone' model='test_convert.test_model' eval='[pytz.timezone(\"Asia/Calcutta\")]'/>")
+            self.eval_xml(node=test_timezone, obj=obj)
+        except ValueError as e:
+            self.fail(e.message)
+
     def test_char(self):
         self.assertEqual(
             self.eval_xml(Field("foo")),

odoo/tools/convert.py

@@ -177,15 +177,16 @@ def _eval_xml(self, node, env):
     elif node.tag == "function":
         args = []
         a_eval = node.get('eval','')
+        model_str = node.get('model', '')
         # FIXME: should probably be exclusive
         if a_eval:
-            self.idref['ref'] = self.id_get
+            idref2 = _get_idref(self, env, model_str, self.idref)
-            args = safe_eval(a_eval, self.idref)
+            args = safe_eval(a_eval, idref2)
         for n in node:
             return_val = _eval_xml(self, n, env)
             if return_val is not None:
                 args.append(return_val)
-        model = env[node.get('model', '')]
+        model = env[model_str]
         method = node.get('name')
         # this one still depends on the old API
         return odoo.api.call_kw(model, method, args, {})