From d7d9603f1bc9d7200a7954880dc9c82fd6369be7 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Wed, 15 Nov 2017 15:34:10 +0100
Subject: [PATCH 1/5] [FIX] resource: mixin: copy

When copying a record implementing the resource mixin, the linked
resource should be copied too and not shared across the records.

Fixes #20956
opw-781508
---
 addons/resource/models/resource_mixin.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/resource/models/resource_mixin.py b/addons/resource/models/resource_mixin.py
index bd9fcc2e640..7aad40534e4 100644
--- a/addons/resource/models/resource_mixin.py
+++ b/addons/resource/models/resource_mixin.py
@@ -31,6 +31,16 @@ class ResourceMixin(models.AbstractModel):
             values['resource_id'] = resource.id
         return super(ResourceMixin, self).create(values)
 
+    @api.multi
+    def copy_data(self, default=None):
+        if default is None:
+            default = {}
+        resource = self.resource_id.copy()
+        default['resource_id'] = resource.id
+        default['company_id'] = resource.company_id.id
+        default['resource_calendar_id'] = resource.calendar_id.id
+        return super(ResourceMixin, self).copy_data(default)
+
     def get_work_days_count(self, from_datetime, to_datetime, calendar=None):
         """ Return the number of work days for the resource, taking into account
         leaves. An optional calendar can be given in case multiple calendars can

From 83c1ef83cdb5c5df561a3822154508ecd9533d23 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 22 Nov 2017 13:38:35 +0100
Subject: [PATCH 2/5] [FIX] report: boxed layout

In the footer of the boxed layout, the font-size used might lead to a
wrapping of the phone and VAT numbers.

opw-782639
---
 addons/report/static/src/less/layout_boxed.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/report/static/src/less/layout_boxed.less b/addons/report/static/src/less/layout_boxed.less
index a81e09f347b..21fcf66efc5 100644
--- a/addons/report/static/src/less/layout_boxed.less
+++ b/addons/report/static/src/less/layout_boxed.less
@@ -15,6 +15,7 @@
     }
 }
 .o_boxed_footer {
+    white-space: nowrap;
     border-top: 3px solid @gray;
     ul {
         margin: 4px 0;

From 534081c92ca9fb179af42974ed188bf2ce971b03 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Thu, 23 Nov 2017 10:05:50 +0100
Subject: [PATCH 3/5] [FIX] hr: unprout views

Courtesy of @tde-banana-odoo
---
 addons/hr/i18n/hr.pot                        | 5 -----
 addons/hr/views/hr_config_settings_views.xml | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index 6438af674df..f3e09c8a6bd 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -610,11 +610,6 @@ msgstr ""
 msgid "Position"
 msgstr ""
 
-#. module: hr
-#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form
-msgid "Prout prout prout"
-msgstr ""
-
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.view_employee_form
 msgid "Public Information"
diff --git a/addons/hr/views/hr_config_settings_views.xml b/addons/hr/views/hr_config_settings_views.xml
index e3071728307..d4244203861 100644
--- a/addons/hr/views/hr_config_settings_views.xml
+++ b/addons/hr/views/hr_config_settings_views.xml
@@ -12,7 +12,7 @@
                 </header>
                 <sheet>
                     <h2>Work Organization</h2>
-                    <div class="row mt16 o_settings_container" title="Prout prout prout">
+                    <div class="row mt16 o_settings_container">
                         <div class="col-xs-12 col-md-6 o_setting_box">
                             <div class="o_setting_right_pane">
                                 <label for="resource_calendar_id"/>

From 1f74777b4137f8f1c6721ef21f1b28b88e330138 Mon Sep 17 00:00:00 2001
From: "Lucas Perais (lpe)" <lpe@odoo.com>
Date: Fri, 24 Nov 2017 09:08:08 +0100
Subject: [PATCH 4/5] [FIX] website_event: correct online tag

Before this commit, the condition on the display of the online tag was inverted

OPW 783213
---
 addons/website_event/views/event_templates.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml
index 45ec1743049..ffa9a9daab9 100644
--- a/addons/website_event/views/event_templates.xml
+++ b/addons/website_event/views/event_templates.xml
@@ -57,7 +57,7 @@
                                 <h4 class="media-heading">
                                     <a itemprop="url" t-att-class="event.state == 'done' and 'text-success'" t-attf-href="/event/#{ slug(event) }/#{(not event.menu_id) and 'register' or ''}"><span itemprop="name" t-field="event.name"> </span></a>
                                     <small t-if="event.is_participating" class="label label-info">Participating</small>
-                                    <small t-if="not event.is_online" class="label label-info">Online</small>
+                                    <small t-if="event.is_online" class="label label-info">Online</small>
                                     <small t-if="not event.website_published" class="label label-danger">unpublished</small>
                                 </h4>
                                 <div>

From 09badbed98b8e6ab5dbe90019457de4d73887c3a Mon Sep 17 00:00:00 2001
From: Olivier Colson <oco@odoo.com>
Date: Fri, 24 Nov 2017 15:03:58 +0100
Subject: [PATCH 5/5] [FIX] l10n_ch: allow using non-mod10r account for ISR

Remove the condition checking that the postal account field of bank accounts only accepts mod10r-verified references, as not all banks use such references (example: UBS).
---
 addons/l10n_ch/models/res_bank.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_ch/models/res_bank.py b/addons/l10n_ch/models/res_bank.py
index 7a60d7f0eae..0ddc98172a3 100644
--- a/addons/l10n_ch/models/res_bank.py
+++ b/addons/l10n_ch/models/res_bank.py
@@ -44,10 +44,9 @@ class ResPartnerBank(models.Model):
     @api.depends('acc_number')
     def _compute_l10n_ch_postal(self):
         for record in self:
-            if record.acc_type == 'postal':
-                record.l10n_ch_postal = record.sanitized_acc_number
-            elif record.acc_type == 'iban':
+            if record.acc_type == 'iban':
                 record.l10n_ch_postal = record._retrieve_l10n_ch_postal(record.sanitized_acc_number)
+            record.l10n_ch_postal = record.sanitized_acc_number
 
     def _retrieve_l10n_ch_postal(self, iban):
         """ Reads a swiss postal account number from a an IBAN and returns it as