Merge pull request #32714 from hregis/fix_dev_mysql_keywords
NEW add credit note ids in API invoice return
This commit is contained in:
commit
bd935c556f
9 changed files with 71 additions and 42 deletions
|
|
@ -4743,19 +4743,21 @@ if ($action == 'create') {
|
|||
print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1, '', 32)).'</span>';
|
||||
}
|
||||
|
||||
$facidavoir = $object->getListIdAvoirFromInvoice();
|
||||
if (count($facidavoir) > 0) {
|
||||
// Retrieve credit note ids
|
||||
$object->getListIdAvoirFromInvoice();
|
||||
|
||||
if (!empty($object->creditnote_ids)) {
|
||||
print ' <span class="opacitymediumbycolor paddingleft">'.$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 '</span>';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)) {
|
||||
|
|
|
|||
|
|
@ -439,17 +439,19 @@ if ($object->id > 0) {
|
|||
print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).'</span>';
|
||||
}
|
||||
|
||||
$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 ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir");
|
||||
print ' '. (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?php
|
||||
/* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
|
||||
* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2023 Joachim Kueter <git-jk@bloxera.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
/* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
|
||||
* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2023 Joachim Kueter <git-jk@bloxera.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* 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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits);
|
||||
print '</span>';
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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) . ')';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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) . ')';
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue