diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index d2a78423068a51ed2e8744923536ab0163feeec2..d6833f628b74f909bb00cd29a294dbd88591649e 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -528,7 +528,6 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire) else dol_print_error($db); } - /** * Social contributions to pay */ diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index dbdc14cb1b01ec3ac2e69e1e38312a2ce6abc450..b6d30ae01b0ccccfdc288a2022d66929ee27e327 100644 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -242,7 +242,7 @@ if ($_GET["action"] == 'create') print '<td align="right">'.$langs->trans("Amount").'</td>'; print '<td align="right">'.$langs->trans("AlreadyPaid").'</td>'; print '<td align="right">'.$langs->trans("RemainderToPay").'</td>'; - print '<td align="right">'.$langs->trans("Amount").'</td>'; + print '<td align="center">'.$langs->trans("Amount").'</td>'; print "</tr>\n"; $var=True; @@ -275,7 +275,7 @@ if ($_GET["action"] == 'create') print '<td align="right">'.price($objp->amount-$sumpaid)."</td>"; - print '<td align="right">'; + print '<td align="center">'; if ($sumpaid < $objp->amount) { $namef = "amount_".$objp->id; diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php index 88e6290bf42a3a5030091a7da367e9f88939f918..2433630b3057dd1ca8899a9737f6e2b4fe5d3249 100644 --- a/htdocs/core/lib/bank.lib.php +++ b/htdocs/core/lib/bank.lib.php @@ -30,7 +30,8 @@ * @param Object $object Object related to tabs * @return array Array of tabs to shoc */ -function bank_prepare_head($object) { +function bank_prepare_head($object) +{ global $langs, $conf, $user; $h = 0; $head = array(); @@ -70,19 +71,22 @@ function bank_prepare_head($object) { $head[$h][2] = 'graph'; $h++; - if ($object->courant != 2) { - $head[$h][0] = DOL_URL_ROOT . "/compta/bank/releve.php?account=" . $object->id; - $head[$h][1] = $langs->trans("AccountStatements"); - $head[$h][2] = 'statement'; - $h++; - } + if ($object->courant != 2) + { + $head[$h][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".$object->id; + $head[$h][1] = $langs->trans("AccountStatements"); + $head[$h][2] = 'statement'; + $h++; + } - // Show more tabs from modules + // Show more tabs from modules // Entries must be declared in modules descriptor with line // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab + // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank'); + complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank', 'remove'); + return $head; } @@ -92,7 +96,8 @@ function bank_prepare_head($object) { * @param Account $account A bank account * @return int True if informations are valid, false otherwise */ -function checkBanForAccount($account) { +function checkBanForAccount($account) +{ $country_code = $account->getCountryCode(); // For compatibility between @@ -127,7 +132,7 @@ function checkBanForAccount($account) { } if ($country_code == 'BE') { // Belgium rules - + } if ($country_code == 'ES') { // Spanish rules