diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-30 17:10:34 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-30 17:10:34 +0100 |
| commit | aeed32d4ffd8529da3c3fbcb091397ca375057f0 (patch) | |
| tree | 6fa412e7e3d8d3bca8f6fcac57502c90d633ae24 | |
| parent | 5ad3d599ceeb265efcc5daee57a7d44cbd8c872c (diff) | |
| parent | 1dbe4ea0d7f63d299b48edd6e55accb15a3632d2 (diff) | |
[MERGE] forward port branch 11.0 up to 1dbe4ea0d7f
| -rw-r--r-- | addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js | 7 | ||||
| -rw-r--r-- | odoo/addons/base/models/ir_actions_report.py | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js b/addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js index 19f261ff4fc..5acf922f59b 100644 --- a/addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js +++ b/addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js @@ -723,6 +723,9 @@ } 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) if (currentDate.weekday() === 0) { @@ -745,7 +748,9 @@ if (!isValid(currentDate, 'd')) { 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'); } if (currentDate.day() === 0 || currentDate.day() === 6) { diff --git a/odoo/addons/base/models/ir_actions_report.py b/odoo/addons/base/models/ir_actions_report.py index d051e501466..7cc2c9fe003 100644 --- a/odoo/addons/base/models/ir_actions_report.py +++ b/odoo/addons/base/models/ir_actions_report.py @@ -23,6 +23,7 @@ from contextlib import closing from distutils.version import LooseVersion from reportlab.graphics.barcode import createBarcodeDrawing from PyPDF2 import PdfFileWriter, PdfFileReader +from collections import OrderedDict _logger = logging.getLogger(__name__) @@ -604,7 +605,7 @@ class IrActionsReport(models.Model): if isinstance(self.env.cr, TestCursor): return self.with_context(context).render_qweb_html(res_ids, data=data)[0] - save_in_attachment = {} + save_in_attachment = OrderedDict() if res_ids: # Dispatch the records by ones having an attachment and ones requesting a call to # wkhtmltopdf. |