[MERGE] forward port branch 10.0 up to f1ee633f26

addons/account/views/web_planner_data.xml

@@ -394,7 +394,7 @@
                 <t t-call="web_planner.page">
                     <t t-set="page_title">Extra Features</t>
                     <p class="text-muted">
-                        Odoo Accounting has many free extra-features:
+                        Odoo Accounting has many extra-features:
                     </p>
                     <div class="row o_planner_row_apps">
                         <div class="text-center col-md-4">

addons/barcodes/static/src/js/inherited_form_widget_button.js

@@ -16,7 +16,7 @@ var ButtonBarcodeHandlerMixin = _.extend({}, BarcodeHandlerMixin, {
             this.on_barcode_scanned = function(barcode) {
                 var match = barcode.match(/O-BTN\.(.+)/);
                 if (match && match[1] === self.node.attrs.barcode_trigger &&
-                    (self.$el.is(':visible') || self.$el.parent('.dropdown-menu').length)) {
+                    (self.$el.is(':visible') || self.$el.parents('.dropdown-menu').length)) {
                     self.on_click();
                 }
             };

addons/report/static/src/css/reset.min.css

@@ -48,6 +48,7 @@ ol {
 
 ul {
 	list-style: disc;
+	padding-left: 40px;
 }
 
 ul ul {

addons/website_hr_recruitment/controllers/main.py

@@ -69,7 +69,8 @@ class WebsiteHrRecruitment(http.Controller):
 
     @http.route('/jobs/add', type='http', auth="user", website=True)
     def jobs_add(self, **kwargs):
-        job = request.env['hr.job'].create({
+        # avoid branding of website_description by setting rendering_bundle in context
+        job = request.env['hr.job'].with_context(rendering_bundle=True).create({
             'name': _('Job Title'),
         })
         return request.redirect("/jobs/detail/%s?enable_editor=1" % slug(job))