diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index f02b4326a31..609a3f47bd1 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -4,7 +4,7 @@ * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2004 Christophe Combelles * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2015 Alexandre Spangaro + * Copyright (C) 2015-2016 Alexandre Spangaro * Copyright (C) 2015 Jean-François Ferry * Copyright (C) 2016 Marcos García * @@ -274,8 +274,8 @@ if ($result) $linkback = ''.$langs->trans("BackToList").''; // Ref - print ''.$langs->trans("Ref").""; - print ''; + print ''.$langs->trans("Ref").""; + print ''; print $form->showrefnav($bankline, 'rowid', $linkback, 1, 'rowid', 'rowid'); print ''; print ''; @@ -285,7 +285,7 @@ if ($result) // Bank account print "".$langs->trans("Account").""; - print ''; + print ''; print $acct->getNomUrl(1,'transactions'); print ''; print ''; @@ -294,7 +294,7 @@ if ($result) if (count($links)) { print "".$langs->trans("Links").""; - print ''; + print ''; foreach($links as $key=>$val) { if ($key) print '
'; @@ -389,8 +389,6 @@ if ($result) print ''; } - $rowspan=0; - //$user->rights->banque->modifier=false; //$user->rights->banque->consolidate=true; @@ -399,7 +397,7 @@ if ($result) print ""; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { - print ''; + print ''; $form->select_types_paiements($objp->fk_type,"value",'',2); print ''; if ($objp->receiptid) @@ -411,13 +409,10 @@ if ($result) } print ''; - $rowspan=7; - print ''; - print ''; } else { - print ''.$objp->fk_type.' '.$objp->num_chq.''; + print ''.$objp->fk_type.' '.$objp->num_chq.''; } print ""; @@ -425,13 +420,13 @@ if ($result) print "".$langs->trans("Bank").""; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { - print ''; + print ''; print ''; print ''; } else { - print ''.$objp->banque.''; + print ''.$objp->banque.''; } print ""; @@ -439,13 +434,13 @@ if ($result) print "".$langs->trans("CheckTransmitter").""; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { - print ''; + print ''; print ''; print ''; } else { - print ''.$objp->emetteur.''; + print ''.$objp->emetteur.''; } print ""; @@ -453,13 +448,13 @@ if ($result) print ''.$langs->trans("DateOperation").''; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { - print ''; + print ''; print $form->select_date($db->jdate($objp->do),'dateo','','','','update',1,0,1,$objp->rappro); print ''; } else { - print ''; + print ''; print dol_print_date($db->jdate($objp->do),"day"); print ''; } @@ -469,7 +464,7 @@ if ($result) print "".$langs->trans("DateValue").""; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { - print ''; + print ''; print $form->select_date($db->jdate($objp->dv),'datev','','','','update',1,0,1,$objp->rappro); if (! $objp->rappro) { @@ -483,7 +478,7 @@ if ($result) } else { - print ''; + print ''; print dol_print_date($db->jdate($objp->dv),"day"); print ''; } @@ -493,7 +488,7 @@ if ($result) print "".$langs->trans("Label").""; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { - print ''; + print ''; print 'rappro?' disabled':'').' value="'; if (preg_match('/^\((.*)\)$/i',$objp->label,$reg)) { @@ -509,7 +504,7 @@ if ($result) } else { - print ''; + print ''; if (preg_match('/^\((.*)\)$/i',$objp->label,$reg)) { // Label generique car entre parentheses. On l'affiche en le traduisant @@ -527,19 +522,22 @@ if ($result) print "".$langs->trans("Amount").""; if ($user->rights->banque->modifier) { - print ''; + print ''; print 'rappro?' disabled':'').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$acct->currency_code); print ''; } else { - print ''; + print ''; print price($objp->amount); print ''; } print ""; print ""; + + print '
'; + print ""; // Releve rappro @@ -554,10 +552,10 @@ if ($result) print ''; - print '"; + print '"; if ($user->rights->banque->consolidate) { - print ''; + print ''; } else { - print ''; + print ''; } print ''; print ""; if ($user->rights->banque->consolidate) { - print ''; } else { - print ''; + print ''; } print ''; + print '
'.$langs->trans("Conciliation")."
'.$langs->trans("Conciliation")."'; + print ''; if ($objp->rappro) { print $langs->trans("AccountStatement").' rappro?' disabled':'').'>'; @@ -568,28 +566,31 @@ if ($result) print $langs->trans("AccountStatement").' rappro?' disabled':'').'>'; } if ($objp->num_releve) print '   ('.$langs->trans("AccountStatement").' '.$objp->num_releve.')'; - print ''.$objp->num_releve.' '.$objp->num_releve.' 
".$langs->trans("BankLineConciliated")."'; + print ''; print 'rappro?' checked="checked"':'')).'">'; print ''.yn($objp->rappro).''.yn($objp->rappro).'
'; - print ''; + print '
'; + + print ''; } }