diff --git a/htdocs/compta/facture/class/factureligne.class.php b/htdocs/compta/facture/class/factureligne.class.php index 2bcde94a7a9..e3f031637d8 100644 --- a/htdocs/compta/facture/class/factureligne.class.php +++ b/htdocs/compta/facture/class/factureligne.class.php @@ -1021,7 +1021,7 @@ class FactureLigne extends CommonInvoiceLine $invoicecache[$invoiceid] = new Facture($this->db); $invoicecache[$invoiceid]->fetch($invoiceid); } - if ($invoicecache[$invoiceid]->type != Facture::TYPE_SITUATION) { + if (!$invoicecache[$invoiceid]->isSituationInvoice()) { return 0; } diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index 7d030fbaab3..457e7a6fdc2 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -348,7 +348,9 @@ $coldisplay++; $old_fieldv = $line->getAllPrevProgress($line->fk_facture); $fieldv = $tmp_fieldv + $old_fieldv; - print '