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

update with html5 compliant code

Browse Source
This commit is contained in:
Philippe GRAND 2019-01-24 16:43:28 +01:00
parent 7c086ba8ed
commit 0b353dc560
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/cashcontrol/cashcontrol_list.php
View File

@ -516,7 +516,7 @@ if (isset($totalarray['pos']))
while ($i < $totalarray['nbfield'])
{
$i++;
if (! empty($totalarray['pos'][$i])) print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
if (! empty($totalarray['pos'][$i])) print '<td class="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
else
{
if ($i == 1)

16
htdocs/compta/cashcontrol/report.php
View File

@ -172,7 +172,7 @@ if ($resql)
{
print '<tr class="oddeven">';
print '<td>'.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").'</td>';
print '<td></td><td></td><td></td><td align="right">'.price($cashcontrol->opening).'</td>';
print '<td></td><td></td><td></td><td class="right">'.price($cashcontrol->opening).'</td>';
print '</tr>';
$first = "no";
}*/
@ -180,7 +180,7 @@ if ($resql)
print '<tr class="oddeven">';
// Ref
print '<td align="left" class="nowrap">';
print '<td class="nowrap left">';
$invoicetmp->fetch($objp->facid);
print $invoicetmp->getNomUrl(1);
print '</td>';
@ -188,13 +188,13 @@ if ($resql)
// Date ope
print '<td align="left" class="nowrap">';
print '<td class="nowrap left">';
print '<span id="dateoperation_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->do),"day")."</span>";
print "</td>\n";
if (! $i) $totalarray['nbfield']++;
// Bank account
print '<td align="right" class="nowrap">';
print '<td class="nowrap right">';
print $bankaccount->getNomUrl(1);
if ($conf->global->CASHDESK_ID_BANKACCOUNT_CASH==$bankaccount->id) $cash+=$objp->amount;
elseif ($conf->global->CASHDESK_ID_BANKACCOUNT_CB==$bankaccount->id) $bank+=$objp->amount;
@ -204,7 +204,7 @@ if ($resql)
if (! $i) $totalarray['nbfield']++;
// Debit
print '<td align="right">';
print '<td class="right">';
if ($objp->amount < 0)
{
print price($objp->amount * -1);
@ -215,7 +215,7 @@ if ($resql)
if (! $i) $totalarray['totaldebfield']=$totalarray['nbfield'];
// Credit
print '<td align="right">';
print '<td class="right">';
if ($objp->amount > 0)
{
print price($objp->amount);
@ -243,8 +243,8 @@ if ($resql)
if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
}
elseif ($totalarray['totaldebfield'] == $i) print '<td align="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
elseif ($totalarray['totalcredfield'] == $i) print '<td align="right">'.price($totalarray['totalcred']).'</td>';
elseif ($totalarray['totaldebfield'] == $i) print '<td class="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
elseif ($totalarray['totalcredfield'] == $i) print '<td class="right">'.price($totalarray['totalcred']).'</td>';
else print '<td></td>';
}
print '</tr>';