From ca57218b6122ec00be51fa177067dfba7d168e91 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 11 Jun 2019 12:13:15 +0000
Subject: [PATCH 1/3] [FIX] mass_mailing: campaign subject

- Create a mailing campaign
- Create a mailing 1, set the subject to "Test 1"
- Create a mailing 2, set the subject to "Test 2"

The subject of mailing 1 is set to "Test 2".

When checking the code, this behavior seems the one expected. The
`_rec_name` of a mass mailing is the `subject_id`:

https://github.com/odoo/odoo/blob/7ef4ba03c4f8dce42f5a56b64d2374373d13aa8d/addons/mass_mailing/models/mass_mailing.py#L437

Moreover, there is an onchange to set the subject in line with the
subject of the campaign:

https://github.com/odoo/odoo/blob/7ef4ba03c4f8dce42f5a56b64d2374373d13aa8d/addons/mass_mailing/models/mass_mailing.py#L608

However this behavior is not present up to v11, and only appears in v12.
Surprisingly, this is due to an unrelated improvement which adds the
field in the view (in debug mode): 5b0bcaef3ee45360d9a1a2e2c04e5dfdca.

Up to v11, the onchange exists, but since the fields are not in the
view, it has no effect. However, in v12 the fields are in the view so
the onchange has an effect.

Since this was the behavior up to v11, and that the behavior is fixed
in f50fbc6d168f0d17fa1e932b4ecc968a9, we keep it consistent in v12 as
well.

opw-2007764

closes odoo/odoo#34028

Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
---
 addons/mass_mailing/views/mass_mailing_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml
index ab86e32d87d..8dfe2e8726e 100644
--- a/addons/mass_mailing/views/mass_mailing_views.xml
+++ b/addons/mass_mailing/views/mass_mailing_views.xml
@@ -645,7 +645,7 @@
                                             groups="mass_mailing.group_mass_mailing_campaign"/>
                                         <field name="campaign_id" invisible="1"
                                             groups="base.group_no_one"/>
-                                        <field name="source_id"
+                                        <field name="source_id" readonly="1"
                                             string="Source"
                                             required="False"
                                             groups="base.group_no_one"/>

From 63e19c118bb26a7419a9892e1122330181f6012d Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Tue, 11 Jun 2019 15:57:13 +0000
Subject: [PATCH 2/3] [FIX] website_sale_delivery: only load tour in frontend
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This tour is useless in backend.
This patch will be required in saas~12.2 as `web_editor.base` (used in
the tour) is only available in frontend.

closes odoo/odoo#34041

Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
---
 addons/website_sale_delivery/tests/test_ui.py                | 2 +-
 .../views/website_sale_delivery_templates.xml                | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/addons/website_sale_delivery/tests/test_ui.py b/addons/website_sale_delivery/tests/test_ui.py
index 74b73e47b36..1c61c00b9fb 100644
--- a/addons/website_sale_delivery/tests/test_ui.py
+++ b/addons/website_sale_delivery/tests/test_ui.py
@@ -11,4 +11,4 @@ class TestUi(odoo.tests.HttpCase):
             'free_over': True,
             'amount': 10,
         })
-        self.phantom_js("/web", "odoo.__DEBUG__.services['web_tour.tour'].run('check_free_delivery')", "odoo.__DEBUG__.services['web_tour.tour'].tours.check_free_delivery.ready", login="admin")
+        self.phantom_js("/", "odoo.__DEBUG__.services['web_tour.tour'].run('check_free_delivery')", "odoo.__DEBUG__.services['web_tour.tour'].tours.check_free_delivery.ready", login="admin")
diff --git a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
index 286af2262aa..18f2aeb68b8 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
@@ -19,11 +19,6 @@
       <xpath expr="." position="inside">
         <script type="text/javascript" src="/website_sale_delivery/static/src/js/website_sale_delivery.js"></script>
         <link rel="stylesheet" type="text/scss" href="/website_sale_delivery/static/src/scss/website_sale_delivery.scss"/>
-      </xpath>
-    </template>
-
-    <template id="assets_common" name="Website Sale Common Assets" inherit_id="web.assets_common">
-      <xpath expr="." position="inside">
         <script type="text/javascript" src="/website_sale_delivery/static/src/js/website_free_delivery_tour.js"></script>
       </xpath>
     </template>

From 41dfef8e2a4d1308c74de0fce2c1b19ed7803c52 Mon Sep 17 00:00:00 2001
From: Pierre Rousseau <pro@odoo.com>
Date: Wed, 12 Jun 2019 07:01:39 +0000
Subject: [PATCH 3/3] [FIX] snailmail: fix external tests

From now, the color option 2 ('Mixed color & B/W') is not available anymore. So set the option to 1 ('Color').

Task-ID: 2008913

closes odoo/odoo#34052

Signed-off-by: Pierre Rousseau (pro) <pro@odoo.com>
---
 addons/snailmail_account/tests/test_pingen_send.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/snailmail_account/tests/test_pingen_send.py b/addons/snailmail_account/tests/test_pingen_send.py
index ce73f388274..2cbda8ac9df 100644
--- a/addons/snailmail_account/tests/test_pingen_send.py
+++ b/addons/snailmail_account/tests/test_pingen_send.py
@@ -25,7 +25,7 @@ class TestPingenSend(AccountingTestCase):
         self.data = {
             'data': json.dumps({
                 'speed': 1,
-                'color': 2,
+                'color': 1,
                 'duplex': 0,
                 'send': True,
             })