Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try fix CI

Browse Source
This commit is contained in:
ldestailleur
2025-07-29 11:04:32 +02:00
parent 5cf504fa90
commit d34e0b5305
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/core/customreports.php
View File

@@ -23,6 +23,7 @@
* \brief Page to make custom reports. Page can also be used alone or as a tab among other tabs of an object * \brief Page to make custom reports. Page can also be used alone or as a tab among other tabs of an object
* *
* To include this tool into another PHP page: * To include this tool into another PHP page:
*
* define('USE_CUSTOM_REPORT_AS_INCLUDE', 1); * define('USE_CUSTOM_REPORT_AS_INCLUDE', 1);
* define('MAIN_DO_NOT_USE_JQUERY_MULTISELECT', 1); * define('MAIN_DO_NOT_USE_JQUERY_MULTISELECT', 1);
* define('MAIN_CUSTOM_REPORT_KEEP_GRAPH_ONLY', 1); // TODO Use a variable * define('MAIN_CUSTOM_REPORT_KEEP_GRAPH_ONLY', 1); // TODO Use a variable
@@ -43,6 +44,7 @@
* @var ?int $SHOWLEGEND Show legend or not * @var ?int $SHOWLEGEND Show legend or not
* @var string $customreportkey Custom report key * @var string $customreportkey Custom report key
* @var string $customsql Custom SQL * @var string $customsql Custom SQL
* @var ?string[] $search_groupby Array with the third dimension
*/ */
' '
@phan-var-force ?int[] $toselect @phan-var-force ?int[] $toselect
@@ -597,11 +599,11 @@ if (count($search_groupby)) {
//var_dump($arrayofvaluesforgroupby);exit; //var_dump($arrayofvaluesforgroupby);exit;
$tmparray = dol_getdate(dol_now()); //$tmparray = dol_getdate(dol_now());
$endyear = $tmparray['year']; //$endyear = $tmparray['year'];
$endmonth = $tmparray['mon']; //$endmonth = $tmparray['mon'];
$datelastday = dol_get_last_day($endyear, $endmonth, 1); //$datelastday = dol_get_last_day($endyear, $endmonth, 1);
$startyear = $endyear - 2; //$startyear = $endyear - 2;
$param = ''; $param = '';
@@ -924,6 +926,7 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
// Add LEFT JOIN for all tables mentioned into filter // Add LEFT JOIN for all tables mentioned into filter
if (!empty($search_component_params_hidden)) { if (!empty($search_component_params_hidden)) {
// Get all fields used into the filter // Get all fields used into the filter
$matches = array();
preg_match_all('/\b(t[\w]*_[\w]*)\.(\w+(-\w+)?)/', $search_component_params_hidden, $matches); preg_match_all('/\b(t[\w]*_[\w]*)\.(\w+(-\w+)?)/', $search_component_params_hidden, $matches);
$fieldsUsedInFilter = array_unique($matches[0]); $fieldsUsedInFilter = array_unique($matches[0]);

18
htdocs/install/upgrade2.php
View File

@@ -52,6 +52,18 @@ if (!file_exists($conffile)) {
print 'Error: Dolibarr config file was not found. This may means that Dolibarr is not installed yet. Please call the page "/install/index.php" instead of "/install/upgrade.php").'; print 'Error: Dolibarr config file was not found. This may means that Dolibarr is not installed yet. Please call the page "/install/index.php" instead of "/install/upgrade.php").';
} }
require_once $conffile; require_once $conffile;
/**
* @var Conf $conf
* @var Translate $langs
*
* @var string $dolibarr_main_db_type
* @var string $dolibarr_main_db_host
* @var string $dolibarr_main_db_port
* @var string $dolibarr_main_db_name
* @var string $dolibarr_main_db_user
* @var string $dolibarr_main_db_pass
* @var string $dolibarr_main_document_root
*/
require_once $dolibarr_main_document_root.'/compta/facture/class/facture.class.php'; require_once $dolibarr_main_document_root.'/compta/facture/class/facture.class.php';
require_once $dolibarr_main_document_root.'/comm/propal/class/propal.class.php'; require_once $dolibarr_main_document_root.'/comm/propal/class/propal.class.php';
require_once $dolibarr_main_document_root.'/contrat/class/contrat.class.php'; require_once $dolibarr_main_document_root.'/contrat/class/contrat.class.php';
@@ -64,13 +76,7 @@ require_once $dolibarr_main_document_root.'/core/lib/files.lib.php';
global $langs; global $langs;
/**
* @var Conf $conf
* @var Translate $langs
*/
$grant_query = '';
$step = 2;
$error = 0; $error = 0;

2
scripts/tools/admintool.php
View File

@@ -73,6 +73,8 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
* @var HookManager $hookmanager * @var HookManager $hookmanager
* @var Societe $mysoc * @var Societe $mysoc
* @var Translate $langs * @var Translate $langs
*
* @var string $dolibarr_main_db_pass
*/ */
// Check parameters // Check parameters