Merge remote-tracking branch 'odoo/14.0' into 14.0

Author: OCA-git-bot

addons/sms/wizard/sms_composer.py

@@ -239,9 +239,12 @@ def _action_send_sms_comment(self, records=None):
         subtype_id = self.env['ir.model.data'].xmlid_to_res_id('mail.mt_note')
 
         messages = self.env['mail.message']
+        all_bodies = self._prepare_body_values(records)
+
         for record in records:
-            messages |= record._message_sms(
-                self.body, subtype_id=subtype_id,
+            messages += record._message_sms(
+                all_bodies[record.id],
+                subtype_id=subtype_id,
                 number_field=self.number_field_name,
                 sms_numbers=self.sanitized_numbers.split(',') if self.sanitized_numbers else None)
         return messages

addons/test_mail_full/tests/test_sms_composer.py

@@ -207,10 +207,11 @@ def test_composer_numbers_no_model(self):
 
 
 class TestSMSComposerBatch(TestMailFullCommon):
+
     @classmethod
     def setUpClass(cls):
         super(TestSMSComposerBatch, cls).setUpClass()
-        cls._test_body = 'Zizisse an SMS.'
+        cls._test_body = 'Hello ${object.name} zizisse an SMS.'
 
         cls._create_records_for_batch('mail.test.sms', 3)
         cls.sms_template = cls._create_sms_template('mail.test.sms')
@@ -229,8 +230,12 @@ def test_composer_batch_active_domain(self):
             with self.mockSMSGateway():
                 messages = composer._action_send_sms()
 
-        for record in self.records:
-            self.assertSMSNotification([{'partner': r.customer_id} for r in self.records], 'Zizisse an SMS.', messages)
+        for record, message in zip(self.records, messages):
+            self.assertSMSNotification(
+                [{'partner': record.customer_id}],
+                'Hello %s zizisse an SMS.' % record.name,
+                message
+            )
 
     def test_composer_batch_active_ids(self):
         with self.with_user('employee'):
@@ -245,8 +250,12 @@ def test_composer_batch_active_ids(self):
             with self.mockSMSGateway():
                 messages = composer._action_send_sms()
 
-        for record in self.records:
-            self.assertSMSNotification([{'partner': r.customer_id} for r in self.records], 'Zizisse an SMS.', messages)
+        for record, message in zip(self.records, messages):
+            self.assertSMSNotification(
+                [{'partner': record.customer_id}],
+                'Hello %s zizisse an SMS.' % record.name,
+                message
+            )
 
     def test_composer_batch_domain(self):
         with self.with_user('employee'):
@@ -262,8 +271,12 @@ def test_composer_batch_domain(self):
             with self.mockSMSGateway():
                 messages = composer._action_send_sms()
 
-        for record in self.records:
-            self.assertSMSNotification([{'partner': r.customer_id} for r in self.records], 'Zizisse an SMS.', messages)
+        for record, message in zip(self.records, messages):
+            self.assertSMSNotification(
+                [{'partner': record.customer_id}],
+                'Hello %s zizisse an SMS.' % record.name,
+                message
+            )
 
     def test_composer_batch_res_ids(self):
         with self.with_user('employee'):
@@ -278,18 +291,22 @@ def test_composer_batch_res_ids(self):
             with self.mockSMSGateway():
                 messages = composer._action_send_sms()
 
-        for record in self.records:
-            self.assertSMSNotification([{'partner': r.customer_id} for r in self.records], 'Zizisse an SMS.', messages)
+        for record, message in zip(self.records, messages):
+            self.assertSMSNotification(
+                [{'partner': record.customer_id}],
+                'Hello %s zizisse an SMS.' % record.name,
+                message
+            )
 
 
 class TestSMSComposerMass(TestMailFullCommon):
 
     @classmethod
     def setUpClass(cls):
         super(TestSMSComposerMass, cls).setUpClass()
-        cls._test_body = 'Zizisse an SMS.'
+        cls._test_body = 'Hello ${object.name} zizisse an SMS.'
 
-        cls._create_records_for_batch('mail.test.sms', 3)
+        cls._create_records_for_batch('mail.test.sms', 10)
         cls.sms_template = cls._create_sms_template('mail.test.sms')
 
     def test_composer_mass_active_domain(self):
@@ -308,7 +325,10 @@ def test_composer_mass_active_domain(self):
                 composer.action_send_sms()
 
         for record in self.records:
-            self.assertSMSOutgoing(record.customer_id, None, content=self._test_body)
+            self.assertSMSOutgoing(
+                record.customer_id, None,
+                content='Hello %s zizisse an SMS.' % record.name
+            )
 
     def test_composer_mass_active_domain_w_template(self):
         with self.with_user('employee'):
@@ -326,7 +346,10 @@ def test_composer_mass_active_domain_w_template(self):
                 composer.action_send_sms()
 
         for record in self.records:
-            self.assertSMSOutgoing(record.customer_id, None, content='Dear %s this is an SMS.' % record.display_name)
+            self.assertSMSOutgoing(
+                record.customer_id, None,
+                content='Dear %s this is an SMS.' % record.display_name
+            )
 
     def test_composer_mass_active_ids(self):
         with self.with_user('employee'):
@@ -342,8 +365,11 @@ def test_composer_mass_active_ids(self):
             with self.mockSMSGateway():
                 composer.action_send_sms()
 
-        for partner in self.partners:
-            self.assertSMSOutgoing(partner, None, content=self._test_body)
+        for partner, record in zip(self.partners, self.records):
+            self.assertSMSOutgoing(
+                partner, None,
+                content='Hello %s zizisse an SMS.' % record.name
+            )
 
     def test_composer_mass_active_ids_w_blacklist(self):
         self.env['phone.blacklist'].create([{
@@ -365,10 +391,17 @@ def test_composer_mass_active_ids_w_blacklist(self):
             with self.mockSMSGateway():
                 composer.action_send_sms()
 
-        for partner in self.partners[5:]:
-            self.assertSMSOutgoing(partner, partner.phone_sanitized, content=self._test_body)
-        for partner in self.partners[:5]:
-            self.assertSMSCanceled(partner, partner.phone_sanitized, error_code='sms_blacklist', content=self._test_body)
+        for partner, record in zip(self.partners[5:], self.records[5:]):
+            self.assertSMSOutgoing(
+                partner, partner.phone_sanitized,
+                content='Hello %s zizisse an SMS.' % record.name
+            )
+        for partner, record in zip(self.partners[:5], self.records[:5]):
+            self.assertSMSCanceled(
+                partner, partner.phone_sanitized,
+                error_code='sms_blacklist',
+                content='Hello %s zizisse an SMS.' % record.name
+            )
 
     def test_composer_mass_active_ids_wo_blacklist(self):
         self.env['phone.blacklist'].create([{
@@ -390,17 +423,22 @@ def test_composer_mass_active_ids_wo_blacklist(self):
             with self.mockSMSGateway():
                 composer.action_send_sms()
 
-        for partner in self.partners:
-            self.assertSMSOutgoing(partner, partner.phone_sanitized, content=self._test_body)
+        for partner, record in zip(self.partners, self.records):
+            self.assertSMSOutgoing(
+                partner, partner.phone_sanitized,
+                content='Hello %s zizisse an SMS.' % record.name
+            )
 
     def test_composer_mass_active_ids_w_blacklist_and_done(self):
+        """ Create some duplicates + blacklist. record[5] will have duplicated
+        number on 6 and 7. """
         self.env['phone.blacklist'].create([{
             'number': p.phone_sanitized,
             'active': True,
         } for p in self.partners[:5]])
-        for p in self.partners[8:]:
-            p.mobile = self.partners[8].mobile
-            self.assertEqual(p.phone_sanitized, self.partners[8].phone_sanitized)
+        for p in self.partners[5:8]:
+            p.mobile = self.partners[5].mobile
+            self.assertEqual(p.phone_sanitized, self.partners[5].phone_sanitized)
 
         with self.with_user('employee'):
             composer = self.env['sms.composer'].with_context(
@@ -416,12 +454,29 @@ def test_composer_mass_active_ids_w_blacklist_and_done(self):
             with self.mockSMSGateway():
                 composer.action_send_sms()
 
-        for partner in self.partners[8:]:
-            self.assertSMSOutgoing(partner, partner.phone_sanitized, content=self._test_body)
-        for partner in self.partners[5:8]:
-            self.assertSMSCanceled(partner, partner.phone_sanitized, error_code='sms_duplicate', content=self._test_body)
-        for partner in self.partners[:5]:
-            self.assertSMSCanceled(partner, partner.phone_sanitized, error_code='sms_blacklist', content=self._test_body)
+        self.assertSMSOutgoing(
+            self.partners[5], self.partners[5].phone_sanitized,
+            content='Hello %s zizisse an SMS.' % self.records[5].name
+        )
+        for partner, record in zip(self.partners[8:], self.records[8:]):
+            self.assertSMSOutgoing(
+                partner, partner.phone_sanitized,
+                content='Hello %s zizisse an SMS.' % record.name
+            )
+        # duplicates
+        for partner, record in zip(self.partners[6:8], self.records[6:8]):
+            self.assertSMSCanceled(
+                partner, partner.phone_sanitized,
+                error_code='sms_duplicate',
+                content='Hello %s zizisse an SMS.' % record.name
+            )
+        # blacklist
+        for partner, record in zip(self.partners[:5], self.records[:5]):
+            self.assertSMSCanceled(
+                partner, partner.phone_sanitized,
+                error_code='sms_blacklist',
+                content='Hello %s zizisse an SMS.' % record.name
+            )
 
     def test_composer_mass_active_ids_w_template(self):
         with self.with_user('employee'):
@@ -438,7 +493,10 @@ def test_composer_mass_active_ids_w_template(self):
                 composer.action_send_sms()
 
         for record in self.records:
-            self.assertSMSOutgoing(record.customer_id, None, content='Dear %s this is an SMS.' % record.display_name)
+            self.assertSMSOutgoing(
+                record.customer_id, None,
+                content='Dear %s this is an SMS.' % record.display_name
+            )
 
     def test_composer_mass_active_ids_w_template_and_lang(self):
         self.env['res.lang']._activate_lang('fr_FR')
@@ -472,9 +530,15 @@ def test_composer_mass_active_ids_w_template_and_lang(self):
 
         for record in self.records:
             if record.customer_id == self.partners[2]:
-                self.assertSMSOutgoing(record.customer_id, None, content='Cher·e· %s ceci est un SMS.' % record.display_name)
+                self.assertSMSOutgoing(
+                    record.customer_id, None,
+                    content='Cher·e· %s ceci est un SMS.' % record.display_name
+                )
             else:
-                self.assertSMSOutgoing(record.customer_id, None, content='Dear %s this is an SMS.' % record.display_name)
+                self.assertSMSOutgoing(
+                    record.customer_id, None,
+                    content='Dear %s this is an SMS.' % record.display_name
+                )
 
     def test_composer_mass_active_ids_w_template_and_log(self):
         with self.with_user('employee'):
@@ -491,7 +555,10 @@ def test_composer_mass_active_ids_w_template_and_log(self):
                 composer.action_send_sms()
 
         for record in self.records:
-            self.assertSMSOutgoing(record.customer_id, None, content='Dear %s this is an SMS.' % record.display_name)
+            self.assertSMSOutgoing(
+                record.customer_id, None,
+                content='Dear %s this is an SMS.' % record.display_name
+            )
             self.assertSMSLogged(record, 'Dear %s this is an SMS.' % record.display_name)
 
     def test_composer_template_context_action(self):
@@ -541,7 +608,10 @@ def test_composer_template_context_action(self):
                 messages = composer._action_send_sms()
 
         number = self.partners[2].phone_get_sanitized_number()
-        self.assertSMSNotification([{'partner': test_record_2.customer_id, 'number': number}], "Hello %s ceci est en français." % test_record_2.display_name, messages)
+        self.assertSMSNotification(
+            [{'partner': test_record_2.customer_id, 'number': number}],
+            "Hello %s ceci est en français." % test_record_2.display_name, messages
+        )
 
         # Composer creation with context from a template context action (simulate) - mass (multiple recipient)
         with self.with_user('employee'):
@@ -563,5 +633,11 @@ def test_composer_template_context_action(self):
             with self.mockSMSGateway():
                 composer.action_send_sms()
 
-        self.assertSMSOutgoing(test_record_1.customer_id, None, content='Dear %s this is an SMS.' % test_record_1.display_name)
-        self.assertSMSOutgoing(test_record_2.customer_id, None, content="Hello %s ceci est en français." % test_record_2.display_name)
+        self.assertSMSOutgoing(
+            test_record_1.customer_id, None,
+            content='Dear %s this is an SMS.' % test_record_1.display_name
+        )
+        self.assertSMSOutgoing(
+            test_record_2.customer_id, None,
+            content="Hello %s ceci est en français." % test_record_2.display_name
+        )

addons/web/static/src/js/fields/field_utils.js

@@ -628,6 +628,9 @@ function parseMonetary(value, field, options) {
         }
         currency = session.get_currency(currency_id);
     }
+    if (!currency) {
+        return parseFloat(value);
+    }
     if (!value.includes(currency.symbol)) {
         throw new Error(_.str.sprintf(core._t("'%s' is not a correct monetary field"), value));
     }

addons/web/static/tests/fields/field_utils_tests.js

@@ -261,7 +261,7 @@ QUnit.test('parse integer', function(assert) {
 });
 
 QUnit.test('parse monetary', function(assert) {
-    assert.expect(13);
+    assert.expect(15);
     var originalCurrencies = session.currencies;
     const originalParameters = _.clone(core._t.database.parameters);
     session.currencies = {
@@ -293,11 +293,13 @@ QUnit.test('parse monetary', function(assert) {
     const nbsp = '\u00a0';
     _.extend(core._t.database.parameters, {
         grouping: [3, 0],
-        decimal_point: ',',
+        decimal_point: '.',
         thousands_sep: nbsp,
     });
     assert.strictEqual(fieldUtils.parse.monetary(`1${nbsp}000.00${nbsp}€`, {}, {currency_id: 1}), 1000);
     assert.strictEqual(fieldUtils.parse.monetary(`$${nbsp}1${nbsp}000.00`, {}, {currency_id: 3}), 1000);
+    assert.strictEqual(fieldUtils.parse.monetary(`1${nbsp}000.00`), 1000);
+    assert.strictEqual(fieldUtils.parse.monetary(`1${nbsp}000${nbsp}000.00`), 1000000);
 
     session.currencies = originalCurrencies;
     core._t.database.parameters = originalParameters;

doc/cla/corporate/vauxoo.md

@@ -56,3 +56,4 @@ Luigys Toro [email protected] https://github.com/desdelinux
 Francisco J. Luna [email protected] https://github.com/frahikLV
 Andrea Arce [email protected] https://github.com/andreaarce
 Francisco Alejandro González Luna [email protected] https://github.com/TheAlekLuna
+Alejandro Garza [email protected] https://github.com/agarzaarvizu

odoo/addons/base/models/res_partner.py

@@ -759,7 +759,7 @@ def _get_name_search_order_by_fields(self):
 
     @api.model
     def _name_search(self, name, args=None, operator='ilike', limit=100, name_get_uid=None):
-        self = self.with_user(name_get_uid or self.env.uid)
+        self = self.with_user(name_get_uid) if name_get_uid else self
         # as the implementation is in SQL, we force the recompute of fields if necessary
         self.recompute(['display_name'])
         self.flush()

odoo/addons/base/tests/test_res_partner.py

@@ -3,7 +3,7 @@
 
 from odoo.tests import Form
 from odoo.tests.common import TransactionCase
-from odoo.exceptions import UserError
+from odoo.exceptions import AccessError, UserError
 
 
 class TestPartner(TransactionCase):
@@ -20,6 +20,13 @@ def test_name_search(self):
         ns_res = self.env['res.partner'].name_search('Vlad', args=[('user_ids.email', 'ilike', 'vlad')])
         self.assertEqual(set(i[0] for i in ns_res), set(test_user.partner_id.ids))
 
+        # Check a partner may be searched when current user has no access but sudo is used
+        public_user = self.env.ref('base.public_user')
+        with self.assertRaises(AccessError):
+            test_partner.with_user(public_user).check_access_rule('read')
+        ns_res = self.env['res.partner'].with_user(public_user).sudo().name_search('Vlad', args=[('user_ids.email', 'ilike', 'vlad')])
+        self.assertEqual(set(i[0] for i in ns_res), set(test_user.partner_id.ids))
+
     def test_name_get(self):
         """ Check name_get on partner, especially with different context
         Check name_get correctly return name with context. """