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

Fix load of margin infos

Browse Source
This commit is contained in:
Laurent Destailleur 2023-02-13 21:35:48 +01:00
parent a06a5d0f65
commit 5217ae28f8
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/compta/facture/list.php
View File

@ -1199,6 +1199,18 @@ if ($resql)
{
$i = 0;
$totalarray = array();
$with_margin_info = false;
if (!empty($conf->margin->enabled) && (
!empty($arrayfields['total_pa']['checked'])
|| !empty($arrayfields['total_margin']['checked'])
|| !empty($arrayfields['total_margin_rate']['checked'])
|| !empty($arrayfields['total_mark_rate']['checked'])
)
) {
$with_margin_info = true;
}
while ($i < min($num, $limit))
{
$obj = $db->fetch_object($resql);
@ -1281,7 +1293,7 @@ if ($resql)
$facturestatic->alreadypaid = $paiement;
$marginInfo = array();
if (!empty($conf->margin->enabled)) {
if ($with_margin_info === true) {
$facturestatic->fetch_lines();
$marginInfo = $formmargin->getMarginInfosArray($facturestatic);
}