From 9494161e230e05fd918ac46626e5ed3d8b85d7ca Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Tue, 18 Jul 2017 16:31:17 +0200 Subject: [PATCH 1/2] [FIX] website_quote: increase robustess of menu generation On online quotations, a left menu is automatically generated on page load by searching for the

and

elements in the page. This also considered the empty ones which do not make sense and were breaking the menu's layout. Ideally, there should not be any empty title in the page. opw-752764 --- addons/website_quote/static/src/js/website_quotation.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/website_quote/static/src/js/website_quotation.js b/addons/website_quote/static/src/js/website_quotation.js index 798b1ec5a76..fc490e03f63 100644 --- a/addons/website_quote/static/src/js/website_quotation.js +++ b/addons/website_quote/static/src/js/website_quotation.js @@ -135,12 +135,18 @@ if(!$('.o_website_quote').length) { case "h1": var id = self.setElementId('quote_header_', el); var text = self.extractText($(el)); + if (!text) { + break; + } last_li = $("
  • ").append($('').text(text)).appendTo(self.$el); last_ul = false; break; case "h2": var id = self.setElementId('quote_', el); var text = self.extractText($(el)); + if (!text) { + break; + } if (last_li) { if (!last_ul) { last_ul = $("
      ").appendTo(last_li); From 41433debdbb1f9828e81115e6bc76eb35ddfa693 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Wed, 19 Jul 2017 11:53:14 +0200 Subject: [PATCH 2/2] [FIX] account: leap year If the end of the accounting period is set to the 28-29th of February, crashes may occur in date computation. opw-752939 --- addons/account/models/company.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/addons/account/models/company.py b/addons/account/models/company.py index 4a249c495b9..13591c254de 100644 --- a/addons/account/models/company.py +++ b/addons/account/models/company.py @@ -58,10 +58,16 @@ Best Regards,''') if (date.month < last_month or (date.month == last_month and date.day <= last_day)): date = date.replace(month=last_month, day=last_day) else: - date = date.replace(month=last_month, day=last_day, year=date.year + 1) + if last_month == 2 and last_day == 29 and (date.year + 1) % 4 != 0: + date = date.replace(month=last_month, day=28, year=date.year + 1) + else: + date = date.replace(month=last_month, day=last_day, year=date.year + 1) date_to = date date_from = date + timedelta(days=1) - date_from = date_from.replace(year=date_from.year - 1) + if date_from.month == 2 and date_from.day == 29: + date_from = date_from.replace(day=28, year=date_from.year - 1) + else: + date_from = date_from.replace(year=date_from.year - 1) return {'date_from': date_from, 'date_to': date_to} def get_new_account_code(self, current_code, old_prefix, new_prefix, digits):