';
print '| '.$arraytitle.' | ';
print ''.$langs->trans('Date').' | ';
+ print ''.$langs->trans('DateMaxPayment').' | ';
if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('Currency').' | ';
if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('MulticurrencyAmountTTC').' | ';
if (!empty($conf->multicurrency->enabled)) print ''.$multicurrencyalreadypayedlabel.' | ';
@@ -629,7 +630,25 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
// Date
print ''.dol_print_date($db->jdate($objp->df),'day')." | \n";
-
+
+ // Date Max Payment
+ if ($objp->dlr > 0 )
+ {
+ print '';
+ print dol_print_date($db->jdate($objp->dlr), 'day');
+
+ if ($invoice->hasDelay())
+ {
+ print img_warning($langs->trans('Late'));
+ }
+
+ print ' | ';
+ }
+ else
+ {
+ print '-- | ';
+ }
+
// Currency
if (!empty($conf->multicurrency->enabled)) print ''.$objp->multicurrency_code." | \n";
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 96357cdf508..1c85adddfcc 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -714,10 +714,9 @@ class pdf_eratosthene extends ModelePDFCommandes
}
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Show payments table
- *
+ *
* @param TCPDF $pdf Object PDF
* @param Object $object Object order
* @param int $posy Position y in PDF
@@ -726,11 +725,8 @@ class pdf_eratosthene extends ModelePDFCommandes
*/
private function drawPaymentsTable(&$pdf, $object, $posy, $outputlangs)
{
- // phpcs:enable
}
-
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Show miscellaneous information (payment mode, payment term, ...)
*
@@ -742,7 +738,6 @@ class pdf_eratosthene extends ModelePDFCommandes
*/
private function drawInfoTable(&$pdf, $object, $posy, $outputlangs)
{
- // phpcs:enable
global $conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -918,7 +913,7 @@ class pdf_eratosthene extends ModelePDFCommandes
}
- /** phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+ /**
* Show total to pay
*
* @param TCPDF $pdf Object PDF
@@ -930,7 +925,6 @@ class pdf_eratosthene extends ModelePDFCommandes
*/
private function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{
- // phpcs:enable
global $conf,$mysoc;
$default_font_size = pdf_getPDFFontSize($outputlangs);
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 4032a6c41a5..d03d60f50fe 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -849,7 +849,7 @@ class pdf_sponge extends ModelePDFFactures
}
- /** phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+ /**
* Show payments table
*
* @param PDF $pdf Object PDF
@@ -860,7 +860,6 @@ class pdf_sponge extends ModelePDFFactures
*/
function drawPaymentsTable(&$pdf, $object, $posy, $outputlangs)
{
- // phpcs:enable
global $conf;
$sign=1;
@@ -989,7 +988,7 @@ class pdf_sponge extends ModelePDFFactures
}
- /** phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+ /**
* Show miscellaneous information (payment mode, payment term, ...)
*
* @param PDF $pdf Object PDF
@@ -1000,7 +999,6 @@ class pdf_sponge extends ModelePDFFactures
*/
private function drawInfoTable(&$pdf, $object, $posy, $outputlangs)
{
- // phpcs:enable
global $conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1147,7 +1145,7 @@ class pdf_sponge extends ModelePDFFactures
}
- /** phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+ /**
* Show total to pay
*
* @param PDF $pdf Object PDF
@@ -1159,7 +1157,6 @@ class pdf_sponge extends ModelePDFFactures
*/
private function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{
- // phpcs:enable
global $conf,$mysoc;
$sign=1;
@@ -1828,9 +1825,6 @@ class pdf_sponge extends ModelePDFFactures
return pdf_pagefoot($pdf,$outputlangs,'INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
}
-
-
-
/**
* Define Array Column Field
*
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 9dcc14bf384..e43734039ca 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -875,7 +875,7 @@ class pdf_cyan extends ModelePDFPropales
}
}
- /** phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+ /**
* Show payments table
*
* @param TCPDF $pdf Object PDF
@@ -886,11 +886,9 @@ class pdf_cyan extends ModelePDFPropales
*/
private function drawPaymentsTable(&$pdf, $object, $posy, $outputlangs)
{
- // phpcs:enable
}
-
- /** phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+ /**
* Show miscellaneous information (payment mode, payment term, ...)
*
* @param TCPDF $pdf Object PDF
@@ -901,7 +899,6 @@ class pdf_cyan extends ModelePDFPropales
*/
function drawInfoTable(&$pdf, $object, $posy, $outputlangs)
{
- // phpcs:enable
global $conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index fdd358933d9..7946f98cb66 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -473,14 +473,14 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
* Autres factures impayees
*/
$sql = 'SELECT f.rowid as facid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.multicurrency_total_ttc, f.datef as df,';
- $sql.= ' SUM(pf.amount) as am, SUM(pf.multicurrency_amount) as multicurrency_am';
+ $sql.= ' SUM(pf.amount) as am, SUM(pf.multicurrency_amount) as multicurrency_am, f.date_lim_reglement as dlr';
$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
$sql.= " WHERE f.entity = ".$conf->entity;
$sql.= ' AND f.fk_soc = '.$object->socid;
$sql.= ' AND f.paye = 0';
$sql.= ' AND f.fk_statut = 1'; // Statut=0 => non validee, Statut=2 => annulee
- $sql.= ' GROUP BY f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.multicurrency_total_ttc, f.datef';
+ $sql.= ' GROUP BY f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.multicurrency_total_ttc, f.datef, f.date_lim_reglement';
$resql = $db->query($sql);
if ($resql)
{
@@ -511,6 +511,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print ''.$langs->trans('Invoice').' | ';
print ''.$langs->trans('RefSupplier').' | ';
print ''.$langs->trans('Date').' | ';
+ print ''.$langs->trans('DateMaxPayment').' | ';
if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('Currency').' | ';
if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('MulticurrencyAmountTTC').' | ';
if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('MulticurrencyAlreadyPaid').' | ';
@@ -569,7 +570,25 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
{
print '!!! | ';
}
-
+
+ // Date Max Payment
+ if ($objp->dlr > 0 )
+ {
+ print '';
+ print dol_print_date($db->jdate($objp->dlr), 'day');
+
+ if ($invoice->hasDelay())
+ {
+ print img_warning($langs->trans('Late'));
+ }
+
+ print ' | ';
+ }
+ else
+ {
+ print '-- | ';
+ }
+
// Multicurrency
if (!empty($conf->multicurrency->enabled))
{
@@ -661,7 +680,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
{
// Print total
print '