From 872d0ddff4f8b8782b834a7925ad703e33a1ef20 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 5 Oct 2022 10:07:01 +0200 Subject: [PATCH 1/3] TODO wrong invoice status if "alreadypaid" is missing --- htdocs/core/lib/invoice.lib.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php index 52daea0f150..34bf65de8ba 100644 --- a/htdocs/core/lib/invoice.lib.php +++ b/htdocs/core/lib/invoice.lib.php @@ -751,6 +751,7 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0) $result .= ''.$companystatic->getNomUrl(1, 'customer').''; $result .= ''.dol_print_date($db->jdate($obj->datec), 'day').''; $result .= ''.price($obj->total_ttc).''; + // TODO with "alreadypaid" parameter with value -1 the status of invoice validated with no paiement sort with "status3" (BillStatusStarted) $result .= ''.$objectstatic->getLibStatut(5).''; $result .= ''; From af34a968fc2a0d4284cf68b7515d05f2f6f9ec5c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 5 Oct 2022 10:31:32 +0200 Subject: [PATCH 2/3] FIX missing check if incoice as a payment (wrong status) --- htdocs/core/lib/invoice.lib.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php index 34bf65de8ba..2184520c11e 100644 --- a/htdocs/core/lib/invoice.lib.php +++ b/htdocs/core/lib/invoice.lib.php @@ -751,8 +751,10 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0) $result .= ''.$companystatic->getNomUrl(1, 'customer').''; $result .= ''.dol_print_date($db->jdate($obj->datec), 'day').''; $result .= ''.price($obj->total_ttc).''; - // TODO with "alreadypaid" parameter with value -1 the status of invoice validated with no paiement sort with "status3" (BillStatusStarted) - $result .= ''.$objectstatic->getLibStatut(5).''; + + // Check if invoice as a payment + $payment = $objectstatic->getSommePaiement(); + $result .= ''.$objectstatic->getLibStatut(5, $payment).''; $result .= ''; From 81e5c428a1a04447a17bdae94adbda79dc88d298 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 6 Oct 2022 11:52:40 +0200 Subject: [PATCH 3/3] Update invoice.lib.php --- htdocs/core/lib/invoice.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php index 2184520c11e..b6ab19e2495 100644 --- a/htdocs/core/lib/invoice.lib.php +++ b/htdocs/core/lib/invoice.lib.php @@ -752,7 +752,7 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0) $result .= ''.dol_print_date($db->jdate($obj->datec), 'day').''; $result .= ''.price($obj->total_ttc).''; - // Check if invoice as a payment + // Load amount of existing payment of invoice (needed for complete status) $payment = $objectstatic->getSommePaiement(); $result .= ''.$objectstatic->getLibStatut(5, $payment).'';