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

Fix: Hide remainder to pay with amount 0 from "planed transaction" view.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-29 19:53:37 +00:00
parent 727fc871c6
commit b6d1f1b8e9
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
htdocs/compta/bank/treso.php
View File

@ -137,14 +137,14 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
// Solde actuel // Solde actuel
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'>'; print '<tr class="liste_total">';
print '<td align="left" colspan="5">'.$langs->trans("CurrentBalance").'</td>'; print '<td align="left" colspan="5">'.$langs->trans("CurrentBalance").'</td>';
print '<td align="right" nowrap>'.price($solde).'</td>'; print '<td align="right" nowrap>'.price($solde).'</td>';
print '</tr>'; print '</tr>';
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'>'; print '<tr class="liste_total">';
print '<td align="left" colspan="5">'.$langs->trans("RemainderToPay").':</td>'; print '<td align="left" colspan="5">'.$langs->trans("RemainderToPay").'</td>';
print '<td align="right" nowrap>&nbsp;</td>'; print '<td align="right" nowrap>&nbsp;</td>';
print '</tr>'; print '</tr>';
@ -252,7 +252,6 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
$ref = ''; $ref = '';
$refcomp = ''; $refcomp = '';
$var=!$var;
//$obj = $db->fetch_object($result); //$obj = $db->fetch_object($result);
$obj = array_shift($tab_sqlobj); $obj = array_shift($tab_sqlobj);
@ -302,14 +301,25 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
if ($paiement) $total_ttc = $obj->total_ttc - $paiement; if ($paiement) $total_ttc = $obj->total_ttc - $paiement;
$solde += $total_ttc; $solde += $total_ttc;
print "<tr $bc[$var]>"; // We discard with a remain to pay to 0
print '<td>'.dol_print_date($db->jdate($obj->dlr),"day")."</td>"; if (price2num($total_ttc) != 0)
print "<td>".$ref."</td>"; {
print "<td>".$refcomp."</td>"; $var=!$var;
if ($obj->total_ttc < 0) { print "<td align=\"right\">".price($total_ttc)."</td><td>&nbsp;</td>"; };
if ($obj->total_ttc >= 0) { print "<td>&nbsp;</td><td align=\"right\">".price($total_ttc)."</td>"; }; // Show line
print "<td align=\"right\">".price($solde)."</td>"; print "<tr ".$bc[$var].">";
print "</tr>"; print '<td>';
if ($obj->dlr) print dol_print_date($db->jdate($obj->dlr),"day");
else print $langs->trans("NotDefined");
print "</td>";
print "<td>".$ref."</td>";
print "<td>".$refcomp."</td>";
if ($obj->total_ttc < 0) { print "<td align=\"right\">".price($total_ttc)."</td><td>&nbsp;</td>"; };
if ($obj->total_ttc >= 0) { print "<td>&nbsp;</td><td align=\"right\">".price($total_ttc)."</td>"; };
print '<td align="right">'.price($solde).'</td>';
print "</tr>";
}
$i++; $i++;
} }
} }