vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #32748 from hregis/fix_dev_mysql_keywords

Browse source 
QUAL invoice payment, the requested invoice sort first (FACTURE_PAYMENTS_INVOICE_REQUESTED_SORT_FIRST)
This commit is contained in:
Laurent Destailleur 2025-01-23 01:45:40 +01:00 committed by GitHub
commit b26c36bcde
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
htdocs/compta/paiement.php
View file

@ -570,28 +570,33 @@ if ($result >= 0) {
* List of unpaid invoices
*/
$sql = 'SELECT f.rowid as facid, f.ref, f.total_ht, f.total_tva, f.total_ttc, f.multicurrency_code, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc, f.type,';
$sql .= ' f.datef as df, f.fk_soc as socid, f.date_lim_reglement as dlr';
$sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f';
$sql .= ' WHERE f.entity IN ('.getEntity('facture').')';
$sql .= ' AND (f.fk_soc = '.((int) $facture->socid);
$sql = "SELECT f.rowid as facid, f.ref, f.total_ht, f.total_tva, f.total_ttc, f.multicurrency_code, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc, f.type,";
$sql .= " f.datef as df, f.fk_soc as socid, f.date_lim_reglement as dlr";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql .= " WHERE f.entity IN (".getEntity('facture').")";
$sql .= " AND (f.fk_soc = ".((int) $facture->socid);
// Can pay invoices of all child of parent company
if (getDolGlobalString('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS') && !empty($facture->thirdparty->parent)) {
$sql .= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.((int) $facture->thirdparty->parent).')';
$sql .= " OR f.fk_soc IN (SELECT rowid FROM ".MAIN_DB_PREFIX."societe WHERE parent = ".((int) $facture->thirdparty->parent).")";
}
// Can pay invoices of all child of myself
if (getDolGlobalString('FACTURE_PAYMENTS_ON_SUBSIDIARY_COMPANIES')) {
$sql .= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.((int) $facture->thirdparty->id).')';
$sql .= " OR f.fk_soc IN (SELECT rowid FROM ".MAIN_DB_PREFIX."societe WHERE parent = ".((int) $facture->thirdparty->id).")";
}
$sql .= ') AND f.paye = 0';
$sql .= ' AND f.fk_statut = 1'; // Statut=0 => not validated, Statut=2 => canceled
$sql .= ") AND f.paye = 0";
$sql .= " AND f.fk_statut = 1"; // Statut=0 => not validated, Statut=2 => canceled
if ($facture->type != Facture::TYPE_CREDIT_NOTE) {
$sql .= ' AND type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
$sql .= " AND type IN (0,1,3,5)"; // Standard invoice, replacement, deposit, situation
} else {
$sql .= ' AND type = 2'; // If paying back a credit note, we show all credit notes
$sql .= " AND type = 2"; // If paying back a credit note, we show all credit notes
}
if (!getDolGlobalInt('FACTURE_PAYMENTS_INVOICE_REQUESTED_SORT_FIRST')) {
// Sort invoices by date and serial number: the older one comes first
$sql .= " ORDER BY f.datef ASC, f.ref ASC";
} else {
// The requested invoice sort first
$sql .= " ORDER BY f.rowid = ".((int) $facid)." DESC, f.datef ASC, f.ref ASC";
}
// Sort invoices by date and serial number: the older one comes first
$sql .= ' ORDER BY f.datef ASC, f.ref ASC';
$resql = $db->query($sql);
if ($resql) {