lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/compta/facture/list.php
This commit is contained in:
Laurent Destailleur 2021-04-15 12:04:08 +02:00
commit bd1aa38c64
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dev/initdemo/initdemopassword.sh
View File

@ -32,12 +32,14 @@ base=$2;
port=$3; port=$3;
demologin=$4; demologin=$4;
demopass=$5; demopass=$5;
demopasshash=$6;
# ----------------------------- check params # ----------------------------- check params
if [ "x$confirm" != "xconfirm" ] if [ "x$confirm" != "xconfirm" ]
then then
echo "----- $0 -----" 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 exit
fi fi
@ -148,7 +150,15 @@ fi
#echo "mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile" #echo "mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile"
#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 "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" != "xpassword_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=$? export res=$?
if [ $res -ne 0 ]; then if [ $res -ne 0 ]; then

9
htdocs/compta/facture/list.php
View File

@ -1284,10 +1284,6 @@ if ($resql) {
print '<td class="liste_titre right">'; print '<td class="liste_titre right">';
print '</td>'; print '</td>';
} }
if (!empty($arrayfields['f.date_closing']['checked'])) {
print '<td class="liste_titre">';
print '</td>';
}
if (!empty($arrayfields['total_pa']['checked'])) { if (!empty($arrayfields['total_pa']['checked'])) {
print '<td class="liste_titre right">'; print '<td class="liste_titre right">';
print '</td>'; print '</td>';
@ -1322,6 +1318,11 @@ if ($resql) {
print '<td class="liste_titre">'; print '<td class="liste_titre">';
print '</td>'; 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'])) { if (!empty($arrayfields['f.note_public']['checked'])) {
// Note public // Note public
print '<td class="liste_titre">'; print '<td class="liste_titre">';