diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index 182340a2baab7fb99b6444adf5841b246de887f7..5b453f43288da6f409c279a7a0df84717c88f019 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -496,9 +496,9 @@ else unset($tblyear[1]); unset($tblyear[2]); - print '<div class="fichecenter"><div class="fichehalfleft"><div class="center">'; + print '<div class="fichecenter"><div class="fichehalfleft"><div align="center">'; // do not use class="center" here, it will have no effect for the js graph inside. print $show1; - print '</div></div><div class="fichehalfright"><div class="ficheaddleft"><div class="center">'; + print '</div></div><div class="fichehalfright"><div class="ficheaddleft"><div align="center">'; // do not use class="center" here, it will have no effect for the js graph inside. print $show2; print '</div></div></div></div>'; print '<div style="clear:both"></div>'; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 9c0205c62b3d2b9caf8c192d50447b4c76fc5a16..80befe3d433e04b1711fed980f783f0fee98fa25 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -1,6 +1,6 @@ <?php /* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> - * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> + * Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2012 VinÃcius Nogueira <viniciusvgn@gmail.com> * Copyright (C) 2014 Florian Henry <florian.henry@open-cooncept.pro> @@ -196,13 +196,13 @@ if ($resql) print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'b.rowid','',$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans('DateOperationShort'),$_SERVER['PHP_SELF'],'b.dateo','',$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Value'),$_SERVER['PHP_SELF'],'b.datev','',$param,'align="center"',$sortfield,$sortorder); - print '<td class="liste_titre" align="center">'.$langs->trans("Type").'</td>'; - print '<td class="liste_titre">'.$langs->trans("Numero").'</td>'; - print '<td class="liste_titre">'.$langs->trans("Description").'</td>'; - print '<td class="liste_titre">'.$langs->trans("ThirdParty").'</td>'; - print '<td class="liste_titre" align="right">'.$langs->trans("Debit").'</td>'; - print '<td class="liste_titre" align="right">'.$langs->trans("Credit").'</td>'; - print '<td class="liste_titre" align="left"> '.$langs->trans("Account").'</td>'; + print_liste_field_titre($langs->trans("Type"),$_SERVER['PHP_SELF'],'','',$param,'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Numero")); + print_liste_field_titre($langs->trans("Description")); + print_liste_field_titre($langs->trans("ThirdParty")); + print_liste_field_titre($langs->trans("Debit"),$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Credit"),$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Account"),$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder); print "</tr>\n"; print '<tr class="liste_titre">'; @@ -214,9 +214,9 @@ if ($resql) print '</td>'; print '<td class="liste_titre"><input type="text" class="flat" name="req_nb" value="'.GETPOST("req_nb").'" size="2"></td>'; print '<td class="liste_titre">'; - print '<input type="text" class="flat" name="description" size="24" value="'.$description.'">'; + print '<input type="text" class="flat" name="description" size="10" value="'.$description.'">'; print '</td>'; - print '<td class="liste_titre"><input type="text" class="flat" name="thirdparty" value="'.GETPOST("thirdparty").'" size="14"></td>'; + print '<td class="liste_titre"><input type="text" class="flat" name="thirdparty" value="'.GETPOST("thirdparty").'" size="10"></td>'; print '<td class="liste_titre" align="right">'; print '<input type="text" class="flat" name="debit" size="4" value="'.$debit.'">'; print '</td>'; @@ -267,7 +267,7 @@ if ($resql) print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->dv),"day")."</td>\n"; // Payment type - print '<td class="nowrap">'; + print '<td align="center" class="nowrap">'; $labeltype=($langs->trans("PaymentTypeShort".$objp->fk_type)!="PaymentTypeShort".$objp->fk_type)?$langs->trans("PaymentTypeShort".$objp->fk_type):$langs->getLabelFromKey($db,$objp->fk_type,'c_paiement','code','libelle'); if ($labeltype == 'SOLD') print ' '; //$langs->trans("InitialBankBalance"); else print $labeltype; @@ -305,7 +305,7 @@ if ($resql) // Debit/Credit if ($objp->amount < 0) { - print "<td align=\"right\">".price($objp->amount * -1)."</td><td> </td>\n"; + print '<td align="right">'.price($objp->amount * -1)."</td><td> </td>\n"; $total_debit+=$objp->amount; } else @@ -315,7 +315,7 @@ if ($resql) } // Bank account - print '<td align="left" class="nowrap">'; + print '<td align="right" class="nowrap">'; $bankaccountstatic->id=$objp->bankid; $bankaccountstatic->label=$objp->bankref; print $bankaccountstatic->getNomUrl(1); diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index 1abc421cf461ea9370244fe47c635af4b649db04..ee11532a46f13447f73a5bb753b62513d8f3b84e 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -42,6 +42,7 @@ $socid = GETPOST('socid','int'); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'prelevement','',''); + /* * Actions */ @@ -158,7 +159,7 @@ if ($resql) } else { - print '<tr><td colspan="2">'.$langs->trans("NoInvoiceToWithdraw").'</td></tr>'; + print '<tr '.$bc[false].'><td colspan="2">'.$langs->trans("NoInvoiceToWithdraw").'</td></tr>'; } print "</table><br>"; }