diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-31 15:07:09 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-31 15:07:09 +0100 |
| commit | 49cb3d8fad124fa6d6dbe341aec8159e52e26fc1 (patch) | |
| tree | 42df9d9dc360aa6b734f660d757bf01d9113b489 | |
| parent | c50e82c127082f5202cced4bf30bc166bdb9efca (diff) | |
| parent | aeed32d4ffd8529da3c3fbcb091397ca375057f0 (diff) | |
[MERGE] forward port branch saas-11.3 up to aeed32d4ffd
| -rw-r--r-- | addons/web/static/lib/tempusdominus/tempusdominus.js | 7 | ||||
| -rw-r--r-- | odoo/addons/base/models/ir_actions_report.py | 3 | ||||
| -rw-r--r-- | setup.cfg | 2 | ||||
| -rw-r--r-- | setup/redhat/postinstall.sh | 6 |
4 files changed, 15 insertions, 3 deletions
diff --git a/addons/web/static/lib/tempusdominus/tempusdominus.js b/addons/web/static/lib/tempusdominus/tempusdominus.js index a5dac48ac3a..aea7500b571 100644 --- a/addons/web/static/lib/tempusdominus/tempusdominus.js +++ b/addons/web/static/lib/tempusdominus/tempusdominus.js @@ -2093,6 +2093,9 @@ var TempusDominusBootstrap4 = function ($) { } currentDate = this._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) @@ -2125,7 +2128,9 @@ var TempusDominusBootstrap4 = function ($) { if (!this._isValid(currentDate, 'd')) { clsName += ' disabled'; } - if (currentDate.isSame(this.getMoment(), 'd')) { + // !! ODOO FIX START !! + if (currentDate.date() === now.date() && currentDate.month() === now.month() && currentDate.year() === now.year()) { + // !! ODOO FIX END !! clsName += ' 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 e99551e0720..027f2abd29b 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__) @@ -643,7 +644,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. diff --git a/setup.cfg b/setup.cfg index ea31e808da9..33f97e70429 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,7 +9,7 @@ requires = libxslt-python pychart pyparsing - python(abi) = 3.6 + python(abi) >= 3.6 python3-babel python3-decorator python3-docutils diff --git a/setup/redhat/postinstall.sh b/setup/redhat/postinstall.sh index 54b1b5cd56f..e6ee9106f7d 100644 --- a/setup/redhat/postinstall.sh +++ b/setup/redhat/postinstall.sh @@ -10,6 +10,12 @@ ODOO_LOG_DIR=/var/log/odoo ODOO_LOG_FILE=$ODOO_LOG_DIR/odoo-server.log ODOO_USER="odoo" +if [ -d /usr/lib/python3.7 ]; then + SITE_PACK_DIR37=/usr/lib/python3.7/site-packages + [[ ! -d ${SITE_PACK_DIR37} ]] && mkdir -p ${SITE_PACK_DIR37} + ln -s /usr/lib/python3.6/site-packages/odoo ${SITE_PACK_DIR37}/odoo +fi + if ! getent passwd | grep -q "^odoo:"; then groupadd $ODOO_GROUP adduser --system --no-create-home $ODOO_USER -g $ODOO_GROUP |