diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index f19f574f6b2..de909030f96 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -132,8 +132,10 @@ if ($_POST['action'] == 'builddoc' && $user->rights->banque) $mesg='
'.$paiement->error.'
'; } } + + /* - * Visualisation de la fiche + * View */ llxHeader(); @@ -209,12 +211,12 @@ if ($_GET['action'] == 'new') print '
'; $sql = "SELECT ba.rowid as bid, ".$db->pdate("b.dateo")." as date,"; - $sql.= " b.amount, ba.label, b.emetteur, b.banque"; + $sql.= " b.amount, ba.label, b.emetteur, b.num_chq, b.banque"; $sql.= " FROM ".MAIN_DB_PREFIX."bank as b "; $sql.= ",".MAIN_DB_PREFIX."bank_account as ba "; $sql.= " WHERE b.fk_type = 'CHQ' AND b.fk_account = ba.rowid"; $sql.= " AND b.fk_bordereau = 0 AND b.amount > 0"; - $sql.= " ORDER BY b.emetteur ASC, b.rowid ASC;"; + $sql.= " ORDER BY b.emetteur ASC, b.rowid ASC"; $resql = $db->query($sql); if ($resql) @@ -226,6 +228,7 @@ if ($_GET['action'] == 'new') $lines[$obj->bid][$i]["date"] = $obj->date; $lines[$obj->bid][$i]["amount"] = $obj->amount; $lines[$obj->bid][$i]["emetteur"] = $obj->emetteur; + $lines[$obj->bid][$i]["numero"] = $obj->num_chq; $lines[$obj->bid][$i]["banque"] = $obj->banque; $i++; } @@ -243,6 +246,7 @@ if ($_GET['action'] == 'new') print ''; print ''; print '\n"; + print '\n"; print '\n"; print '\n"; print '\n"; @@ -259,6 +263,7 @@ if ($_GET['action'] == 'new') print ""; print ''; + print '\n"; print '\n"; print '\n"; print ''; @@ -316,8 +321,8 @@ else // Liste des cheques - $sql = "SELECT b.rowid,b.amount,"; - $sql.= " b.num_chq,b.emetteur,".$db->pdate("b.dateo")." as date,".$db->pdate("b.datec")." as datec,b.banque,"; + $sql = "SELECT b.rowid, b.amount, b.num_chq,b.emetteur,"; + $sql.= " ".$db->pdate("b.dateo")." as date,".$db->pdate("b.datec")." as datec, b.banque,"; $sql.= " p.rowid as pid"; $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement as p ON p.fk_bank = b.rowid"; diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index 65988395211..ba20b446e5d 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -176,7 +176,7 @@ if ($conf->banque->enabled) } // Date -print ''; +print ''; // Mode print '';
'.$langs->trans("Date")."'.$langs->trans("ChequeNumber")."'.$langs->trans("CheckTransmitter")."'.$langs->trans("Bank")."'.$langs->trans("Amount")."
'.dolibarr_print_date($value["date"]).''.$value["numero"]."'.$value["emetteur"]."'.$value["banque"]."'.price($value["amount"]).'
'.$langs->trans('Date').''.dolibarr_print_date($paiement->date).'
'.$langs->trans('Date').''.dolibarr_print_date($paiement->date,'day').'
'.$langs->trans('Mode').''.$langs->trans("PaymentType".$paiement->type_code).'