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

Look: Add line "None" when there is no bank account

Browse Source
This commit is contained in:
Laurent Destailleur 2011-12-30 00:33:34 +01:00
parent 6d6231aad9
commit efd5f5eaa4
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
htdocs/compta/bank/index.php
View File

@ -20,7 +20,7 @@
/** /**
* \file htdocs/compta/bank/index.php * \file htdocs/compta/bank/index.php
* \ingroup banque * \ingroup banque
* \brief Page accueil banque * \brief Home page of bank module
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -43,7 +43,8 @@ $statut=isset($_GET["statut"])?$_GET["statut"]:'';
* View * View
*/ */
llxHeader(); $help_url='EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:Módulo_Bancos_y_Cajas';
llxHeader('',$langs->trans('AccountsArea'),$help_url);
$link=''; $link='';
if ($statut == '') $link='<a href="'.$_SERVER["PHP_SELF"].'?statut=all">'.$langs->trans("IncludeClosedAccount").'</a>'; if ($statut == '') $link='<a href="'.$_SERVER["PHP_SELF"].'?statut=all">'.$langs->trans("IncludeClosedAccount").'</a>';
@ -88,12 +89,14 @@ print '<td align="center" width="70">'.$langs->trans("Status").'</td>';
print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>'; print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>';
print "</tr>\n"; print "</tr>\n";
$total = 0; $total = 0; $found = 0;
$var=true; $var=true;
foreach ($accounts as $key=>$type) foreach ($accounts as $key=>$type)
{ {
if ($type == 1) if ($type == 1)
{ {
$found++;
$acc = new Account($db); $acc = new Account($db);
$acc->fetch($key); $acc->fetch($key);
@ -122,12 +125,12 @@ foreach ($accounts as $key=>$type)
$total += $solde; $total += $solde;
} }
} }
if (! $found) print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'</td></tr>';
// Total // Total
print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td><td align="right" class="liste_total">'.price($total).'</td></tr>'; print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td><td align="right" class="liste_total">'.price($total).'</td></tr>';
print '<tr><td colspan="5">&nbsp;</td></tr>'; //print '<tr><td colspan="5">&nbsp;</td></tr>';
/* /*
@ -140,13 +143,15 @@ print '<td align="center" width="70">'.$langs->trans("Status").'</td>';
print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>'; print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>';
print "</tr>\n"; print "</tr>\n";
$total = 0; $total = 0; $found = 0;
$var=true; $var=true;
foreach ($accounts as $key=>$type) foreach ($accounts as $key=>$type)
{ {
if ($type == 2) if ($type == 2)
{ {
$acc = new Account($db); $found++;
$acc = new Account($db);
$acc->fetch($key); $acc->fetch($key);
$var = !$var; $var = !$var;
@ -166,13 +171,13 @@ foreach ($accounts as $key=>$type)
$total += $solde; $total += $solde;
} }
} }
if (! $found) print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'</td></tr>';
// Total // Total
print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td><td align="right" class="liste_total">'.price($total).'</td></tr>'; print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td><td align="right" class="liste_total">'.price($total).'</td></tr>';
print '<tr><td colspan="5">&nbsp;</td></tr>'; //print '<tr><td colspan="5">&nbsp;</td></tr>';
/* /*
@ -187,13 +192,15 @@ print '<td align="center" width="70">'.$langs->trans("Status").'</td>';
print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>'; print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>';
print "</tr>\n"; print "</tr>\n";
$total = 0; $total = 0; $found = 0;
$var=true; $var=true;
foreach ($accounts as $key=>$type) foreach ($accounts as $key=>$type)
{ {
if ($type == 0) if ($type == 0)
{ {
$acc = new Account($db); $found++;
$acc = new Account($db);
$acc->fetch($key); $acc->fetch($key);
$var = !$var; $var = !$var;
@ -221,7 +228,7 @@ foreach ($accounts as $key=>$type)
$total += $solde; $total += $solde;
} }
} }
if (! $found) print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'</td></tr>';
// Total // Total
print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td><td align="right" class="liste_total">'.price($total).'</td></tr>'; print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td><td align="right" class="liste_total">'.price($total).'</td></tr>';
@ -241,7 +248,7 @@ if ($user->rights->banque->configurer) {
print "</div>"; print "</div>";
$db->close();
llxFooter(); llxFooter();
$db->close();
?> ?>