Merge branch 'master-upstream-patch-yusuf' into 'master-parthiv-upstream'

[FIX] Test cases for Mail and HR

See merge request flectra-hq/flectra!201

setup/redhat/postinstall.sh

@@ -10,6 +10,12 @@ FLECTRA_LOG_DIR=/var/log/flectra
 FLECTRA_LOG_FILE=$FLECTRA_LOG_DIR/flectra-server.log
 FLECTRA_USER="flectra"
 
+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/flectra ${SITE_PACK_DIR37}/flectra
+fi
+
 if ! getent passwd | grep -q "^flectra:"; then
     groupadd $FLECTRA_GROUP
     adduser --system --no-create-home $FLECTRA_USER -g $FLECTRA_GROUP

setup/win32/winpy_requirements.txt

@@ -28,7 +28,7 @@ pyusb==1.0.0
 PyYAML==3.12
 qrcode==5.3
 reportlab>=3.3.0
-requests==2.11.1
+requests==2.20.0
 six==1.10.0
 suds-jurko==0.6
 vatnumber==1.2