From f045186f23acf9d5aee6606cf1eb56291f3a98da Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 23 Jul 2018 13:43:21 +0200
Subject: [PATCH 1/5] [FIX] report: fix padding for ul in report pdf

Rendering in html was correct thanks to the webkit-padding-start 40px added
by the browser. But once printed with wkhtml, the padding was missing.

Now we force the padding manually.

This commit closes #7375
---
 addons/report/static/src/css/reset.min.css | 1 +
 1 file changed, 1 insertion(+)

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 {

From e9901d14223004b3c44484b80d897195867ab949 Mon Sep 17 00:00:00 2001
From: Julien Machiels <jma@odoo.com>
Date: Tue, 24 Jul 2018 11:15:38 +0200
Subject: [PATCH 2/5] [FIX] barcodes: barcodes working in button in dropdown

On mobile, some barcodes didn't trigger in the picking screens, notably
O-BTN.validate. This is due to the use of parent() to check if the
button is in a dropdown, as parent() only checks one DOM-level upwards.
The button being inside a <ul><li>, we need to check more levels than
one to pass the condition and trigger the button press.

By changing parent() to parents(), the entire chain will be checked, not
just one level, and the button press is correctly triggered.

opw-1860964
closes #25941
---
 addons/barcodes/static/src/js/inherited_form_widget_button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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();
                 }
             };

From aa4ccef41881c59b01f16f47c745053fa5af7d60 Mon Sep 17 00:00:00 2001
From: "Lucas Perais (lpe)" <lpe@odoo.com>
Date: Tue, 24 Jul 2018 10:41:38 +0200
Subject: [PATCH 3/5] [FIX] account: fix planner extra features

---
 addons/account/i18n/account.pot           | 38 +++++++++++++++++++++--
 addons/account/views/web_planner_data.xml |  2 +-
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index bc3f1ec77ba..4b2a5e3110d 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -1384,11 +1384,18 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_cash_box_in_amount
 #: model:ir.model.fields,field_description:account.field_cash_box_out_amount
 #: model:ir.ui.view,arch_db:account.report_invoice_document
+#: model:ir.ui.view,arch_db:account.view_account_payment_tree
+#: model:ir.ui.view,arch_db:account.view_account_supplier_payment_tree
 #: model:ir.ui.view,arch_db:account.view_move_line_form
 #, python-format
 msgid "Amount"
 msgstr ""
 
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_analytic_line_analytic_amount_currency
+msgid "Amount Currency"
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_residual
 #: model:ir.model.fields,field_description:account.field_account_invoice_residual_company_signed
@@ -1413,6 +1420,11 @@ msgstr ""
 msgid "Amount currency"
 msgstr ""
 
+#. module: account
+#: model:ir.ui.view,arch_db:account.invoice_tree
+msgid "Amount due"
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_amount_currency
 msgid "Amount in Currency"
@@ -4553,6 +4565,11 @@ msgstr ""
 msgid "Invoices to validate"
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance
+msgid "Invoicing"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_config_settings
 msgid "Invoicing & Payments"
@@ -5604,7 +5621,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
-msgid "Odoo Accounting has many free extra-features:"
+msgid "Odoo Accounting has many extra-features:"
 msgstr ""
 
 #. module: account
@@ -7773,6 +7790,12 @@ msgstr ""
 msgid "The last line's computation type should be \"Balance\" to ensure that the whole amount will be allocated."
 msgstr ""
 
+#. module: account
+#: code:addons/account/models/company.py:81
+#, python-format
+msgid "The lock date for advisors is irreversible and can't be removed."
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields,help:account.field_account_move_line_move_id
 msgid "The move of this entry line."
@@ -7790,6 +7813,12 @@ msgstr ""
 msgid "The name that will be used on account move lines"
 msgstr ""
 
+#. module: account
+#: code:addons/account/models/company.py:85
+#, python-format
+msgid "The new lock date for advisors must be set after the previous lock date."
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields,help:account.field_account_bank_statement_line_currency_id
 #: model:ir.model.fields,help:account.field_account_move_line_currency_id
@@ -8163,7 +8192,12 @@ msgid "To manage the tax applied when invoicing a Company, Odoo uses the concept
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:776
+#: model:ir.ui.view,arch_db:account.invoice_supplier_tree
+msgid "To pay"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_move.py:895
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries!"
 msgstr ""
diff --git a/addons/account/views/web_planner_data.xml b/addons/account/views/web_planner_data.xml
index 5c05c2c2f43..b466af86803 100644
--- a/addons/account/views/web_planner_data.xml
+++ b/addons/account/views/web_planner_data.xml
@@ -393,7 +393,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">

From 2c5ec48f926be9aaf2c2f14e0177f0dee67d5348 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Wed, 25 Jul 2018 11:01:07 +0200
Subject: [PATCH 4/5] [FIX] http: only del existing attributes

Closes #25652
---
 openerp/http.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/http.py b/openerp/http.py
index fb569330c64..1b717590943 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -1135,7 +1135,8 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
         request.uid = uid
         request.disable_db = False
 
-        del request.env
+        if hasattr(request, 'env'):
+            del request.env
 
         if uid: self.get_context()
         return uid

From f1ee633f26a78636fede3e2b600c801b5f474a50 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Wed, 25 Jul 2018 11:22:17 +0200
Subject: [PATCH 5/5] [FIX] website_hr_recruitment: frontend creation ok

When creating a job position from the frontend, and we:

- are on the same language that the default website language,
- have the permission to write on ir.ui.view,

we have all conditions to adding branding used to edit a page.

But when creating a position by the frontend, we create a job that will
render this template:

 website_hr_recruitment.default_website_description

When we are in the above said condition, we will create a job position
that erroneously has the branding that should only be displayed on
website and removed when saving an edition.

This caused a lot of problem with the editor that would most often not
be able to edit the content.

In this commit, we use the "rendering_bundle" context key to prevent
branding.

opw-1868879
closes #25963
---
 addons/website_hr_recruitment/controllers/main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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))