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

[MERGE] forward port branch 11.0 up to 1dbe4ea0d7

Browse Source
This commit is contained in:
Christophe Simonis
2019-01-30 17:10:34 +01:00
parent 5ad3d599ce 1dbe4ea0d7
commit aeed32d4ff
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js
Vendored
+6 -1
View File
@@ -723,6 +723,9 @@
} }
currentDate = viewDate.clone().startOf('M').startOf('w').startOf('d'); currentDate = viewDate.clone().startOf('M').startOf('w').startOf('d');
// !! ODOO FIX START !!
var now = getMoment();
// !! ODOO FIX END !!
for (i = 0; i < 42; i++) { //always display 42 days (should show 6 weeks) for (i = 0; i < 42; i++) { //always display 42 days (should show 6 weeks)
if (currentDate.weekday() === 0) { if (currentDate.weekday() === 0) {
@@ -745,7 +748,9 @@
if (!isValid(currentDate, 'd')) { if (!isValid(currentDate, 'd')) {
clsNames.push('disabled'); clsNames.push('disabled');
} }
if (currentDate.isSame(getMoment(), 'd')) { // !! ODOO FIX START !!
if (currentDate.date() === now.date() && currentDate.month() === now.month() && currentDate.year() === now.year()) {
// !! ODOO FIX END !!
clsNames.push('today'); clsNames.push('today');
} }
if (currentDate.day() === 0 || currentDate.day() === 6) { if (currentDate.day() === 0 || currentDate.day() === 6) {
odoo/addons/base/models/ir_actions_report.py
+2 -1
View File
@@ -23,6 +23,7 @@ from contextlib import closing
from distutils.version import LooseVersion from distutils.version import LooseVersion
from reportlab.graphics.barcode import createBarcodeDrawing from reportlab.graphics.barcode import createBarcodeDrawing
from PyPDF2 import PdfFileWriter, PdfFileReader from PyPDF2 import PdfFileWriter, PdfFileReader
from collections import OrderedDict
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
@@ -604,7 +605,7 @@ class IrActionsReport(models.Model):
if isinstance(self.env.cr, TestCursor): if isinstance(self.env.cr, TestCursor):
return self.with_context(context).render_qweb_html(res_ids, data=data)[0] return self.with_context(context).render_qweb_html(res_ids, data=data)[0]
save_in_attachment = {} save_in_attachment = OrderedDict()
if res_ids: if res_ids:
# Dispatch the records by ones having an attachment and ones requesting a call to # Dispatch the records by ones having an attachment and ones requesting a call to
# wkhtmltopdf. # wkhtmltopdf.