diff --git a/addons/account/views/web_planner_data.xml b/addons/account/views/web_planner_data.xml index f040f3482b9..fe49f60d406 100644 --- a/addons/account/views/web_planner_data.xml +++ b/addons/account/views/web_planner_data.xml @@ -394,7 +394,7 @@ Extra Features

- Odoo Accounting has many free extra-features: + Odoo Accounting has many extra-features:

diff --git a/addons/barcodes/static/src/js/inherited_form_widget_button.js b/addons/barcodes/static/src/js/inherited_form_widget_button.js index 08475ee199b..fbbd38e9a54 100644 --- a/addons/barcodes/static/src/js/inherited_form_widget_button.js +++ b/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(); } }; diff --git a/addons/report/static/src/css/reset.min.css b/addons/report/static/src/css/reset.min.css index ee21ad74e7d..97c0b78b002 100644 --- a/addons/report/static/src/css/reset.min.css +++ b/addons/report/static/src/css/reset.min.css @@ -48,6 +48,7 @@ ol { ul { list-style: disc; + padding-left: 40px; } ul ul { diff --git a/addons/website_hr_recruitment/controllers/main.py b/addons/website_hr_recruitment/controllers/main.py index a74fd9d4631..5741b349b5b 100644 --- a/addons/website_hr_recruitment/controllers/main.py +++ b/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))