Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/projet/tasks/time.php
This commit is contained in:
Laurent Destailleur
2024-07-13 17:47:55 +02:00
parent 413b430cc7 305406d802
commit 5661a381ee
11 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/phpunit/JsonLibTest.php
View File

@@ -24,7 +24,9 @@
* \remarks To run this script as CLI: phpunit filename.php
*/
define('PHPUNIT_MODE', 1);
if (! defined('NOREQUIREUSER')) {
define('PHPUNIT_MODE', 1);
}
global $conf,$user,$langs,$db;
//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver