diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-07-25 18:11:41 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-07-25 18:11:41 +0200 |
| commit | 4b9d6387b82395721f7c01148acb0963a221abbf (patch) | |
| tree | 575bcad09b1c7bd747b3ae76ded60e984800dfa7 /addons | |
| parent | cd2ccc4110274e23607521c18309f07cca68476a (diff) | |
| parent | e80a0d4aa9402930728ca2df3de7038a5d0b7529 (diff) | |
[MERGE] forward port branch saas-15 up to e80a0d4aa94
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/account/views/web_planner_data.xml | 2 | ||||
| -rw-r--r-- | addons/web/static/src/css/reset.min.css | 1 | ||||
| -rw-r--r-- | addons/website_hr_recruitment/controllers/main.py | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/addons/account/views/web_planner_data.xml b/addons/account/views/web_planner_data.xml index 9284bb7166c..0c4d85891c3 100644 --- a/addons/account/views/web_planner_data.xml +++ b/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"> diff --git a/addons/web/static/src/css/reset.min.css b/addons/web/static/src/css/reset.min.css index ee21ad74e7d..97c0b78b002 100644 --- a/addons/web/static/src/css/reset.min.css +++ b/addons/web/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 3ff0b29b4b6..8198e65f293 100644 --- a/addons/website_hr_recruitment/controllers/main.py +++ b/addons/website_hr_recruitment/controllers/main.py @@ -72,7 +72,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)) |