Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix warning

Browse Source
This commit is contained in:
Laurent Destailleur 2024-03-17 13:10:17 +01:00
parent 080d9521d5
commit d7ce93d9ea
1 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
htdocs/core/customreports.php
View File

@ -724,18 +724,20 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
$sql .= $val." as x_".$key.", ";
}
}
foreach ($search_groupby as $key => $val) {
if (preg_match('/\-year$/', $val)) {
$tmpval = preg_replace('/\-year$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y') as g_".$key.', ';
} elseif (preg_match('/\-month$/', $val)) {
$tmpval = preg_replace('/\-month$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m') as g_".$key.', ';
} elseif (preg_match('/\-day$/', $val)) {
$tmpval = preg_replace('/\-day$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d') as g_".$key.', ';
} else {
$sql .= $val." as g_".$key.", ";
if (!empty($search_groupby)) {
foreach ($search_groupby as $key => $val) {
if (preg_match('/\-year$/', $val)) {
$tmpval = preg_replace('/\-year$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y') as g_".$key.', ';
} elseif (preg_match('/\-month$/', $val)) {
$tmpval = preg_replace('/\-month$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m') as g_".$key.', ';
} elseif (preg_match('/\-day$/', $val)) {
$tmpval = preg_replace('/\-day$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d') as g_".$key.', ';
} else {
$sql .= $val." as g_".$key.", ";
}
}
}
foreach ($search_measures as $key => $val) {
@ -880,18 +882,20 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
$sql .= $val.", ";
}
}
foreach ($search_groupby as $key => $val) {
if (preg_match('/\-year$/', $val)) {
$tmpval = preg_replace('/\-year$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y'), ";
} elseif (preg_match('/\-month$/', $val)) {
$tmpval = preg_replace('/\-month$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m'), ";
} elseif (preg_match('/\-day$/', $val)) {
$tmpval = preg_replace('/\-day$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d'), ";
} else {
$sql .= $val.', ';
if (!empty($search_groupby)) {
foreach ($search_groupby as $key => $val) {
if (preg_match('/\-year$/', $val)) {
$tmpval = preg_replace('/\-year$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y'), ";
} elseif (preg_match('/\-month$/', $val)) {
$tmpval = preg_replace('/\-month$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m'), ";
} elseif (preg_match('/\-day$/', $val)) {
$tmpval = preg_replace('/\-day$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d'), ";
} else {
$sql .= $val.', ';
}
}
}
$sql = preg_replace('/,\s*$/', '', $sql);
@ -910,18 +914,20 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
$sql .= $val.', ';
}
}
foreach ($search_groupby as $key => $val) {
if (preg_match('/\-year$/', $val)) {
$tmpval = preg_replace('/\-year$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y'), ";
} elseif (preg_match('/\-month$/', $val)) {
$tmpval = preg_replace('/\-month$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m'), ";
} elseif (preg_match('/\-day$/', $val)) {
$tmpval = preg_replace('/\-day$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d'), ";
} else {
$sql .= $val.', ';
if (!empty($search_groupby)) {
foreach ($search_groupby as $key => $val) {
if (preg_match('/\-year$/', $val)) {
$tmpval = preg_replace('/\-year$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y'), ";
} elseif (preg_match('/\-month$/', $val)) {
$tmpval = preg_replace('/\-month$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m'), ";
} elseif (preg_match('/\-day$/', $val)) {
$tmpval = preg_replace('/\-day$/', '', $val);
$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d'), ";
} else {
$sql .= $val.', ';
}
}
}
$sql = preg_replace('/,\s*$/', '', $sql);