diff --git a/addons/sms/wizard/sms_composer.py b/addons/sms/wizard/sms_composer.py index ce7d2c1b42c..43d9e972e39 100644 --- a/addons/sms/wizard/sms_composer.py +++ b/addons/sms/wizard/sms_composer.py @@ -219,9 +219,12 @@ class SendSMS(models.TransientModel): 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 diff --git a/addons/test_mail_sms/tests/test_sms_composer.py b/addons/test_mail_sms/tests/test_sms_composer.py index 220b84bf4f0..3c54a009c32 100644 --- a/addons/test_mail_sms/tests/test_sms_composer.py +++ b/addons/test_mail_sms/tests/test_sms_composer.py @@ -228,11 +228,11 @@ class TestSMSComposerBatch(TestSMSCommon): with self.mockSMSGateway(): messages = composer._action_send_sms() - for record in self.records: + for record, message in zip(self.records, messages): self.assertSMSNotification( [{'partner': record.customer_id}], - 'Hello ${object.name} zizisse an SMS.', - messages + 'Hello %s zizisse an SMS.' % record.name, + message ) def test_composer_batch_res_ids(self): @@ -248,11 +248,11 @@ class TestSMSComposerBatch(TestSMSCommon): with self.mockSMSGateway(): messages = composer._action_send_sms() - for record in self.records: + for record, message in zip(self.records, messages): self.assertSMSNotification( [{'partner': record.customer_id}], - 'Hello ${object.name} zizisse an SMS.', - messages + 'Hello %s zizisse an SMS.' % record.name, + message )