diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index f10c66363b4..37a5649cd4d 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -51,7 +51,7 @@ if ($_GET["id"]) print ''; print ''; - print ''; + print ''; print ''; print ''; + print dol_print_date($bon->date_trans,'day'); + print ' '.$langs->trans("By").' '.$muser->getFullName($langs).''; print ''; @@ -81,10 +81,10 @@ if ($_GET["id"]) if($bon->date_credit <> 0) { print ''; } - + print '
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'dayhour').'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'day').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans("File").''; @@ -72,8 +72,8 @@ if ($_GET["id"]) $muser->fetch($bon->user_trans); print '
'.$langs->trans("TransData").''; - print dol_print_date($bon->date_trans,'dayhour'); - print ' / '.$muser->getFullName($langs).'
'.$langs->trans("TransMetod").''; print $bon->methodes_trans[$bon->method_trans]; print '
'.$langs->trans('CreditDate').''; - print dol_print_date($bon->date_credit,'dayhour'); + print dol_print_date($bon->date_credit,'day'); print '
'; print ''; diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index 7a720c2b2aa..510e42ffdab 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -54,7 +54,7 @@ if ($_GET["id"]) print ''; print ''; - print ''; + print ''; print ''; print ''; + print dol_print_date($bon->date_trans,'day'); + print ' '.$langs->trans("By").' '.$muser->getFullName($langs).''; print ''; @@ -84,7 +84,7 @@ if ($_GET["id"]) if($bon->date_credit <> 0) { print ''; } diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 95244694886..f85a11ddef6 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -56,7 +56,7 @@ if ($prev_id) print '
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'dayhour').'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'day').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans("File").''; @@ -75,8 +75,8 @@ if ($_GET["id"]) $muser->fetch($bon->user_trans); print '
'.$langs->trans("TransData").''; - print dol_print_date($bon->date_trans,'dayhour'); - print ' / '.$muser->getFullName($langs).'
'.$langs->trans("TransMetod").''; print $bon->methodes_trans[$bon->method_trans]; print '
'.$langs->trans('CreditDate').''; - print dol_print_date($bon->date_credit,'dayhour'); + print dol_print_date($bon->date_credit,'day'); print '
'; print ''; - print ''; + print ''; print ''; print ''; + print dol_print_date($bon->date_trans,'day'); + print ' '.$langs->trans("By").' '.$muser->getFullName($langs).''; print ''; @@ -86,11 +86,10 @@ if ($prev_id) if($bon->date_credit <> 0) { print ''; } - print '
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'dayhour').'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'day').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans("File").''; @@ -77,8 +77,8 @@ if ($prev_id) $muser->fetch($bon->user_trans); print '
'.$langs->trans("TransData").''; - print dol_print_date($bon->date_trans,'dayhour'); - print ' / '.$muser->getFullName($langs).'
'.$langs->trans("TransMetod").''; print $bon->methodes_trans[$bon->method_trans]; print '
'.$langs->trans('CreditDate').''; - print dol_print_date($bon->date_credit,'dayhour'); + print dol_print_date($bon->date_credit,'day'); print '
'; print ''; diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php index 2fec434d714..069a952d8a6 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -136,7 +136,7 @@ if ($_GET["id"]) print ''; print ''; - print ''; + print ''; print ''; print ''; + print dol_print_date($bon->date_trans,'day'); + print ' '.$langs->trans("By").' '.$muser->getFullName($langs).''; print ''; @@ -166,7 +166,7 @@ if ($_GET["id"]) if($bon->date_credit <> 0) { print ''; } diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 25933ad1368..c5a503c2bc6 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -110,8 +110,11 @@ if ($_GET["id"]) print ''.$lipre->bon_ref.''; print ''; print ''; + + print $lipre->LibStatut($lipre->statut,1).''; + + /*print ' '; + print $langs->trans($lipre->statuts[$lipre->statut]).'';*/ if ($lipre->statut == 3) { @@ -191,7 +194,7 @@ if ($_GET["id"]) foreach($rej->motifs as $key => $value) { - print ''; + print ''; } print ''; print ''; diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index a02a8ac307d..49ca0fdfbca 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -57,9 +57,8 @@ if ($_GET["id"]) print '
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'dayhour').'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'day').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans("File").''; @@ -157,8 +157,8 @@ if ($_GET["id"]) $muser->fetch($bon->user_trans); print '
'.$langs->trans("TransData").''; - print dol_print_date($bon->date_trans,'dayhour'); - print ' / '.$muser->getFullName($langs).'
'.$langs->trans("TransMetod").''; print $bon->methodes_trans[$bon->method_trans]; print '
'.$langs->trans('CreditDate').''; - print dol_print_date($bon->date_credit,'dayhour'); + print dol_print_date($bon->date_credit,'day'); print '
'.$langs->trans("Amount").''.price($lipre->amount).'
'.$langs->trans("Status").''; - print ' '; - print $langs->trans($lipre->statuts[$lipre->statut]).'
'; - //print ''; print ''; - print ''; + print ''; print ''; print ''; + print dol_print_date($bon->date_trans,'day'); + print ' '.$langs->trans("By").' '.$muser->getFullName($langs).''; print ''; @@ -89,11 +88,10 @@ if ($_GET["id"]) if($bon->date_credit <> 0) { print ''; } - print '
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'dayhour').'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'day').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans("File").''; @@ -80,8 +79,8 @@ if ($_GET["id"]) $muser->fetch($bon->user_trans); print '
'.$langs->trans("TransData").''; - print dol_print_date($bon->date_trans,'dayhour'); - print ' / '.$muser->getFullName($langs).'
'.$langs->trans("TransMetod").''; print $bon->methodes_trans[$bon->method_trans]; print '
'.$langs->trans('CreditDate').''; - print dol_print_date($bon->date_credit,'dayhour'); + print dol_print_date($bon->date_credit,'day'); print '
'; print '';