From 275b5d1f77fef674ae6c8a87d5506e2bcce38963 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 11 Feb 2020 07:32:29 +0100
Subject: [PATCH 01/33] FIX #10309

---
 htdocs/core/lib/security.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 71d52f1bd9d..dc739220c07 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -122,7 +122,7 @@ function dol_hash($chain, $type = '0')
 	}
 
 	// Salt value
-	if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
+	if (! empty($conf->global->MAIN_SECURITY_SALT) && ( ! $type == '4' || ! $type == 'md5openldap')) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
 
 	if ($type == '1' || $type == 'sha1') return sha1($chain);
 	elseif ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));

From f19f706c386e8dc4f123bea2b6e9453eeccb29d6 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Thu, 13 Feb 2020 07:55:52 +0100
Subject: [PATCH 02/33] FIX better check

---
 htdocs/core/lib/security.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index dc739220c07..483567aa3d0 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -122,7 +122,7 @@ function dol_hash($chain, $type = '0')
 	}
 
 	// Salt value
-	if (! empty($conf->global->MAIN_SECURITY_SALT) && ( ! $type == '4' || ! $type == 'md5openldap')) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
+	if (! empty($conf->global->MAIN_SECURITY_SALT) && ($type !== '4' || $type !== 'md5openldap')) $chain = $conf->global->MAIN_SECURITY_SALT.$chain;
 
 	if ($type == '1' || $type == 'sha1') return sha1($chain);
 	elseif ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));

From 52506ddd05b3d73efec8b447aad32700b6c13186 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Thu, 13 Feb 2020 09:25:36 +0100
Subject: [PATCH 03/33] FIX can be a string or integer

---
 htdocs/core/lib/security.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 483567aa3d0..481339916a3 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -122,7 +122,7 @@ function dol_hash($chain, $type = '0')
 	}
 
 	// Salt value
-	if (! empty($conf->global->MAIN_SECURITY_SALT) && ($type !== '4' || $type !== 'md5openldap')) $chain = $conf->global->MAIN_SECURITY_SALT.$chain;
+	if (! empty($conf->global->MAIN_SECURITY_SALT) && ($type != '4' || $type !== 'md5openldap')) $chain = $conf->global->MAIN_SECURITY_SALT.$chain;
 
 	if ($type == '1' || $type == 'sha1') return sha1($chain);
 	elseif ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));

From 0ab0bb2e7de4049e17d7f801e63545f8acfb003c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 14 Feb 2020 19:26:28 +0100
Subject: [PATCH 04/33] FIX wrong test

---
 htdocs/core/lib/security.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 481339916a3..1a8045df014 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -122,7 +122,7 @@ function dol_hash($chain, $type = '0')
 	}
 
 	// Salt value
-	if (! empty($conf->global->MAIN_SECURITY_SALT) && ($type != '4' || $type !== 'md5openldap')) $chain = $conf->global->MAIN_SECURITY_SALT.$chain;
+	if (! empty($conf->global->MAIN_SECURITY_SALT) && $type != '4' && $type !== 'md5openldap') $chain = $conf->global->MAIN_SECURITY_SALT.$chain;
 
 	if ($type == '1' || $type == 'sha1') return sha1($chain);
 	elseif ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));

From a7ca7dfbb639521bcb3d7bf6615c1b35364d4e72 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 20 Feb 2020 06:00:17 +0100
Subject: [PATCH 05/33] FIX: z-index for moretabsList with constant
 MAIN_MAXTABS_IN_CARD

---
 htdocs/core/lib/functions.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9208ebb9a6e..ed50e236ffe 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1226,7 +1226,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 		$tabsname=str_replace("@", "", $picto);
 		$out.='<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';
 		$out.='<a href="#" class="tab moretab inline-block tabunactive reposition">'.$langs->trans("More").'... ('.$nbintab.')</a>';
-		$out.='<div id="moretabsList'.$tabsname.'" style="position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px">';
+		$out.='<div id="moretabsList'.$tabsname.'" style="position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px; z-index:10;">';
 		$out.=$outmore;
 		$out.='</div>';
 		$out.='<div></div>';

From 9ff424e23b63ef50ce3b52e67b33154dbe423aed Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Thu, 20 Feb 2020 11:45:46 +0100
Subject: [PATCH 06/33] FIX: Visualization rights correction on last modified
 contacts box

---
 htdocs/core/boxes/box_contacts.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 2d9d7e9461b..ebe7f8f9be0 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
  * Copyright (C) 2018      Josep Lluís Amador   <joseplluis@lliuretic.cat>
+ * Copyright (C) 2020      Ferran Marcet	    <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -90,7 +91,7 @@ class box_contacts extends ModeleBoxes
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
 			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND sp.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if ($user->societe_id) $sql.= " AND sp.fk_soc = ".$user->societe_id;
 			$sql.= " ORDER BY sp.tms DESC";
 			$sql.= $db->plimit($max, 0);

From ea19ab96c365fd38d7fc110b51f4ffa520b90046 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Feb 2020 14:41:36 +0100
Subject: [PATCH 07/33] Fix compatibility with php 7.4

---
 .../framework/Luracast/Restler/AutoLoader.php        |  8 +-------
 .../framework/Luracast/Restler/CommentParser.php     | 12 ++++++------
 .../framework/Luracast/Restler/Format/XmlFormat.php  |  2 +-
 .../restler/framework/Luracast/Restler/Resources.php |  6 +++---
 .../restler/framework/Luracast/Restler/Restler.php   |  4 ++--
 .../restler/framework/Luracast/Restler/Routes.php    |  6 +++---
 .../restler/framework/Luracast/Restler/Scope.php     |  2 +-
 .../restler/framework/Luracast/Restler/UI/Emmet.php  |  4 ++--
 8 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
index eff8bb61f29..d8445fdc70c 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
@@ -263,13 +263,7 @@ class AutoLoader
      * @return bool false unless className now exists
      */
     private function loadLastResort($className, $loader = null) {
-    	// @CHANGE LDR Add protection to avoid conflict with other autoloader
-    	/*print 'Try to load '.$className."\n";
-    	 if (in_array($className, array('Google_Client')))
-    	 {
-    	 return false;
-    	 }*/
-    	$loaders = array_unique(static::$rogueLoaders);
+        $loaders = array_unique(static::$rogueLoaders);
         if (isset($loader)) {
             if (false === array_search($loader, $loaders))
                 static::$rogueLoaders[] = $loader;
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php b/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
index e8248a385fa..2815f1f6c70 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
@@ -159,7 +159,7 @@ class CommentParser
                     $addNewline = true;
                 }
                 continue;
-            } elseif ($line{0} == '@') {
+            } elseif ($line[0] == '@') {
                 $mode = 2;
                 $newParam = true;
             }
