diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index d4a69d13a5b..139f578c5d6 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -1931,7 +1931,7 @@ class AccountLine extends CommonObject */ function info($id) { - $sql = 'SELECT b.rowid, b.datec,'; + $sql = 'SELECT b.rowid, b.datec, b.tms as datem,'; $sql.= ' b.fk_user_author, b.fk_user_rappro'; $sql.= ' FROM '.MAIN_DB_PREFIX.'bank as b'; $sql.= ' WHERE b.rowid = '.$id; @@ -1958,6 +1958,7 @@ class AccountLine extends CommonObject } $this->date_creation = $this->db->jdate($obj->datec); + $this->date_modification = $this->db->jdate($obj->datem); //$this->date_rappro = $obj->daterappro; // Not yet managed } $this->db->free($result); diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php index cd98bb75b5b..41f332e5dd0 100644 --- a/htdocs/loan/payment/card.php +++ b/htdocs/loan/payment/card.php @@ -148,30 +148,27 @@ if ($action == 'valide') print '
| '.$langs->trans('Ref').' | '; -print ''; +print ' | |||
| '.$langs->trans('Ref').' | '; +print ''; print $form->showrefnav($payment,'id','',1,'rowid','id'); print ' | |||
| '.$langs->trans('Date').' | '.dol_print_date($payment->datep,'day').' | |||
| '.$langs->trans('Date').' | '.dol_print_date($payment->datep,'day').' | |||
| '.$langs->trans('Mode').' | '.$langs->trans("PaymentType".$payment->type_code).' | |||
| '.$langs->trans('Number').' | '.$payment->num_payment.' | |||
| '.$langs->trans('Mode').' | '.$langs->trans("PaymentType".$payment->type_code).' | |||
| '.$langs->trans('LoanCapital').' | '.price($payment->amount_capital, 0, $outputlangs, 1, -1, -1, $conf->currency).' | |||
| '.$langs->trans('Insurance').' | '.price($payment->amount_insurance, 0, $outputlangs, 1, -1, -1, $conf->currency).' | |||
| '.$langs->trans('Interest').' | '.price($payment->amount_interest, 0, $outputlangs, 1, -1, -1, $conf->currency).' | |||
| '.$langs->trans('LoanCapital').' | '.price($payment->amount_capital, 0, $outputlangs, 1, -1, -1, $conf->currency).' | |||
| '.$langs->trans('Insurance').' | '.price($payment->amount_insurance, 0, $outputlangs, 1, -1, -1, $conf->currency).' | |||
| '.$langs->trans('Interest').' | '.price($payment->amount_interest, 0, $outputlangs, 1, -1, -1, $conf->currency).' | |||
| '.$langs->trans('NotePrivate').' | '.nl2br($payment->note_private).' | |||
| '.$langs->trans('NotePrivate').' | '.nl2br($payment->note_private).' | |||
| '.$langs->trans('NotePublic').' | '.nl2br($payment->note_public).' | |||
| '.$langs->trans('NotePublic').' | '.nl2br($payment->note_public).' | |||
| '.$langs->trans('BankTransactionLine').' | '; - print ''; + print ' | '; print $bankline->getNomUrl(1,0,'showall'); print ' | '; print '||