diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index b9b152943ab..2b6251167a8 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4743,19 +4743,21 @@ if ($action == 'create') {
print ' '.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1, '', 32)).'';
}
- $facidavoir = $object->getListIdAvoirFromInvoice();
- if (count($facidavoir) > 0) {
+ // Retrieve credit note ids
+ $object->getListIdAvoirFromInvoice();
+
+ if (!empty($object->creditnote_ids)) {
print ' '.$langs->transnoentities("InvoiceHasAvoir");
$i = 0;
- foreach ($facidavoir as $id) {
+ foreach ($object->creditnote_ids as $invoiceid) {
if ($i == 0) {
print ' ';
} else {
print ',';
}
- $facavoir = new Facture($db);
- $facavoir->fetch($id);
- print $facavoir->getNomUrl(1, '', 32);
+ $creditnote = new Facture($db);
+ $creditnote->fetch($invoiceid);
+ print $creditnote->getNomUrl(1, '', 32);
}
print '';
}
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 1476eb8e764..d58000dd683 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -149,6 +149,9 @@ class Invoices extends DolibarrApi
throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
+ // Retrieve credit note ids
+ $this->invoice->getListIdAvoirFromInvoice();
+
// Add external contacts ids
if ($contact_list > -1) {
$tmparray = $this->invoice->liste_contact(-1, 'external', $contact_list);
@@ -268,6 +271,9 @@ class Invoices extends DolibarrApi
$invoice_static->totaldeposits = $invoice_static->getSumDepositsUsed();
$invoice_static->remaintopay = price2num($invoice_static->total_ttc - $invoice_static->totalpaid - $invoice_static->totalcreditnotes - $invoice_static->totaldeposits, 'MT');
+ // Retrieve credit note ids
+ $invoice_static->getListIdAvoirFromInvoice();
+
// Add external contacts ids
$tmparray = $invoice_static->liste_contact(-1, 'external', 1);
if (is_array($tmparray)) {
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 50a513a994f..fd22234a7a9 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -439,17 +439,19 @@ if ($object->id > 0) {
print ' '.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).'';
}
- $facidavoir = $object->getListIdAvoirFromInvoice();
- if (count($facidavoir) > 0) {
+ // Retrieve credit note ids
+ $object->getListIdAvoirFromInvoice();
+
+ if (!empty($object->creditnote_ids)) {
$invoicecredits = array();
- foreach ($facidavoir as $facid) {
+ foreach ($object->creditnote_ids as $invoiceid) {
if ($type == 'bank-transfer') {
- $facavoir = new FactureFournisseur($db);
+ $creditnote = new FactureFournisseur($db);
} else {
- $facavoir = new Facture($db);
+ $creditnote = new Facture($db);
}
- $facavoir->fetch($facid);
- $invoicecredits[] = $facavoir->getNomUrl(1);
+ $creditnote->fetch($invoiceid);
+ $invoicecredits[] = $creditnote->getNomUrl(1);
}
print ' '.$langs->transnoentities("InvoiceHasAvoir");
print ' '. (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits);
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 321533eb28d..13561f2de64 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -162,6 +162,11 @@ abstract class CommonInvoice extends CommonObject
*/
public $nbofopendirectdebitorcredittransfer;
+ /**
+ * @var int[] return of getListIdAvoirFromInvoice()
+ */
+ public $creditnote_ids;
+
/**
* @var int
*/
@@ -450,6 +455,9 @@ abstract class CommonInvoice extends CommonObject
} else {
dol_print_error($this->db);
}
+
+ $this->creditnote_ids = $idarray;
+
return $idarray;
}
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 06d9efaee2a..71408521d4b 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -1,9 +1,9 @@
- * Copyright (C) 2016 Laurent Destailleur
- * Copyright (C) 2023 Joachim Kueter
- * Copyright (C) 2024 MDW
- * Copyright (C) 2024 Frédéric France
+/* Copyright (C) 2015 Jean-François Ferry
+ * Copyright (C) 2016 Laurent Destailleur
+ * Copyright (C) 2023 Joachim Kueter
+ * Copyright (C) 2024 MDW
+ * Copyright (C) 2024 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -82,6 +82,9 @@ class SupplierInvoices extends DolibarrApi
throw new RestException(404, 'Supplier invoice not found');
}
+ // Retrieve credit note ids
+ $this->invoice->getListIdAvoirFromInvoice();
+
$this->invoice->fetchObjectLinked();
return $this->_cleanObjectDatas($this->invoice);
}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 39d971bba99..ab1ce229e1f 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3339,13 +3339,15 @@ if ($action == 'create') {
}
}
- $facidavoir = $object->getListIdAvoirFromInvoice();
- if (count($facidavoir) > 0) {
+ // Retrieve credit note ids
+ $object->getListIdAvoirFromInvoice();
+
+ if (!empty($object->creditnote_ids)) {
$invoicecredits = array();
- foreach ($facidavoir as $id) {
- $facavoir = new FactureFournisseur($db);
- $facavoir->fetch($id);
- $invoicecredits[] = $facavoir->getNomUrl(1);
+ foreach ($object->creditnote_ids as $invoiceid) {
+ $creditnote = new FactureFournisseur($db);
+ $creditnote->fetch($invoiceid);
+ $invoicecredits[] = $creditnote->getNomUrl(1);
}
print ' '.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits);
print '';
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index d15646059f3..5fd19773108 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -211,13 +211,15 @@ if ($id > 0 || !empty($ref)) {
print ' '.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1));
}
- $facidavoir = $object->getListIdAvoirFromInvoice();
- if (count($facidavoir) > 0) {
+ // Retrieve credit note ids
+ $object->getListIdAvoirFromInvoice();
+
+ if (!empty($object->creditnote_ids)) {
$invoicecredits = array();
- foreach ($facidavoir as $facid) {
- $facavoir = new FactureFournisseur($db);
- $facavoir->fetch($facid);
- $invoicecredits[] = $facavoir->getNomUrl(1);
+ foreach ($object->creditnote_ids as $invoiceid) {
+ $creditnote = new FactureFournisseur($db);
+ $creditnote->fetch($invoiceid);
+ $invoicecredits[] = $creditnote->getNomUrl(1);
}
print ' '.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits);
}
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index ddbf73ccf39..75d961308b0 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -187,13 +187,15 @@ if ($object->id > 0) {
print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
}
- $facidavoir = $object->getListIdAvoirFromInvoice();
- if (count($facidavoir) > 0) {
+ // Retrieve credit note ids
+ $object->getListIdAvoirFromInvoice();
+
+ if (!empty($object->creditnote_ids)) {
$invoicecredits = array();
- foreach ($facidavoir as $facid) {
- $facavoir = new FactureFournisseur($db);
- $facavoir->fetch($facid);
- $invoicecredits[] = $facavoir->getNomUrl(1);
+ foreach ($object->creditnote_ids as $invoiceid) {
+ $creditnote = new FactureFournisseur($db);
+ $creditnote->fetch($invoiceid);
+ $invoicecredits[] = $creditnote->getNomUrl(1);
}
print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')';
}
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 0f9d53b18d3..001797dc5a6 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -169,13 +169,15 @@ if ($object->id > 0) {
print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
}
- $facidavoir = $object->getListIdAvoirFromInvoice();
- if (count($facidavoir) > 0) {
+ // Retrieve credit note ids
+ $object->getListIdAvoirFromInvoice();
+
+ if (!empty($object->creditnote_ids)) {
$invoicecredits = array();
- foreach ($facidavoir as $facid) {
- $facavoir = new FactureFournisseur($db);
- $facavoir->fetch($facid);
- $invoicecredits[] = $facavoir->getNomUrl(1);
+ foreach ($object->creditnote_ids as $invoiceid) {
+ $creditnote = new FactureFournisseur($db);
+ $creditnote->fetch($invoiceid);
+ $invoicecredits[] = $creditnote->getNomUrl(1);
}
print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')';
}