From 82dbd546b3e0c2cb38f8f9350403395ffefa8b0a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Mar 2020 14:57:44 +0200 Subject: [PATCH] Update year in demo data --- build/exe/doliwamp/install_services.bat.install | 3 ++- htdocs/langs/en_US/bills.lang | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build/exe/doliwamp/install_services.bat.install b/build/exe/doliwamp/install_services.bat.install index 421d664d3de..5d0fe69350f 100644 --- a/build/exe/doliwamp/install_services.bat.install +++ b/build/exe/doliwamp/install_services.bat.install @@ -21,7 +21,8 @@ REM Mysql 5.1+ REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld REM Mariadb REM The mysql_install_db allows to not provide files into mysql dir but does not return to prompt so install hangs -.\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysql_install_db.exe --datadir=WAMPROOT/bin/mariadb/data --port=WAMPMYSQLPORT --password=WAMPMYSQLNEWPASSWORD >> doliwamp.log 2>>&1 +REM .\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysql_install_db.exe --datadir=WAMPROOT/bin/mariadb/data --port=WAMPMYSQLPORT --password=WAMPMYSQLNEWPASSWORD >> doliwamp.log 2>>&1 +.\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysql_install_db.exe --datadir=WAMPROOT/bin/mariadb/data --port=WAMPMYSQLPORT >> doliwamp.log 2>>&1 .\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld >> doliwamp.log 2>>&1 echo ---- End script >> doliwamp.log 2>>&1 diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 4b0849693dd..f2800ece68a 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -575,3 +575,6 @@ AutoFillDateTo=Set end date for service line with next invoice date AutoFillDateToShort=Set end date MaxNumberOfGenerationReached=Max number of gen. reached BILL_DELETEInDolibarr=Invoice deleted +BILL_SUPPLIER_DELETE=Invoice deleted++ + +