[MERGE] forward port branch 12.0 up to 41dfef8e

addons/mass_mailing/views/mass_mailing_views.xml

@@ -649,7 +649,7 @@
                                         <field name="campaign_id"
                                             string="UTM Campaign"
                                             groups="base.group_no_one"/>
-                                        <field name="source_id"
+                                        <field name="source_id" readonly="1"
                                             readonly="1"
                                             string="Source"
                                             required="False"

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,
             })

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")

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>