NEW add creditnotelist var in fetch

This commit is contained in:
Regis Houssin 2025-01-19 13:18:36 +01:00
parent 9ed7ffd3a1
commit d39ef7b752
9 changed files with 44 additions and 37 deletions

View file

@ -4743,19 +4743,18 @@ if ($action == 'create') {
print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1, '', 32)).'</span>';
}
$facidavoir = $object->getListIdAvoirFromInvoice();
if (count($facidavoir) > 0) {
if (!empty($object->creditnotelist)) {
print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir");
$i = 0;
foreach ($facidavoir as $id) {
foreach ($object->creditnotelist 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($id);
print $creditnote->getNomUrl(1, '', 32);
}
print '</span>';
}

View file

@ -2300,6 +2300,10 @@ class Facture extends CommonInvoice
$this->multicurrency_total_tva = $obj->multicurrency_total_tva;
$this->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
if ($this->type != self::TYPE_CREDIT_NOTE) {
$this->creditnotelist = $this->getListIdAvoirFromInvoice();
}
if (($this->type == self::TYPE_SITUATION || ($this->type == self::TYPE_CREDIT_NOTE && $this->situation_cycle_ref > 0)) && $fetch_situation) {
$this->fetchPreviousNextSituationInvoice();
}

View file

@ -439,17 +439,16 @@ if ($object->id > 0) {
print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).'</span>';
}
$facidavoir = $object->getListIdAvoirFromInvoice();
if (count($facidavoir) > 0) {
if (!empty($object->creditnotelist)) {
$invoicecredits = array();
foreach ($facidavoir as $facid) {
foreach (!empty($object->creditnotelist) 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 ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir");
print ' '. (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits);

View file

@ -162,6 +162,11 @@ abstract class CommonInvoice extends CommonObject
*/
public $nbofopendirectdebitorcredittransfer;
/**
* @var string[] return of getListIdAvoirFromInvoice()
*/
public $creditnotelist;
/**
* @var int
*/

View file

@ -1013,6 +1013,10 @@ class FactureFournisseur extends CommonInvoice
$this->socid = $obj->socid;
if ($this->type != self::TYPE_CREDIT_NOTE) {
$this->creditnotelist = $this->getListIdAvoirFromInvoice();
}
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

View file

@ -3339,13 +3339,12 @@ if ($action == 'create') {
}
}
$facidavoir = $object->getListIdAvoirFromInvoice();
if (count($facidavoir) > 0) {
if (!empty($object->creditnotelist)) {
$invoicecredits = array();
foreach ($facidavoir as $id) {
$facavoir = new FactureFournisseur($db);
$facavoir->fetch($id);
$invoicecredits[] = $facavoir->getNomUrl(1);
foreach ($object->creditnotelist as $invoiceid) {
$creditnote = new FactureFournisseur($db);
$creditnote->fetch($invoiceid);
$invoicecredits[] = $creditnote->getNomUrl(1);
}
print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits);
print '</span>';

View file

@ -211,13 +211,12 @@ if ($id > 0 || !empty($ref)) {
print ' '.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1));
}
$facidavoir = $object->getListIdAvoirFromInvoice();
if (count($facidavoir) > 0) {
if (!empty($object->creditnotelist)) {
$invoicecredits = array();
foreach ($facidavoir as $facid) {
$facavoir = new FactureFournisseur($db);
$facavoir->fetch($facid);
$invoicecredits[] = $facavoir->getNomUrl(1);
foreach ($object->creditnotelist as $invoiceid) {
$creditnote = new FactureFournisseur($db);
$creditnote->fetch($invoiceid);
$invoicecredits[] = $creditnote->getNomUrl(1);
}
print ' '.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits);
}

View file

@ -187,13 +187,12 @@ if ($object->id > 0) {
print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
}
$facidavoir = $object->getListIdAvoirFromInvoice();
if (count($facidavoir) > 0) {
if (!empty($object->creditnotelist)) {
$invoicecredits = array();
foreach ($facidavoir as $facid) {
$facavoir = new FactureFournisseur($db);
$facavoir->fetch($facid);
$invoicecredits[] = $facavoir->getNomUrl(1);
foreach ($object->creditnotelist as $invoiceid) {
$creditnote = new FactureFournisseur($db);
$creditnote->fetch($invoiceid);
$invoicecredits[] = $creditnote->getNomUrl(1);
}
print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')';
}

View file

@ -169,13 +169,12 @@ if ($object->id > 0) {
print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
}
$facidavoir = $object->getListIdAvoirFromInvoice();
if (count($facidavoir) > 0) {
if (!empty($object->creditnotelist)) {
$invoicecredits = array();
foreach ($facidavoir as $facid) {
$facavoir = new FactureFournisseur($db);
$facavoir->fetch($facid);
$invoicecredits[] = $facavoir->getNomUrl(1);
foreach ($object->creditnotelist as $invoiceid) {
$creditnote = new FactureFournisseur($db);
$creditnote->fetch($invoiceid);
$invoicecredits[] = $creditnote->getNomUrl(1);
}
print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')';
}