lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing date in popup

Browse Source
This commit is contained in:
Laurent Destailleur 2023-04-27 12:37:42 +02:00
parent 84f79b592c
commit fa832e8a0d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/compta/paymentbybanktransfer/index.php
View File

@ -101,7 +101,7 @@ print '</span></td></tr></table></div><br>';
/* /*
* Invoices waiting for withdraw * Invoices waiting for withdraw
*/ */
$sql = "SELECT f.ref, f.rowid, f.total_ttc, f.fk_statut, f.paye, f.type,"; $sql = "SELECT f.ref, f.rowid, f.total_ttc, f.fk_statut, f.paye, f.type, f.datef, f.date_lim_reglement,";
$sql .= " pfd.date_demande, pfd.amount,"; $sql .= " pfd.date_demande, pfd.amount,";
$sql .= " s.nom as name, s.email, s.rowid as socid, s.tva_intra, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6"; $sql .= " s.nom as name, s.email, s.rowid as socid, s.tva_intra, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,"; $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,";
@ -141,9 +141,13 @@ if ($resql) {
$invoicestatic->id = $obj->rowid; $invoicestatic->id = $obj->rowid;
$invoicestatic->ref = $obj->ref; $invoicestatic->ref = $obj->ref;
$invoicestatic->statut = $obj->fk_statut; $invoicestatic->status = $obj->fk_statut;
$invoicestatic->statut = $obj->fk_statut; // For backward comaptibility
$invoicestatic->paye = $obj->paye; $invoicestatic->paye = $obj->paye;
$invoicestatic->type = $obj->type; $invoicestatic->type = $obj->type;
$invoicestatic->date = $db->jdate($obj->datef);
$invoicestatic->date_echeance = $db->jdate($obj->date_lim_reglement);
$invoicestatic->total_ttc = $obj->total_ttc;
$alreadypayed = $invoicestatic->getSommePaiement(); $alreadypayed = $invoicestatic->getSommePaiement();
$thirdpartystatic->id = $obj->socid; $thirdpartystatic->id = $obj->socid;

3
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -2782,6 +2782,9 @@ class FactureFournisseur extends CommonInvoice
if (!empty($this->date)) { if (!empty($this->date)) {
$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day'); $label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
} }
if (!empty($this->date_echeance)) {
$label .= '<br><b>'.$langs->trans('DateDue').':</b> '.dol_print_date($this->date_echeance, 'day');
}
if (!empty($this->total_ht)) { if (!empty($this->total_ht)) {
$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency); $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
} }