@@ -353,7 +353,7 @@ class CommentParser
                     $data = $format->decode($str);
                 }
             } else { // auto detect
-                if ($str{0} == '{') {
+                if ($str[0] == '{') {
                     $d = json_decode($str, true);
                     if (json_last_error() != JSON_ERROR_NONE) {
                         throw new Exception('Error parsing embedded JSON data'
@@ -445,7 +445,7 @@ class CommentParser
     {
         $r = array();
         $email = end($value);
-        if ($email{0} == '<') {
+        if ($email[0] == '<') {
             $email = substr($email, 1, -1);
             array_pop($value);
             $r['email'] = $email;
@@ -470,7 +470,7 @@ class CommentParser
         $data = array_shift($value);
         if (empty($data)) {
             $r['type'] = 'mixed';
-        } elseif ($data{0} == '$') {
+        } elseif ($data[0] == '$') {
             $r['name'] = substr($data, 1);
             $r['type'] = 'mixed';
         } else {
@@ -478,7 +478,7 @@ class CommentParser
             $r['type'] = count($data) == 1 ? $data[0] : $data;
 
             $data = array_shift($value);
-            if (!empty($data) && $data{0} == '$') {
+            if (!empty($data) && $data[0] == '$') {
                 $r['name'] = substr($data, 1);
             }
         }
@@ -498,7 +498,7 @@ class CommentParser
         $data = array_shift($value);
         if (empty($data)) {
             $r['type'] = 'mixed';
-        } elseif ($data{0} == '$') {
+        } elseif ($data[0] == '$') {
             $r['name'] = substr($data, 1);
             $r['type'] = 'mixed';
         } else {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
index b51fa707a53..ceec32e4cb5 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
@@ -221,7 +221,7 @@ class XmlFormat extends Format
                 $namespaces = $xml->getNamespaces();
                 if (count($namespaces)) {
                     $p = strpos($data, $xml->getName());
-                    if ($p && $data{$p - 1} == ':') {
+                    if ($p && $data[$p - 1] == ':') {
                         $s = strpos($data, '<') + 1;
                         $prefix = substr($data, $s, $p - $s - 1);
                         static::$namespacedProperties[static::$rootName] = $prefix;
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Resources.php b/htdocs/includes/restler/framework/Luracast/Restler/Resources.php
index 43e95fa02be..2986968a990 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Resources.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Resources.php
@@ -198,7 +198,7 @@ class Resources implements iUseAuthentication, iProvideMultiVersionApi
         } elseif (false !== ($pos = strpos($id, '-v'))) {
             //$version = intval(substr($id, $pos + 2));
             $id = substr($id, 0, $pos);
-        } elseif ($id{0} == 'v' && is_numeric($v = substr($id, 1))) {
+        } elseif ($id[0] == 'v' && is_numeric($v = substr($id, 1))) {
             $id = '';
             //$version = $v;
         } elseif ($id == 'root' || $id == 'index') {
@@ -233,7 +233,7 @@ class Resources implements iUseAuthentication, iProvideMultiVersionApi
                 if ($tSlash) {
                     if ($fLen != $tLen && !Text::beginsWith($fullPath, $target . '/'))
                         continue;
-                } elseif ($fLen > $tLen + 1 && $fullPath{$tLen + 1} != '{' && !Text::beginsWith($fullPath, '{')) {
+                } elseif ($fLen > $tLen + 1 && $fullPath[$tLen + 1] != '{' && !Text::beginsWith($fullPath, '{')) {
                     //when mapped to root exclude paths that have static parts
                     //they are listed else where under that static part name
                     continue;
@@ -275,7 +275,7 @@ class Resources implements iUseAuthentication, iProvideMultiVersionApi
                 if (count($parts) == 1 && $httpMethod == 'GET') {
                 } else {
                     for ($i = 0; $i < count($parts); $i++) {
-                        if (strlen($parts[$i]) && $parts[$i]{0} == '{') {
+                        if (strlen($parts[$i]) && $parts[$i][0] == '{') {
                             $pos = $i - 1;
                             break;
                         }
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Restler.php b/htdocs/includes/restler/framework/Luracast/Restler/Restler.php
index c2e9b1acb73..fcb5388726c 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Restler.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Restler.php
@@ -533,7 +533,7 @@ class Restler extends EventDispatcher
             rtrim($path, '/') //remove trailing slash if found
         );
 
-        if (Defaults::$useUrlBasedVersioning && strlen($path) && $path{0} == 'v') {
+        if (Defaults::$useUrlBasedVersioning && strlen($path) && $path[0] == 'v') {
             $version = intval(substr($path, 1));
             if ($version && $version <= $this->apiVersion) {
                 $this->requestedApiVersion = $version;
@@ -1599,7 +1599,7 @@ class Restler extends EventDispatcher
      */
     public function __get($name)
     {
-        if ($name{0} == '_') {
+        if ($name[0] == '_') {
             $hiddenProperty = substr($name, 1);
             if (isset($this->$hiddenProperty)) {
                 return $this->$hiddenProperty;
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Routes.php b/htdocs/includes/restler/framework/Luracast/Restler/Routes.php
index 73e78dc0039..999094dec4c 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Routes.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Routes.php
@@ -87,7 +87,7 @@ class Routes
         foreach ($methods as $method) {
             $methodUrl = strtolower($method->getName());
             //method name should not begin with _
-            if ($methodUrl{0} == '_') {
+            if ($methodUrl[0] == '_') {
                 continue;
             }
             $doc = $method->getDocComment();
@@ -330,7 +330,7 @@ class Routes
         if (!$type) {
             return 's';
         }
-        switch ($type{0}) {
+        switch ($type[0]) {
             case 'i':
             case 'f':
                 return 'n';
@@ -428,7 +428,7 @@ class Routes
                     }
                     $index = intval(substr($k, 1));
                     $details = $value[$httpMethod]['metadata']['param'][$index];
-                    if ($k{0} == 's' || strpos($k, static::pathVarTypeOf($v)) === 0) {
+                    if ($k[0] == 's' || strpos($k, static::pathVarTypeOf($v)) === 0) {
                         //remove the newlines
                         $data[$details['name']] = trim($v, PHP_EOL);
                     } else {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Scope.php b/htdocs/includes/restler/framework/Luracast/Restler/Scope.php
index 251262017c3..16ccdd33561 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Scope.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Scope.php
@@ -203,7 +203,7 @@ class Scope
 
         $divider = '\\';
         $qualified = false;
-        if ($className{0} == $divider) {
+        if ($className[0] == $divider) {
             $qualified = trim($className, $divider);
         } elseif (array_key_exists($className, $scope)) {
             $qualified = $scope[$className];
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php
index abd4a3a73ba..435804b4469 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php
@@ -356,7 +356,7 @@ class Emmet
             $pos = strpos($string, $f, $start);
             $tokens = array();
             for ($i = $start; $i < $pos; $i++) {
-                $token = $string{$i};
+                $token = $string[$i];
                 if (('#' == $token || '.' == $token) &&
                     (!empty($tokens) || $i == 0)
                 ) {
@@ -368,7 +368,7 @@ class Emmet
             $r[] = $f;
         } while (false != ($f = strtok(static::DELIMITERS)));
         for ($i = $pos; $i < strlen($string); $i++) {
-            $token = $string{$i};
+            $token = $string[$i];
             $r[] = $tokens[] = $token;
         }
         return $r;

From 60f394a53c33d194826d61b3ef9c80f3a5c3ccd5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Feb 2020 17:07:22 +0100
Subject: [PATCH 08/33] Fix CSS for RTL languages

---
 htdocs/theme/eldy/global.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index fa4f751d6a6..2eebcb19a6b 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1297,7 +1297,7 @@ div.fichetwothirdright {
 	<?php if ($conf->browser->layout == 'phone') { print "padding-bottom: 6px\n"; } ?>
 }
 div.fichetwothirdright div.ficheaddleft {
-    padding-left: 20px;
+    padding-<?php echo $left; ?>: 20px;
 }
 div.fichehalfleft {
 	<?php if ($conf->browser->layout != 'phone') { print "float: ".$left.";\n"; } ?>

From f6eba3657505539fcab6f026effb23b7935c85d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 20 Feb 2020 09:45:17 +0100
Subject: [PATCH 09/33] fix CATEGORY_ADD_DESC_INTO_DOC

$cate->add_category doesn't exists
---
 htdocs/core/lib/pdf.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index a5ba08bb139..59035258c74 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1401,7 +1401,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		foreach ($tblcateg as $cate)
 		{
 			// Adding the descriptions if they are filled
-			$desccateg = $cate->add_description;
+			$desccateg = $cate->description;
 			if ($desccateg)
 				$libelleproduitservice .= '__N__'.$desccateg;
 		}

From 327b827fb45e6a693b3cc208d1fc1f0e0c9bda7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 21 Feb 2020 09:24:24 +0100
Subject: [PATCH 10/33] avoid warning if not an array

Conflicts:
	htdocs/projet/element.php
---
 htdocs/projet/element.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 46cf12356c5..ffd083d2359 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -606,7 +606,7 @@ foreach ($listofreferent as $key => $value)
 
 		$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field)?$project_field:'fk_projet');
 
-		if (count($elementarray)>0 && is_array($elementarray))
+		if (is_array($elementarray) && count($elementarray) > 0)
 		{
 			$total_ht = 0;
 			$total_ttc = 0;

From 8d507c4f3269456255507f788c4c1070f0e20b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 20 Feb 2020 15:11:31 +0100
Subject: [PATCH 11/33] fix workflow with multicurrency

---
 htdocs/compta/facture/class/facture.class.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index d4a7efd3cf4..99cc638c36f 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1156,6 +1156,14 @@ class Facture extends CommonInvoice
 			$line->date_start = $object->lines[$i]->date_start;
 			$line->date_end = $object->lines[$i]->date_end;
 
+			// Multicurrency
+			$line->fk_multicurrency = $object->lines[$i]->fk_multicurrency;
+			$line->multicurrency_code = $object->lines[$i]->multicurrency_code;
+			$line->multicurrency_subprice = $object->lines[$i]->multicurrency_subprice;
+			$line->multicurrency_total_ht = $object->lines[$i]->multicurrency_total_ht;
+			$line->multicurrency_total_tva = $object->lines[$i]->multicurrency_total_tva;
+			$line->multicurrency_total_ttc = $object->lines[$i]->multicurrency_total_ttc;
+
 			$line->fk_fournprice = $object->lines[$i]->fk_fournprice;
 			$marginInfos			= getMarginInfos($object->lines[$i]->subprice, $object->lines[$i]->remise_percent, $object->lines[$i]->tva_tx, $object->lines[$i]->localtax1_tx, $object->lines[$i]->localtax2_tx, $object->lines[$i]->fk_fournprice, $object->lines[$i]->pa_ht);
 			$line->pa_ht			= $marginInfos[0];
@@ -1170,6 +1178,7 @@ class Facture extends CommonInvoice
 
 		$this->socid                = $object->socid;
 		$this->fk_project           = $object->fk_project;
+		$this->fk_account = $object->fk_account;
 		$this->cond_reglement_id    = $object->cond_reglement_id;
 		$this->mode_reglement_id    = $object->mode_reglement_id;
 		$this->availability_id      = $object->availability_id;

From 559fc9f61ee0f471c1314c3261cd82c9eb05aab8 Mon Sep 17 00:00:00 2001
From: gmilad <61253440+gmilad@users.noreply.github.com>
Date: Sat, 22 Feb 2020 13:07:25 +0100
Subject: [PATCH 12/33] Update note.php

Fix : #13168
---
 htdocs/adherents/note.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index c12c45de8b7..6d50ab58f88 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -75,7 +75,7 @@ if ($id)
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	dol_banner_tab($object, 'rowid', $linkback);
+	dol_banner_tab($object, 'id', $linkback);
 
     print '<div class="fichecenter">';
 

From 295d42b47680fb7e475356971e311f1b2736d4ab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Feb 2020 14:19:23 +0100
Subject: [PATCH 13/33] Fix trans of status

---
 htdocs/cron/class/cronjob.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 5cde792bbb5..6139f157f8a 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -1320,9 +1320,9 @@ class Cronjob extends CommonObject
 			if ($processing) $moretext = ' ('.$langs->trans("Running").')';
 			elseif ($lastresult) $moretext .= ' ('.$langs->trans("Error").')';
 
-			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Draft').$moretext;
+			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled').$moretext;
 			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled').$moretext;
-			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Draft');
+			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled');
 			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled');
 		}
 

From 0ab16ed5ae22727622035eba824e11c38d76eb7c Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 23 Feb 2020 16:50:24 +0100
Subject: [PATCH 14/33] Fix #10179 discount split

---
 htdocs/comm/remx.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index aa9307df8d2..4e8da77c5c0 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -121,7 +121,7 @@ if ($action == 'confirm_split' && GETPOST("confirm") == 'yes')
 		$newdiscount2->datec=$discount->datec;
 		$newdiscount1->tva_tx=$discount->tva_tx;
 		$newdiscount2->tva_tx=$discount->tva_tx;
-		$newdiscount1->amount_ttc=$_POST["amount_ttc_1"];
+		$newdiscount1->amount_ttc=$amount_ttc_1;
 		$newdiscount2->amount_ttc=price2num($discount->amount_ttc-$newdiscount1->amount_ttc);
 		$newdiscount1->amount_ht=price2num($newdiscount1->amount_ttc/(1+$newdiscount1->tva_tx/100),'MT');
 		$newdiscount2->amount_ht=price2num($newdiscount2->amount_ttc/(1+$newdiscount2->tva_tx/100),'MT');

From ee45c3efb6f7d2a63fc43f7cea357a9d2fec1819 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Feb 2020 23:29:13 +0100
Subject: [PATCH 15/33] FIX #13184

---
 htdocs/core/class/extrafields.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 36b83bb32b7..57debc1311b 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -389,6 +389,7 @@ class ExtraFields
 		if (empty($required)) $required = 0;
 		if (empty($unique)) $unique = 0;
 		if (empty($alwayseditable)) $alwayseditable = 0;
+		if (empty($totalizable)) $totalizable = 0;
 
 		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname) && !is_numeric($attrname))
 		{
@@ -450,7 +451,7 @@ class ExtraFields
 			$sql .= "'" . $this->db->idate(dol_now()) . "',";
 			$sql.= " ".($enabled?"'".$this->db->escape($enabled)."'":"1").",";
 			$sql.= " ".($help?"'".$this->db->escape($help)."'":"null").",";
-			$sql.= " ".($totalizable?'1':'0');
+			$sql.= " ".($totalizable?'TRUE':'FALSE');
 			$sql.=')';
 
 			dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
@@ -793,7 +794,7 @@ class ExtraFields
 			$sql .= " '".$this->db->escape($alwayseditable)."',";
 			$sql .= " '".$this->db->escape($params)."',";
 			$sql .= " '".$this->db->escape($list)."', ";
-            $sql .= " ".$totalizable.",";
+            $sql .= " ".($totalizable?'TRUE':'FALSE').",";
 			$sql .= " ".(($default != '') ? "'".$this->db->escape($default)."'" : "null").",";
 			$sql .= " ".($computed ? "'".$this->db->escape($computed)."'" : "null").",";
 			$sql .= " ".$user->id.",";
@@ -932,7 +933,7 @@ class ExtraFields
 					$this->attributes[$tab->elementtype]['perms'][$tab->name]=(strlen($tab->perms) == 0 ? 1 : $tab->perms);
 					$this->attributes[$tab->elementtype]['langfile'][$tab->name]=$tab->langs;
 					$this->attributes[$tab->elementtype]['list'][$tab->name]=$tab->list;
-                    $this->attributes[$tab->elementtype]['totalizable'][$tab->name]=$tab->totalizable;
+                    $this->attributes[$tab->elementtype]['totalizable'][$tab->name]=($tab->totalizable ? 1 : 0);
 					$this->attributes[$tab->elementtype]['entityid'][$tab->name]=$tab->entity;
 					$this->attributes[$tab->elementtype]['enabled'][$tab->name]=$tab->enabled;
 					$this->attributes[$tab->elementtype]['help'][$tab->name]=$tab->help;

From 090b0e90d20aceed65805bd0950dd45703142f37 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Feb 2020 23:52:48 +0100
Subject: [PATCH 16/33] FIX #13183

---
 htdocs/install/upgrade2.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index c5d1d7837e9..b5cf6e4c9dd 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -5024,7 +5024,7 @@ function migrate_users_socialnetworks()
                 $obj->socialnetworks = '[]';
             }
             $socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true));
-            $sqlupd = 'UPDATE '.MAIN_DB_PREFIX.'user SET socialnetworks="'.$db->escape(json_encode($socialnetworks, true)).'"';
+            $sqlupd = 'UPDATE '.MAIN_DB_PREFIX."user SET socialnetworks='".$db->escape(json_encode($socialnetworks, true))."'";
             $sqlupd.= ', skype=null';
             $sqlupd.= ', twitter=null';
             $sqlupd.= ', facebook=null';

From 6366881f91e0a14cd3f9d02b5a8c3ad22448a95d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 00:41:25 +0100
Subject: [PATCH 17/33] FIX #13175

---
 .../bank/account_statement_document.php       |  6 +--
 htdocs/compta/bank/releve.php                 |  2 +-
 htdocs/core/photos_resize.php                 | 49 ++++++++++++-------
 .../tpl/document_actions_post_headers.tpl.php |  3 +-
 4 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index 08447216dda..bdb3ac4620e 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -137,9 +137,9 @@ if ($id > 0 || !empty($ref)) {
 		$modulepart = 'bank';
 		$permission = $user->rights->banque->modifier;
 		$permtoedit = $user->rights->banque->modifier;
-		$param = '&id='.$object->id.'&num='.$num;
-		$uri = '&num='.$num;
-		$relativepathwithnofile = $id."/statement/".$num."/";
+		$param = '&id='.$object->id.'&num='.urlencode($num);
+		$moreparam = '&num='.urlencode($num);;
+		$relativepathwithnofile = $id."/statement/".dol_sanitizeFileName($num)."/";
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 	}
 	else {
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 9ae1d5d7d83..a16927bda0b 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -49,7 +49,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 $langs->loadLangs(array("banks", "categories", "companies", "bills", "trips", "donations", "loan"));
 
 $action = GETPOST('action', 'alpha');
-$id = GETPOST('account', 'int');
+$id = GETPOST('account', 'int') ? GETPOST('account', 'int') : GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $dvid = GETPOST('dvid', 'alpha');
 $numref = GETPOST('num', 'alpha');
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 17c7cb9e974..dd59b20c964 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -38,6 +38,10 @@ $original_file = GETPOST("file");
 $backtourl = GETPOST('backtourl');
 $cancel = GETPOST('cancel', 'alpha');
 
+$file = GETPOST('file', 'alpha');
+$num = GETPOST('num', 'alpha');		// Used for document on bank statement
+
+
 // Security check
 if (empty($modulepart)) accessforbidden('Bad value for modulepart');
 $accessallowed = 0;
@@ -249,19 +253,25 @@ else {
 
 if (empty($backtourl))
 {
-    if (in_array($modulepart, array('product', 'produit', 'service', 'produit|service'))) $backtourl = DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('expensereport'))) $backtourl = DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('holiday')))       $backtourl = DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('member')))        $backtourl = DOL_URL_ROOT."/adherents/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('project')))       $backtourl = DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('propal')))        $backtourl = DOL_URL_ROOT."/comm/propal/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('societe')))       $backtourl = DOL_URL_ROOT."/societe/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('tax')))           $backtourl = DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('ticket')))        $backtourl = DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('user')))          $backtourl = DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('bank')))          $backtourl = DOL_URL_ROOT."/compta/bank/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('mrp')))           $backtourl = DOL_URL_ROOT."/mrp/mo_document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else $backtourl = DOL_URL_ROOT."/".$modulepart."/".$modulepart."_document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+	$regs = array();
+
+    if (in_array($modulepart, array('product', 'produit', 'service', 'produit|service'))) $backtourl = DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('expensereport'))) $backtourl = DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('holiday')))       $backtourl = DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('member')))        $backtourl = DOL_URL_ROOT."/adherents/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('project')))       $backtourl = DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('propal')))        $backtourl = DOL_URL_ROOT."/comm/propal/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('societe')))       $backtourl = DOL_URL_ROOT."/societe/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('tax')))           $backtourl = DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('ticket')))        $backtourl = DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('user')))          $backtourl = DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('bank')) && preg_match('/\/statement\/([^\/]+)\//', $file, $regs)) {
+    	$num = $regs[1];
+    	$backtourl = DOL_URL_ROOT."/compta/bank/account_statement_document.php?id=".$id.'&num='.urlencode($num).'&file='.urldecode($file);
+    }
+    elseif (in_array($modulepart, array('bank')))          $backtourl = DOL_URL_ROOT."/compta/bank/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('mrp')))           $backtourl = DOL_URL_ROOT."/mrp/mo_document.php?id=".$id.'&file='.urldecode($file);
+    else $backtourl = DOL_URL_ROOT."/".$modulepart."/".$modulepart."_document.php?id=".$id.'&file='.urldecode($file);
 }
 
 
@@ -283,11 +293,11 @@ if ($cancel)
 	}
 }
 
-if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POST["sizex"]) != "") && (isset($_POST["sizey"]) != ""))
+if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex") && GETPOSTISSET("sizey"))
 {
 	$fullpath = $dir."/".$original_file;
 
-	$result = dol_imageResizeOrCrop($fullpath, 0, $_POST['sizex'], $_POST['sizey']);
+	$result = dol_imageResizeOrCrop($fullpath, 0, GETPOST('sizex', 'int'), GETPOST('sizey', 'int'));
 
 	if ($result == $fullpath)
 	{
@@ -357,7 +367,7 @@ if ($action == 'confirm_crop')
 	$fullpath = $dir."/".$original_file;
 
 	//var_dump($_POST['w'].'x'.$_POST['h'].'-'.$_POST['x'].'x'.$_POST['y']);exit;
-	$result = dol_imageResizeOrCrop($fullpath, 1, $_POST['w'], $_POST['h'], $_POST['x'], $_POST['y']);
+	$result = dol_imageResizeOrCrop($fullpath, 1, GETPOST('w', 'int'), GETPOST('h', 'int'), GETPOST('x', 'int'), GETPOST('y', 'int'));
 
 	if ($result == $fullpath)
 	{
@@ -445,7 +455,7 @@ print '<br>'."\n";
  */
 
 print '<!-- Form to resize -->'."\n";
-print '<form name="redim_file" action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">';
+print '<form name="redim_file" action="'.$_SERVER["PHP_SELF"].'?id='.$id.($num ? '&num='.$num : '').'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print '<fieldset id="redim_file">';
@@ -454,7 +464,7 @@ print $langs->trans("ResizeDesc").'<br>';
 print $langs->trans("NewLength").': <input name="sizex" type="number" class="flat maxwidth50"> px  &nbsp; '.$langs->trans("or").' &nbsp; ';
 print $langs->trans("NewHeight").': <input name="sizey" type="number" class="flat maxwidth50"> px &nbsp; <br>';
 
-print '<input type="hidden" name="file" value="'.dol_escape_htmltag(GETPOST('file')).'" />';
+print '<input type="hidden" name="file" value="'.dol_escape_htmltag($file).'" />';
 print '<input type="hidden" name="action" value="confirm_resize" />';
 print '<input type="hidden" name="product" value="'.$id.'" />';
 print '<input type="hidden" name="modulepart" value="'.dol_escape_htmltag($modulepart).'" />';
@@ -497,7 +507,8 @@ if (!empty($conf->use_javascript_ajax))
 	print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$object->entity.'&file='.urlencode($original_file).'" alt="" id="cropbox" width="'.$widthforcrop.'px"/>';
 	print '</div>';
 	print '</div><br>';
-	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">';
+
+	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.($num ? '&num='.$num : '').'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '
 	      <div class="jc_coords">
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index a3de72723a4..2a3d703d16f 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -23,6 +23,7 @@
 // $permissiontoadd = permission or not to add a file (can use also $permission) and permission or not to edit file name or crop file (can use also $permtoedit)
 // $modulepart  = for download
 // $param       = param to add to download links
+// $moreparam   = param to add to download link for the form_attach_new_file function
 // $upload_dir
 // $object
 // $filearray
@@ -109,7 +110,7 @@ if (!isset($savingdocmask) || !empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_
 
 // Show upload form (document and links)
 $formfile->form_attach_new_file(
-    $_SERVER["PHP_SELF"].'?id='.$object->id.(empty($withproject)?'':'&withproject=1'),
+    $_SERVER["PHP_SELF"].'?id='.$object->id.(empty($withproject)?'':'&withproject=1').(empty($moreparam)?'':$moreparam),
     '',
     0,
     0,

From 4b4d1bcce21fbfd959eaa1760ca4947e0c1e0eae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 03:05:58 +0100
Subject: [PATCH 18/33] Fix disable accountancy chart that is deprecated.

---
 htdocs/accountancy/admin/account.php             | 3 +++
 htdocs/install/mysql/migration/10.0.0-11.0.0.sql | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 333efefbc9d..d75d61e347f 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -278,6 +278,8 @@ if ($resql)
 			<script type="text/javascript">
 			$(document).ready(function () {
 		    	$("#searchFormList").on("submit", function (e) {
+					//event.preventDefault();
+				    //var form = this;
 					console.log("chartofaccounts focus = "+$("#chartofaccounts").is(":focus"));
 					console.log("change_chart focus = "+$("#change_chart").is(":focus"));
 					if ($("#change_chart").is(":focus"))
@@ -285,6 +287,7 @@ if ($resql)
 						console.log("We set valid_change_chart to 1");
 						$("#valid_change_chart").val(1);
 					}
+					//form.submit();
 					return true;
 			    });
 			});
diff --git a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
index 9f3d092e846..7ebec468457 100644
--- a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
+++ b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
@@ -59,11 +59,14 @@ ALTER TABLE llx_emailcollector_emailcollectoraction ADD COLUMN position integer
 
 -- For v11
 
+
 ALTER TABLE llx_product_price MODIFY COLUMN tva_tx double(6,3) DEFAULT 0 NOT NULL;
 
 ALTER TABLE llx_facturedet MODIFY COLUMN situation_percent real DEFAULT 100;
 UPDATE llx_facturedet SET situation_percent = 100 WHERE situation_percent IS NULL AND fk_prev_id IS NULL;
 
+-- Set country to null for deprecated accounting system (there is now one per country)
+UPDATE llx_accounting_system SET fk_country = NULL, active = 0 WHERE pcg_version = 'SYSCOHADA';
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 20, 'BAS-K1-MINI', 'The Swedish mini chart of accounts', 1);
 
 ALTER TABLE llx_c_action_trigger MODIFY COLUMN elementtype varchar(64) NOT NULL;

From 3682d9143e13d50d6fb4f0b42790ce79ad45f71a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 04:55:09 +0100
Subject: [PATCH 19/33] Fix showing bank account on PDF

---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php  | 7 +++----
 htdocs/core/modules/facture/doc/pdf_sponge.modules.php | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 6b6c6bb2beb..bfa15ebd4b1 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1102,10 +1102,9 @@ class pdf_crabe extends ModelePDFFactures
 			// If payment mode not forced or forced to VIR, show payment with BAN
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
 			{
-				if (!empty($object->fk_account) || !empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER))
-				{
-					$bankid = (empty($object->fk_account) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-					if (!empty($object->fk_bank)) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+				if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER)) {
+					$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
+					if ($object->fk_bank > 0) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
 					$account = new Account($this->db);
 					$account->fetch($bankid);
 
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 0df384cdeb6..ecfd5818f51 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -1178,10 +1178,9 @@ class pdf_sponge extends ModelePDFFactures
 			// If payment mode not forced or forced to VIR, show payment with BAN
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
 			{
-				if (!empty($object->fk_account) || !empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER))
-				{
-					$bankid = (empty($object->fk_account) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-					if (!empty($object->fk_bank)) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+				if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER)) {
+					$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
+					if ($object->fk_bank > 0) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
 					$account = new Account($this->db);
 					$account->fetch($bankid);
 

From 2c26ddb22b2396078ee67ba129d4f3b444b66343 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consuliting.fr>
Date: Mon, 24 Feb 2020 15:11:14 +0100
Subject: [PATCH 20/33] fix missing column into import

---
 htdocs/core/modules/modSociete.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 2cc525bd8aa..1e567c3acd6 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -684,7 +684,8 @@ class modSociete extends DolibarrModules
             'sr.domiciliation' => "BankAccountDomiciliation",
             'sr.proprio' => "BankAccountOwner",
             'sr.owner_address' => "BankAccountOwnerAddress",
-            'sr.default_rib' => 'Default'
+            'sr.default_rib' => 'Default',
+            'sr.rum' => 'RUM',
         );
 
         $this->import_convertvalue_array[$r] = array(
@@ -712,6 +713,7 @@ class modSociete extends DolibarrModules
             'sr.proprio' => 'name on the bank account',
             'sr.owner_address' => 'address of account holder',
             'sr.default_rib' => '1 (default account) / 0 (not default)'
+            'sr.rum' => 'RUM code'
         );
 
 		// Import Company Sales representatives

From b2b229111756876f6e9e5bdf6dbd8e8fcd7643d7 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consuliting.fr>
Date: Mon, 24 Feb 2020 15:12:26 +0100
Subject: [PATCH 21/33] fix missing column into import

---
 htdocs/core/modules/modSociete.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 1e567c3acd6..0a231ca7fc1 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -712,7 +712,7 @@ class modSociete extends DolibarrModules
             'sr.domiciliation' => 'bank branch address eg. "PARIS"',
             'sr.proprio' => 'name on the bank account',
             'sr.owner_address' => 'address of account holder',
-            'sr.default_rib' => '1 (default account) / 0 (not default)'
+            'sr.default_rib' => '1 (default account) / 0 (not default)',
             'sr.rum' => 'RUM code'
         );
 

From 9f8166ed37f31a78f910e1005bfe4edc3d1065ef Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consuliting.fr>
Date: Mon, 24 Feb 2020 15:14:01 +0100
Subject: [PATCH 22/33] fix missing column into import

---
 htdocs/core/modules/modSociete.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 0a231ca7fc1..ae093a25322 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -686,6 +686,7 @@ class modSociete extends DolibarrModules
             'sr.owner_address' => "BankAccountOwnerAddress",
             'sr.default_rib' => 'Default',
             'sr.rum' => 'RUM',
+			'sr.type' => "Type ban is defaut",
         );
 
         $this->import_convertvalue_array[$r] = array(
@@ -713,7 +714,8 @@ class modSociete extends DolibarrModules
             'sr.proprio' => 'name on the bank account',
             'sr.owner_address' => 'address of account holder',
             'sr.default_rib' => '1 (default account) / 0 (not default)',
-            'sr.rum' => 'RUM code'
+            'sr.rum' => 'RUM code',
+			'sr.type' => 'ban',
         );
 
 		// Import Company Sales representatives

From 2118c2eede184a264d92f6e7fb6472398933121e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 23:04:17 +0100
Subject: [PATCH 23/33] Fix missing title line

---
 htdocs/accountancy/admin/defaultaccounts.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 611aa8fc321..c0c3f835481 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -161,6 +161,7 @@ print '<input type="hidden" name="action" value="update">';
 // Define main accounts for thirdparty
 
 print '<table class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("ThirdParties").' | '.$langs->trans("Users").'</td><td></td></tr>';
 
 foreach ($list_account_main as $key) {
     print '<tr class="oddeven value">';
@@ -180,15 +181,6 @@ foreach ($list_account_main as $key) {
 }
 
 
-print "</table>\n";
-
-
-print '<br>';
-
-// Define default accounts
-
-print '<table class="noborder centpercent">';
-
 foreach ($list_account as $key) {
 	$reg=array();
 	if (preg_match('/---(.*)---/', $key, $reg)) {

From 2067abdc7e2c685347f0b5871ee9fa04992d93c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 23:10:04 +0100
Subject: [PATCH 24/33] Fix title of page

---
 htdocs/accountancy/admin/export.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index edc73688389..b2262c603f9 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -134,13 +134,13 @@ if ($action == 'update') {
 
 $form = new Form($db);
 
-$title = $langs->trans('ConfigAccountingExpert');
+$title = $langs->trans('ExportOptions');
 llxHeader('', $title);
 
 
 $linkback = '';
 // $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
-print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'accountancy');
+print load_fiche_titre($langs->trans('ExportOptions'), $linkback, 'accountancy');
 
 
 print "\n".'<script type="text/javascript" language="javascript">'."\n";

From 5516c8ce81de9b3cffd9029d580b054024b18e9b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 00:51:06 +0100
Subject: [PATCH 25/33] FIX Submit of documents for supplier invoices.

---
 htdocs/api/class/api_documents.class.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 4785ab78174..75e27ad0e0d 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -418,8 +418,9 @@ class Documents extends DolibarrApi
 	/**
 	 * Upload a file.
 	 *
-	 * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
-	 * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "image/mywebsite", "filecontent": "Y29udGVudCB0ZXh0Cg==", "fileencoding": "base64", "overwriteifexists": "0" }.
+	 * Test sample for invoice: { "filename": "mynewfile.txt", "modulepart": "invoice", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
+	 * Test sample for supplier invoice: { "filename": "mynewfile.txt", "modulepart": "supplier_invoice", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
+	 * Test sample for medias file: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "image/mywebsite", "filecontent": "Y29udGVudCB0ZXh0Cg==", "fileencoding": "base64", "overwriteifexists": "0" }.
 	 *
 	 * @param   string  $filename           Name of file to create ('FA1705-0123.txt')
 	 * @param   string  $modulepart         Name of module or area concerned by file upload ('facture', 'project', 'project_task', ...)
@@ -476,6 +477,13 @@ class Documents extends DolibarrApi
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$object = new Facture($this->db);
 			}
+			elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
+			{
+				$modulepart = 'supplier_invoice';
+
+				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+				$object = new FactureFournisseur($this->db);
+			}
 			elseif ($modulepart == 'project')
 			{
 				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -535,6 +543,12 @@ class Documents extends DolibarrApi
    				throw new RestException(404, 'The object '.$modulepart." with ref '".$ref."' was not found.");
 			}
 
+			// Special cases that need to use get_exdir to get real dir of object
+			// If future, all object should use this to define path of documents.
+			if ($modulepart == 'supplier_invoice') {
+				$tmpreldir = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier');
+			}
+
 			$relativefile = $tmpreldir.dol_sanitizeFileName($object->ref);
 
 			$tmp = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, $ref, 'write');

From b565881b31f74553076eb02dacd6b7f2b1a1a818 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 25 Feb 2020 12:58:27 +0100
Subject: [PATCH 26/33] Create README-DE.md

---
 doc/user/README-DE.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 doc/user/README-DE.md

diff --git a/doc/user/README-DE.md b/doc/user/README-DE.md
new file mode 100644
index 00000000000..ea9458f4563
--- /dev/null
+++ b/doc/user/README-DE.md
@@ -0,0 +1,12 @@
+README (german)
+LiesMich (deutsch)
+
+--------------------------------
+Benutzeranleitung
+--------------------------------
+
+Alle Dolibarr-Informationen sind online verfuegbar ueber die Webseiten:
+https://www.dolibarr.de 
+oder
+https://www.dolibarr.org
+https://wiki.dolibarr.org

From 91f7a14602552e0c793d0b5c015ce1cde9d64f6f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 14:16:40 +0100
Subject: [PATCH 27/33] FIX API to push an expense report

---
 .../class/api_expensereports.class.php        | 33 +++++++++++-
 .../class/expensereport.class.php             | 51 +++++++++++++------
 2 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 60e5eafcb48..7fdd731aa88 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -33,7 +33,7 @@ class ExpenseReports extends DolibarrApi
      * @var array   $FIELDS     Mandatory fields, checked when create and update object
      */
     static $FIELDS = array(
-        'socid'
+        'fk_user_author'
     );
 
     /**
@@ -501,6 +501,11 @@ class ExpenseReports extends DolibarrApi
         // phpcs:enable
         $object = parent::_cleanObjectDatas($object);
 
+        unset($object->fk_statut);
+        unset($object->statut);
+        unset($object->user);
+        unset($object->thirdparty);
+
         unset($object->cond_reglement);
         unset($object->shipping_method_id);
 
@@ -509,6 +514,32 @@ class ExpenseReports extends DolibarrApi
         unset($object->barcode_type_label);
         unset($object->barcode_type_coder);
 
+        unset($object->code_paiement);
+        unset($object->code_statut);
+        unset($object->fk_c_paiement);
+        unset($object->fk_incoterms);
+        unset($object->label_incoterms);
+        unset($object->location_incoterms);
+        unset($object->mode_reglement_id);
+        unset($object->cond_reglement_id);
+
+        unset($object->name);
+        unset($object->lastname);
+        unset($object->firstname);
+        unset($object->civility_id);
+        unset($object->cond_reglement_id);
+        unset($object->contact);
+        unset($object->contact_id);
+
+        unset($object->state);
+        unset($object->state_id);
+        unset($object->state_code);
+        unset($object->country);
+        unset($object->country_id);
+        unset($object->country_code);
+
+        unset($object->note);	// We already use note_public and note_pricate
+
         return $object;
     }
 
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 05272aa2ff7..869e1b84e90 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -58,19 +58,20 @@ class ExpenseReport extends CommonObject
 
     public $date_fin;
 
+    /**
+     * 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
+     *
+     * @var int		Status
+     */
     public $status;
-    public $fk_statut; // -- 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
+    public $fk_statut;
+
     public $fk_c_paiement;
     public $paid;
 
     public $user_author_infos;
     public $user_validator_infos;
 
-    public $fk_typepayment;
-	public $num_payment;
-    public $code_paiement;
-    public $code_statut;
-
     // ACTIONS
 
     // Create
@@ -285,10 +286,33 @@ class ExpenseReport extends CommonObject
             {
                 if (is_array($this->lines) && count($this->lines) > 0)
                 {
-    	            foreach ($this->lines as $i => $val)
+    	            foreach ($this->lines as $line)
     	            {
+    	            	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
+    	            	//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
+    	            	if (!is_object($line)) {
+    	            		$line = (object) $line;
+    	            		$newndfline = new ExpenseReportLine($this->db);
+    	            		$newndfline->fk_expensereport = $line->fk_expensereport;
+    	            		$newndfline->fk_c_type_fees = $line->fk_c_type_fees;
+    	            		$newndfline->fk_project = $line->fk_project;
+    	            		$newndfline->vatrate = $line->vatrate;
+    	            		$newndfline->vat_src_code = $line->vat_src_code;
+    	            		$newndfline->comments = $line->comments;
+    	            		$newndfline->qty = $line->qty;
+    	            		$newndfline->value_unit = $line->value_unit;
+    	            		$newndfline->total_ht = $line->total_ht;
+    	            		$newndfline->total_ttc = $line->total_ttc;
+    	            		$newndfline->total_tva = $line->total_tva;
+    	            		$newndfline->date = $line->date;
+    	            		$newndfline->rule_warning_message = $line->rule_warning_message;
+    	            		$newndfline->fk_c_exp_tax_cat = $line->fk_c_exp_tax_cat;
+    	            		$newndfline->fk_ecm_files = $line->fk_ecm_files;
+    	            	}
+    	            	else {
+    	            		$newndfline = $line;
+    	            	}
     	                //$newndfline=new ExpenseReportLine($this->db);
-    	                $newndfline = $this->lines[$i];
     	                $newndfline->fk_expensereport = $this->id;
     	                $result = $newndfline->insert();
         	            if ($result < 0)
@@ -514,10 +538,8 @@ class ExpenseReport extends CommonObject
         $sql .= " d.date_debut, d.date_fin, d.date_create, d.tms as date_modif, d.date_valid, d.date_approve,"; // DATES (datetime)
         $sql .= " d.fk_user_author, d.fk_user_modif, d.fk_user_validator,";
         $sql .= " d.fk_user_valid, d.fk_user_approve,";
-        $sql .= " d.fk_statut as status, d.fk_c_paiement, d.paid,";
-        $sql .= " dp.libelle as label_payment, dp.code as code_paiement"; // INNER JOIN paiement
+        $sql .= " d.fk_statut as status, d.fk_c_paiement, d.paid";
         $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as dp ON d.fk_c_paiement = dp.id";
         if ($ref) $sql .= " WHERE d.ref = '".$this->db->escape($ref)."'";
         else $sql .= " WHERE d.rowid = ".$id;
         //$sql.= $restrict;
@@ -566,7 +588,7 @@ class ExpenseReport extends CommonObject
                 elseif ($this->fk_user_validator > 0) $user_approver->fetch($this->fk_user_validator); // For backward compatibility
                 $this->user_validator_infos = dolGetFirstLastname($user_approver->firstname, $user_approver->lastname);
 
-                $this->fk_statut                = $obj->status;
+                $this->fk_statut                = $obj->status;		// deprecated
                 $this->status                   = $obj->status;
                 $this->fk_c_paiement            = $obj->fk_c_paiement;
                 $this->paid                     = $obj->paid;
@@ -578,9 +600,6 @@ class ExpenseReport extends CommonObject
                     $this->user_valid_infos = dolGetFirstLastname($user_valid->firstname, $user_valid->lastname);
                 }
 
-                $this->code_statut      = $obj->code_statut;
-                $this->code_paiement    = $obj->code_paiement;
-
                 $this->lines = array();
 
                 $result = $this->fetch_lines();
@@ -2650,7 +2669,7 @@ class ExpenseReportLine
         $sql .= " ".$this->db->escape($this->total_ht).",";
         $sql .= " ".$this->db->escape($this->total_tva).",";
         $sql .= " ".$this->db->escape($this->total_ttc).",";
-        $sql .= "'".$this->db->idate($this->date)."',";
+        $sql .= " '".$this->db->idate($this->date)."',";
 		$sql .= " '".$this->db->escape($this->rule_warning_message)."',";
 		$sql .= " ".$this->db->escape($this->fk_c_exp_tax_cat).",";
 		$sql .= " ".($this->fk_ecm_files > 0 ? $this->fk_ecm_files : 'null');

From f38661451145f1dd33ca9c7fdad08bb916ecb364 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 14:29:41 +0100
Subject: [PATCH 28/33] Doc

---
 htdocs/expensereport/class/api_expensereports.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 7fdd731aa88..770d39ec951 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -384,6 +384,10 @@ class ExpenseReports extends DolibarrApi
      * @param array $request_data   Datas
      *
      * @return int
+     *
+     * @throws	RestException	401		Not allowed
+     * @throws  RestException	404		Expense report not found
+     * @throws	RestException	500
      */
     public function put($id, $request_data = null)
     {

From 69c2f4bd27d66af36ff28b5f5280d1ae9a5acae6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 14:36:05 +0100
Subject: [PATCH 29/33] FIX API upload/download doc for expensereport

---
 htdocs/api/class/api_documents.class.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 75e27ad0e0d..ebfe3d7b0e0 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -387,6 +387,22 @@ class Documents extends DolibarrApi
 
 			$upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($object->ref);
 		}
+		elseif ($modulepart == 'expensereport')
+		{
+			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+
+			if (!DolibarrApiAccess::$user->rights->expensereport->read && !DolibarrApiAccess::$user->rights->expensereport->read) {
+				throw new RestException(401);
+			}
+
+			$object = new ExpenseReport($this->db);
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
+				throw new RestException(404, 'Expense report not found');
+			}
+
+			$upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object->ref);
+		}
 		else
 		{
 			throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
@@ -518,6 +534,11 @@ class Documents extends DolibarrApi
 				require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 				$object = new Product($this->db);
 			}
+			elseif ($modulepart == 'expensereport')
+			{
+				require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+				$object = new ExpenseReport($this->db);
+			}
 			// TODO Implement additional moduleparts
 			else
 			{

From b7a0de11c680a513a0bce5dbe7688f01e2ddb426 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 14:47:05 +0100
Subject: [PATCH 30/33] FIX API Get list of documents for supplier_invoice

---
 htdocs/api/class/api_documents.class.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index ebfe3d7b0e0..c8ec14c0c5e 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -230,7 +230,7 @@ class Documents extends DolibarrApi
 	/**
 	 * Return the list of documents of a dedicated element (from its ID or Ref)
 	 *
-	 * @param   string 	$modulepart		Name of module or area concerned ('thirdparty', 'member', 'proposal', 'order', 'invoice', 'shipment', 'project',  ...)
+	 * @param   string 	$modulepart		Name of module or area concerned ('thirdparty', 'member', 'proposal', 'order', 'invoice', 'supplier_invoice', 'shipment', 'project',  ...)
 	 * @param	int		$id				ID of element
 	 * @param	string	$ref			Ref of element
 	 * @param	string	$sortfield		Sort criteria ('','fullname','relativename','name','date','size')
@@ -355,6 +355,24 @@ class Documents extends DolibarrApi
 
 			$upload_dir = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
 		}
+		elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
+		{
+			$modulepart = 'supplier_invoice';
+
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+
+			if (!DolibarrApiAccess::$user->rights->fournisseur->facture->lire) {
+				throw new RestException(401);
+			}
+
+			$object = new FactureFournisseur($this->db);
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
+				throw new RestException(404, 'Invoice not found');
+			}
+
+			$upload_dir = $conf->fournisseur->dir_output."/facture/".get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').dol_sanitizeFileName($object->ref);
+		}
         elseif ($modulepart == 'produit' || $modulepart == 'product')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

From ec108162e37f38ddc9ad40caa7c7cb3c86d35582 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 15:14:37 +0100
Subject: [PATCH 31/33] Fix GETPOST

---
 htdocs/fourn/facture/card.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 6ab40c3924c..f901500cc6f 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -657,7 +657,7 @@ if (empty($reshook))
 				$_GET['socid'] = $_POST['socid'];
 				$error++;
 			}
-			if (!($_POST['fac_replacement'] > 0)) {
+			if (! (GETPOST('fac_replacement', 'int') > 0)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ReplaceInvoice")), null, 'errors');
 			}
@@ -870,7 +870,7 @@ if (empty($reshook))
 				if (!$error && $_POST['origin'] && $_POST['originid'])
 				{
 					// Parse element/subelement (ex: project_task)
-					$element = $subelement = GETPOST('origin');
+					$element = $subelement = GETPOST('origin', 'alpha');
 					/*if (preg_match('/^([^_]+)_([^_]+)/i',$_POST['origin'],$regs))
 					 {
 					$element = $regs[1];
@@ -894,8 +894,8 @@ if (empty($reshook))
 					{
 						$element = 'projet';
 					}
-					$object->origin    = GETPOST('origin');
-					$object->origin_id = GETPOST('originid');
+					$object->origin    = GETPOST('origin', 'alpha');
+					$object->origin_id = GETPOST('originid', 'int');
 
 
 					require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php';

From c38e88ca46e3489dce9a9099e26f0c6ca5686a9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Feb 2020 06:39:02 +0100
Subject: [PATCH 32/33] FIX Bad sort link in accounting report

---
 htdocs/compta/resultat/clientfourn.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index ee76a29d282..0a60e928db9 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -67,8 +67,7 @@ if (!$sortorder) $sortorder = 'ASC';
 
 // Date range
 $year = GETPOST('year', 'int');
-if (empty($year))
-{
+if (empty($year)) {
     $year_current = strftime("%Y", dol_now());
     $month_current = strftime("%m", dol_now());
     $year_start = $year_current;
@@ -114,7 +113,7 @@ $tmps = dol_getdate($date_start);
 $year_start = $tmps['year'];
 $tmpe = dol_getdate($date_end);
 $year_end = $tmpe['year'];
-$nbofyear = ($year_end - $start_year) + 1;
+$nbofyear = ($year_end - $year_start) + 1;
 //var_dump("year_start=".$year_start." year_end=".$year_end." nbofyear=".$nbofyear." date_start=".dol_print_date($date_start, 'dayhour')." date_end=".dol_print_date($date_end, 'dayhour'));
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
@@ -199,11 +198,15 @@ if ($date_startmonth) $param .= '&date_startmonth='.$date_startmonth;
 if ($date_startyear) $param .= '&date_startyear='.$date_startyear;
 if ($date_endday) $param .= '&date_endday='.$date_endday;
 if ($date_endmonth) $param .= '&date_endmonth='.$date_endmonth;
-if ($date_endyear) $param .= '&date_endyear='.$date_startyear;
+if ($date_endyear) $param .= '&date_endyear='.$date_endyear;
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print_liste_field_titre("PredefinedGroups", $_SERVER["PHP_SELF"], 'f.thirdparty_code,f.rowid', '', $param, '', $sortfield, $sortorder, 'width200 ');
+if ($modecompta == 'BOOKKEEPING') {
+	print_liste_field_titre("PredefinedGroups", $_SERVER["PHP_SELF"], 'f.thirdparty_code,f.rowid', '', $param, '', $sortfield, $sortorder, 'width200 ');
+} else {
+	print_liste_field_titre("", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'width200 ');
+}
 print_liste_field_titre('');
 if ($modecompta == 'BOOKKEEPING')
 {

From 114e41108df21ea476cd50f5a9ef827bb65134e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Feb 2020 06:43:21 +0100
Subject: [PATCH 33/33] FIX sort link

---
 htdocs/compta/resultat/clientfourn.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 0a60e928db9..a07aacd127f 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -192,7 +192,7 @@ if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 }
 
 // Show report array
-$param = '&modecompta='.$modecompta;
+$param = '&modecompta='.urlencode($modecompta).'&showaccountdetail='.urlencode($showaccountdetail);
 if ($date_startday) $param .= '&date_startday='.$date_startday;
 if ($date_startmonth) $param .= '&date_startmonth='.$date_startmonth;
 if ($date_startyear) $param .= '&date_startyear='.$date_startyear;