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

review code

Browse Source
This commit is contained in:
Florian HENRY 2021-11-18 21:12:43 +01:00
parent e4803dda88
commit 0e8e8a79dc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/accountancy/customer/index.php
View File

@ -526,13 +526,14 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
if ($j > 12) { if ($j > 12) {
$j -= 12; $j -= 12;
} }
$sql .= ' SUM(CASE WHEN $sql .= '
MONTH(f.datef)='.$j.' SUM('.$db->ifsql('MONTH(f.datef)='.$j,
THEN (CASE WHEN fd.total_ht < 0 ' ('.
THEN (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))) $db->ifsql('fd.total_ht < 0',
ELSE (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))) ' (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))',
END) ' (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))'
ELSE 0 END) AS month'.str_pad($j, 2, '0', STR_PAD_LEFT).','; ).')',
0).') AS month'.str_pad($j, 2, '0', STR_PAD_LEFT).',';
} }
$sql .= " SUM((fd.total_ht-(fd.qty * fd.buy_price_ht))) as total"; $sql .= " SUM((fd.total_ht-(fd.qty * fd.buy_price_ht))) as total";
@ -552,7 +553,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
} else { } else {
$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.", ".Facture::TYPE_REPLACEMENT.", ".Facture::TYPE_CREDIT_NOTE.", ".Facture::TYPE_DEPOSIT.", ".Facture::TYPE_SITUATION.")"; $sql .= " AND f.type IN (".Facture::TYPE_STANDARD.", ".Facture::TYPE_REPLACEMENT.", ".Facture::TYPE_CREDIT_NOTE.", ".Facture::TYPE_DEPOSIT.", ".Facture::TYPE_SITUATION.")";
} }
dol_syslog('htdocs/accountancy/customer/index.php'); dol_syslog('htdocs/accountancy/customer/index.php');
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) { if ($resql) {