From 8bb7f9c8fb34c399e8cf678c13c5adb68164d60b Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Tue, 16 Nov 2021 17:44:18 +0100 Subject: [PATCH] ZENDSI: fix margin calc with credit note --- htdocs/accountancy/customer/index.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index 8f23ee5c532..87fe74e2c77 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -520,23 +520,22 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange print ''.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).''; } print ''.$langs->trans("Total").''; - $sql = "SELECT '".$db->escape($langs->trans("Vide"))."' AS marge,"; for ($i = 1; $i <= 12; $i++) { $j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1; if ($j > 12) { $j -= 12; } - $sql .= " SUM(".$db->ifsql('MONTH(f.datef)='.$j, '(fd.total_ht-(fd.qty * fd.buy_price_ht))', '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(CASE WHEN + $sql .= ' SUM(CASE WHEN 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)))) ELSE (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))) END) - ELSE 0 END) AS month'.str_pad($j, 2, '0', STR_PAD_LEFT); + ELSE 0 END) AS month'.str_pad($j, 2, '0', STR_PAD_LEFT).','; + } + $sql .= " SUM((fd.total_ht-(fd.qty * fd.buy_price_ht))) as total"; + $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture"; $sql .= " WHERE f.datef >= '".$db->idate($search_date_start)."'";