lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/aspangaro/dolibarr into

Browse Source 
aspangaro-develop

Conflicts:
	htdocs/core/lib/bank.lib.php
This commit is contained in:
Laurent Destailleur 2014-04-13 02:11:54 +02:00
commit 38a0596594
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/compta/index.php
View File

@ -528,7 +528,6 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire)
else dol_print_error($db); else dol_print_error($db);
} }
/** /**
* Social contributions to pay * Social contributions to pay
*/ */

4
htdocs/compta/paiement_charge.php
View File

@ -242,7 +242,7 @@ if ($_GET["action"] == 'create')
print '<td align="right">'.$langs->trans("Amount").'</td>'; print '<td align="right">'.$langs->trans("Amount").'</td>';
print '<td align="right">'.$langs->trans("AlreadyPaid").'</td>'; print '<td align="right">'.$langs->trans("AlreadyPaid").'</td>';
print '<td align="right">'.$langs->trans("RemainderToPay").'</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"; print "</tr>\n";
$var=True; $var=True;
@ -275,7 +275,7 @@ if ($_GET["action"] == 'create')
print '<td align="right">'.price($objp->amount-$sumpaid)."</td>"; print '<td align="right">'.price($objp->amount-$sumpaid)."</td>";
print '<td align="right">'; print '<td align="center">';
if ($sumpaid < $objp->amount) if ($sumpaid < $objp->amount)
{ {
$namef = "amount_".$objp->id; $namef = "amount_".$objp->id;

25
htdocs/core/lib/bank.lib.php
View File

@ -30,7 +30,8 @@
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to shoc
*/ */
function bank_prepare_head($object) { function bank_prepare_head($object)
{
global $langs, $conf, $user; global $langs, $conf, $user;
$h = 0; $h = 0;
$head = array(); $head = array();
@ -70,19 +71,22 @@ function bank_prepare_head($object) {
$head[$h][2] = 'graph'; $head[$h][2] = 'graph';
$h++; $h++;
if ($object->courant != 2) { 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][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".$object->id;
$head[$h][2] = 'statement'; $head[$h][1] = $langs->trans("AccountStatements");
$h++; $head[$h][2] = 'statement';
} $h++;
}
// Show more tabs from modules // Show more tabs from modules
// Entries must be declared in modules descriptor with line // 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 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');
complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank', 'remove');
return $head; return $head;
} }
@ -92,7 +96,8 @@ function bank_prepare_head($object) {
* @param Account $account A bank account * @param Account $account A bank account
* @return int True if informations are valid, false otherwise * @return int True if informations are valid, false otherwise
*/ */
function checkBanForAccount($account) { function checkBanForAccount($account)
{
$country_code = $account->getCountryCode(); $country_code = $account->getCountryCode();
// For compatibility between // For compatibility between