pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 9.0 up to 41433debdb

Browse Source
This commit is contained in:
Christophe Simonis
2017-07-19 16:16:57 +02:00
parent f081f19fb8 41433debdb
commit f07ca36b9b
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/company.py
+8 -2
View File
@@ -57,10 +57,16 @@ Best Regards,''')
if (date.month < last_month or (date.month == last_month and date.day <= last_day)): if (date.month < last_month or (date.month == last_month and date.day <= last_day)):
date = date.replace(month=last_month, day=last_day) date = date.replace(month=last_month, day=last_day)
else: 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_to = date
date_from = date + timedelta(days=1) 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} return {'date_from': date_from, 'date_to': date_to}
def get_new_account_code(self, current_code, old_prefix, new_prefix, digits): def get_new_account_code(self, current_code, old_prefix, new_prefix, digits):
addons/website_quote/static/src/js/website_quotation.js
+6
View File
@@ -135,12 +135,18 @@ if(!$('.o_website_quote').length) {
case "h1": case "h1":
var id = self.setElementId('quote_header_', el); var id = self.setElementId('quote_header_', el);
var text = self.extractText($(el)); var text = self.extractText($(el));
if (!text) {
break;
}
last_li = $("<li>").append($('<a href="#'+id+'"/>').text(text)).appendTo(self.$el); last_li = $("<li>").append($('<a href="#'+id+'"/>').text(text)).appendTo(self.$el);
last_ul = false; last_ul = false;
break; break;
case "h2": case "h2":
var id = self.setElementId('quote_', el); var id = self.setElementId('quote_', el);
var text = self.extractText($(el)); var text = self.extractText($(el));
if (!text) {
break;
}
if (last_li) { if (last_li) {
if (!last_ul) { if (!last_ul) {
last_ul = $("<ul class='nav'>").appendTo(last_li); last_ul = $("<ul class='nav'>").appendTo(last_li);