From 75ed5e45f2f1a69ae2dd17059862ab08344fd385 Mon Sep 17 00:00:00 2001
From: Pierre Payet <pierre.p@synergies-france.fr>
Date: Tue, 13 Apr 2021 17:21:51 +0200
Subject: [PATCH 1/3] fix date closing option position

---
 htdocs/compta/facture/list.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index ca2a8f6ae44..f427466c560 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1016,11 +1016,6 @@ if ($resql)
 		print '<td class="liste_titre right">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.date_closing']['checked']))
-	{
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
 	if (!empty($arrayfields['total_pa']['checked']))
 	{
 		print '<td class="liste_titre right">';
@@ -1061,6 +1056,12 @@ if ($resql)
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
+	// Date closing
+	if (!empty($arrayfields['f.date_closing']['checked']))
+	{
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
 	if (!empty($arrayfields['f.note_public']['checked']))
 	{
 		// Note public

From 39d6ac37530bd45c52277837324abbdaf83afa85 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Apr 2021 11:52:20 +0200
Subject: [PATCH 2/3] initdemopassword can use password_hash algorithm

---
 dev/initdemo/initdemopassword.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/dev/initdemo/initdemopassword.sh b/dev/initdemo/initdemopassword.sh
index 84d50f0dcc3..f1cf780e673 100755
--- a/dev/initdemo/initdemopassword.sh
+++ b/dev/initdemo/initdemopassword.sh
@@ -32,12 +32,14 @@ base=$2;
 port=$3;
 demologin=$4;
 demopass=$5;
+demopasshash=$6;
 
 # ----------------------------- check params
 if [ "x$confirm" != "xconfirm" ]
 then
 	echo "----- $0 -----"
-	echo "Usage: initdemopassword.sh confirm [base port login pass]"
+	echo "Usage: initdemopassword.sh confirm [base port login pass password_hash_algo]"
+	echo "password_hash_algo can be md5 of password_hash"
 	exit
 fi
 
@@ -148,7 +150,15 @@ fi
 #echo "mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile"
 #mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
 echo "echo \"UPDATE llx_user SET pass_crypted = MD5('$demopass') WHERE login = '$demologin';\" | mysql -P$port $base"
-echo "UPDATE llx_user SET pass_crypted = MD5('$demopass') WHERE login = '$demologin';" | mysql -P$port $base
+
+if [ "x$demopasshash" != "password_hash" ]
+then
+	newpass=`echo '<?php echo md5("$demopass"); ?>' | php`
+else
+	newpass=`echo '<?php echo password_hash("$demopass", PASSWORD_DEFAULT); ?>' | php`
+fi
+
+echo "UPDATE llx_user SET pass_crypted = '$newpass' WHERE login = '$demologin';" | mysql -P$port $base
 export res=$?
 
 if [ $res -ne 0 ]; then

From 460d6a058915347c763bad9468b843d9cfd2dc19 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Apr 2021 11:57:53 +0200
Subject: [PATCH 3/3] Fix init pass

---
 dev/initdemo/initdemopassword.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/initdemo/initdemopassword.sh b/dev/initdemo/initdemopassword.sh
index f1cf780e673..d3527151c64 100755
--- a/dev/initdemo/initdemopassword.sh
+++ b/dev/initdemo/initdemopassword.sh
@@ -151,7 +151,7 @@ fi
 #mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
 echo "echo \"UPDATE llx_user SET pass_crypted = MD5('$demopass') WHERE login = '$demologin';\" | mysql -P$port $base"
 
-if [ "x$demopasshash" != "password_hash" ]
+if [ "x$demopasshash" != "xpassword_hash" ]
 then
 	newpass=`echo '<?php echo md5("$demopass"); ?>' | php`
 else