diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index bba6df04494..7ea4fedc0c8 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -402,8 +402,7 @@ if ($result) if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { print ''; - if ($objp->rappro) print dol_print_date($db->jdate($objp->do),"day"); - else $html->select_date($db->jdate($objp->do),'dateo','','','','update'); + print $html->select_date($db->jdate($objp->do),'dateo','','','','update',1,0,1,$objp->rappro); print 'rappro?' disabled="true"':'').'>'; } else @@ -418,10 +417,9 @@ if ($result) if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { print ''; - if ($objp->rappro) print dol_print_date($db->jdate($objp->dv),"day"); - else + print $html->select_date($db->jdate($objp->dv),'datev','','','','update',1,0,1,$objp->rappro); + if (! $objp->rappro) { - $html->select_date($db->jdate($objp->dv),'datev','','','','update'); print '   '; print ''; print img_edit_remove() . " "; @@ -442,32 +440,17 @@ if ($result) if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { print ''; - if ($objp->rappro) + print 'rappro?' disabled="true"':'').' value="'; + if (preg_match('/^\((.*)\)$/i',$objp->label,$reg)) { - if (preg_match('/^\((.*)\)$/i',$objp->label,$reg)) - { - // Label generique car entre parentheses. On l'affiche en le traduisant - print $langs->trans($reg[1]); - } - else - { - print $objp->label; - } + // Label generique car entre parentheses. On l'affiche en le traduisant + print $langs->trans($reg[1]); } else { - print ''; + print $objp->label; } + print '" size="50">'; } else { @@ -489,8 +472,7 @@ if ($result) if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { print ''; - if ($objp->rappro) print price($objp->amount); - else print ' '.$langs->trans("Currency".$conf->monnaie); + print 'rappro?' disabled="true"':'').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$conf->monnaie); print ''; } else @@ -519,7 +501,15 @@ if ($result) if ($user->rights->banque->consolidate) { print ''; - print $langs->trans("AccountStatement").' '; + if ($objp->rappro) + { + print $langs->trans("AccountStatement").' rappro?' disabled="true"':'').'>'; + print ''; + } + else + { + print $langs->trans("AccountStatement").' rappro?' disabled="true"':'').'>'; + } print ''; } else