diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index d0c65e8e909..19bca595dd7 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -142,13 +142,14 @@ if ($result) { // Situation invoices handling $line = new FactureLigne($db); $line->fetch($obj->fdid); // id of line - $prev_progress = $line->get_prev_progress($obj->rowid); // id of invoice + $prev_progress = 0; if ($obj->type == Facture::TYPE_SITUATION) { - // Avoid divide by 0 + // Avoid divide by 0 if ($obj->situation_percent == 0) { $situation_ratio = 0; } else { - $situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent; + $prev_progress = $line->get_prev_progress($obj->rowid); // id of invoice + $situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent; } } else { $situation_ratio = 1; diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index c0ebdb1aa3a..0cbd5068077 100644 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -167,13 +167,14 @@ if ($result) // Situation invoices handling $line = new FactureLigne($db); $line->fetch($obj->id); // id of line - $prev_progress = $line->get_prev_progress($obj->rowid); // id on invoice + $prev_progress = 0; if ($obj->type==Facture::TYPE_SITUATION) { // Avoid divide by 0 if ($obj->situation_percent == 0) { $situation_ratio = 0; } else { - $situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent; + $prev_progress = $line->get_prev_progress($obj->rowid); // id on invoice + $situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent; } } else { $situation_ratio = 1;