[MERGE] forward port branch saas-15 up to 09badbed

addons/hr/i18n/hr.pot

@@ -586,11 +586,6 @@ msgstr ""
 msgid "Private Information"
 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_hr_job_form
 msgid "Recruitment"

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

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

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;

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

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>