update with html5 compliant code
This commit is contained in:
parent
7c086ba8ed
commit
0b353dc560
@ -516,7 +516,7 @@ if (isset($totalarray['pos']))
|
|||||||
while ($i < $totalarray['nbfield'])
|
while ($i < $totalarray['nbfield'])
|
||||||
{
|
{
|
||||||
$i++;
|
$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
|
else
|
||||||
{
|
{
|
||||||
if ($i == 1)
|
if ($i == 1)
|
||||||
|
|||||||
@ -172,7 +172,7 @@ if ($resql)
|
|||||||
{
|
{
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td>'.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").'</td>';
|
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>';
|
print '</tr>';
|
||||||
$first = "no";
|
$first = "no";
|
||||||
}*/
|
}*/
|
||||||
@ -180,7 +180,7 @@ if ($resql)
|
|||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
|
|
||||||
// Ref
|
// Ref
|
||||||
print '<td align="left" class="nowrap">';
|
print '<td class="nowrap left">';
|
||||||
$invoicetmp->fetch($objp->facid);
|
$invoicetmp->fetch($objp->facid);
|
||||||
print $invoicetmp->getNomUrl(1);
|
print $invoicetmp->getNomUrl(1);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
@ -188,13 +188,13 @@ if ($resql)
|
|||||||
|
|
||||||
|
|
||||||
// Date ope
|
// 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 '<span id="dateoperation_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->do),"day")."</span>";
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
if (! $i) $totalarray['nbfield']++;
|
if (! $i) $totalarray['nbfield']++;
|
||||||
|
|
||||||
// Bank account
|
// Bank account
|
||||||
print '<td align="right" class="nowrap">';
|
print '<td class="nowrap right">';
|
||||||
print $bankaccount->getNomUrl(1);
|
print $bankaccount->getNomUrl(1);
|
||||||
if ($conf->global->CASHDESK_ID_BANKACCOUNT_CASH==$bankaccount->id) $cash+=$objp->amount;
|
if ($conf->global->CASHDESK_ID_BANKACCOUNT_CASH==$bankaccount->id) $cash+=$objp->amount;
|
||||||
elseif ($conf->global->CASHDESK_ID_BANKACCOUNT_CB==$bankaccount->id) $bank+=$objp->amount;
|
elseif ($conf->global->CASHDESK_ID_BANKACCOUNT_CB==$bankaccount->id) $bank+=$objp->amount;
|
||||||
@ -204,7 +204,7 @@ if ($resql)
|
|||||||
if (! $i) $totalarray['nbfield']++;
|
if (! $i) $totalarray['nbfield']++;
|
||||||
|
|
||||||
// Debit
|
// Debit
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
if ($objp->amount < 0)
|
if ($objp->amount < 0)
|
||||||
{
|
{
|
||||||
print price($objp->amount * -1);
|
print price($objp->amount * -1);
|
||||||
@ -215,7 +215,7 @@ if ($resql)
|
|||||||
if (! $i) $totalarray['totaldebfield']=$totalarray['nbfield'];
|
if (! $i) $totalarray['totaldebfield']=$totalarray['nbfield'];
|
||||||
|
|
||||||
// Credit
|
// Credit
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
if ($objp->amount > 0)
|
if ($objp->amount > 0)
|
||||||
{
|
{
|
||||||
print price($objp->amount);
|
print price($objp->amount);
|
||||||
@ -243,8 +243,8 @@ if ($resql)
|
|||||||
if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
|
if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
|
||||||
else print '<td class="left">'.$langs->trans("Totalforthispage").'</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['totaldebfield'] == $i) print '<td class="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
|
||||||
elseif ($totalarray['totalcredfield'] == $i) print '<td align="right">'.price($totalarray['totalcred']).'</td>';
|
elseif ($totalarray['totalcredfield'] == $i) print '<td class="right">'.price($totalarray['totalcred']).'</td>';
|
||||||
else print '<td></td>';
|
else print '<td></td>';
|
||||||
}
|
}
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user