diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index b0d54276621..74157cfb226 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -1106,6 +1106,17 @@ class calendar_event(osv.Model):
                         if self.pool['calendar.attendee']._send_mail_to_attendees(cr, uid, att_id, email_from=mail_from, context=context):
                             self.message_post(cr, uid, event.id, body=_("An invitation email has been sent to attendee %s") % (partner.name,), subtype="calendar.subtype_invitation", context=context)
 
+            if current_user.partner_id.id not in new_att_partner_ids:
+                access_token = self.new_invitation_token(cr, uid, event, current_user.partner_id.id)
+                values = {
+                    'partner_id': current_user.partner_id.id,
+                    'event_id': event.id,
+                    'access_token': access_token,
+                    'email': current_user.partner_id.email,
+                }
+                current_user_att_id = self.pool['calendar.attendee'].create(cr, uid, values, context=context)
+                new_attendees.append(current_user_att_id)
+                new_att_partner_ids.append(current_user.partner_id.id)
             if new_attendees:
                 self.write(cr, uid, [event.id], {'attendee_ids': [(4, att) for att in new_attendees]}, context=context)
             if new_att_partner_ids:
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a9eaa5250fd..9f30510a461 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -188,7 +188,7 @@
                         <group>
                             <group string="Mailings">
                                 <field name="opt_out"/>
-                                <field name="message_bounce"/>
+                                <field name="message_bounce" readonly="1"/>
                             </group>
                             <group string="Categorization" groups="base.group_multi_company,base.group_no_one" name="categorization">
                                 <field name="company_id"
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 93a8992457f..b0224782d90 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -60,6 +60,8 @@
         <field name="arch" type="xml">
           <form string="Jobs - Recruitment Form">
             <header>
+                <button string="Create Employee" name="create_employee_from_applicant" type="object"
+                        class="oe_highlight" attrs="{'invisible': [('emp_id', '!=', False)]}"/>
                 <field name="stage_id" widget="statusbar" clickable="True" options="{'fold_field': 'fold'}"/>
             </header>
             <sheet>
@@ -105,9 +107,6 @@
                     <label for="partner_name" class="oe_edit_only"/>
                     <h2>
                         <field name="partner_name" class="oe_inline"/>
-                        <button string="Create Employee" name="create_employee_from_applicant" type="object"
-                                    class="oe_link oe_inline" style="margin-left: 8px;"
-                                    attrs="{'invisible': [('emp_id', '!=', False)]}"/>
                     </h2>
                 </div>
                 <group>
diff --git a/addons/sale/views/report_saleorder.xml b/addons/sale/views/report_saleorder.xml
index 93d72878799..b9cc42a7375 100644
--- a/addons/sale/views/report_saleorder.xml
+++ b/addons/sale/views/report_saleorder.xml
@@ -8,8 +8,8 @@
             <div class="oe_structure"/>
             <div class="row">
                 <div class="col-xs-6">
-                    <strong t-if="doc.partner_shipping_id == doc.partner_invoice_id">Invoice and shipping address:</strong>
-                    <strong t-if="doc.partner_shipping_id != doc.partner_invoice_id">Invoice address:</strong>
+                    <strong t-if="doc.partner_shipping_id == doc.partner_invoice_id">Invoicing and shipping address:</strong>
+                    <strong t-if="doc.partner_shipping_id != doc.partner_invoice_id">Invoicing address:</strong>
                     <div t-field="doc.partner_invoice_id"
                         t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/>
                     <p t-if="doc.partner_id.vat">VAT: <span t-field="doc.partner_id.vat"/></p>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 1c7e1213408..cc54f61eea7 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -498,12 +498,6 @@
                 <span class="caret"></span>
             </button>
             <ul class="dropdown-menu" role="menu" t-att-aria-labelledby="'dopprod-%s' % object.id">
-                <li>
-                    <a href="#" class="js_publish_btn">
-                        <span class="css_unpublish">Unpublish</span>
-                        <span class="css_publish">Publish</span>
-                    </a>
-                </li>
                 <t t-raw="0"/>
                 <li t-if="publish_edit">
                     <a t-attf-href="/web#return_label=Website&amp;view_type=form&amp;model=#{object._name}&amp;id=#{object.id}&amp;action=#{action}"
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index a5479eecbf4..a6d40bd5654 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -113,7 +113,7 @@ class sale_order(osv.Model):
 
     def _cart_accessories(self, cr, uid, ids, context=None):
         for order in self.browse(cr, uid, ids, context=context):
-            s = set(j.id for l in (order.website_order_line or []) for j in (l.product_id.accessory_product_ids or []))
+            s = set(j.id for l in (order.website_order_line or []) for j in (l.product_id.accessory_product_ids or []) if j.website_published)
             s -= set(l.product_id.id for l in order.order_line)
             product_ids = random.sample(s, min(len(s), 3))
             return self.pool['product.product'].browse(cr, uid, product_ids, context=context)