[MERGE] forward port branch saas-11.3 up to aeed32d

Author: KangOl

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) {

odoo/addons/base/models/ir_actions_report.py

@@ -23,6 +23,7 @@
 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 @@ def render_qweb_pdf(self, res_ids=None, data=None):
         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.

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

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