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

Fix: [ bug #318 ] Journal des achats

Browse Source
This commit is contained in:
Laurent Destailleur 2012-04-08 01:58:33 +02:00
parent 6d8a639839
commit a2825eb209
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/compta/journal/purchasesjournal.php
View File

@ -161,17 +161,6 @@ foreach ($tabfac as $key => $val)
$invoicestatic->ref=$val["ref"]; $invoicestatic->ref=$val["ref"];
$invoicestatic->type=$val["type"]; $invoicestatic->type=$val["type"];
print "<tr ".$bc[$var].">";
// third party
//print "<td>".$conf->global->COMPTA_JOURNAL_BUY."</td>";
print "<td>".$val["date"]."</td>";
print "<td>".$invoicestatic->getNomUrl(1)."</td>";
foreach ($tabttc[$key] as $k => $mt)
{
print "<td>".$k."</td><td>".$langs->trans("ThirdParty")."</td><td align='right'>".($mt>=0?price($mt):'')."</td><td align='right'>".($mt<0?-price(-$mt):'')."</td>";
}
print "</tr>";
// product // product
foreach ($tabht[$key] as $k => $mt) foreach ($tabht[$key] as $k => $mt)
{ {
@ -181,7 +170,10 @@ foreach ($tabfac as $key => $val)
//print "<td>".$conf->global->COMPTA_JOURNAL_BUY."</td>"; //print "<td>".$conf->global->COMPTA_JOURNAL_BUY."</td>";
print "<td>".$val["date"]."</td>"; print "<td>".$val["date"]."</td>";
print "<td>".$invoicestatic->getNomUrl(1)."</td>"; print "<td>".$invoicestatic->getNomUrl(1)."</td>";
print "<td>".$k."</td><td>".$langs->trans("Products")."</td><td align='right'>".($mt<0?price(-$mt):'')."</td><td align='right'>".($mt>=0?price($mt):'')."</td></tr>"; print "<td>".$k."</td><td>".$langs->trans("Products")."</td>";
print '<td align="right">'.($mt>=0?price($mt):'')."</td>";
print '<td align="right">'.($mt<0?price(-$mt):'')."</td>";
print "</tr>";
} }
} }
// vat // vat
@ -194,10 +186,26 @@ foreach ($tabfac as $key => $val)
//print "<td>".$conf->global->COMPTA_JOURNAL_BUY."</td>"; //print "<td>".$conf->global->COMPTA_JOURNAL_BUY."</td>";
print "<td>".$val["date"]."</td>"; print "<td>".$val["date"]."</td>";
print "<td>".$invoicestatic->getNomUrl(1)."</td>"; print "<td>".$invoicestatic->getNomUrl(1)."</td>";
print "<td>".$k."</td><td>".$langs->trans("VAT")."</td><td align='right'>".($mt<0?price(-$mt):'')."</td><td align='right'>".($mt>=0?price($mt):'')."</td></tr>"; print "<td>".$k."</td><td>".$langs->trans("VAT")." ".$key."</td>";
print '<td align="right">'.($mt>=0?price($mt):'')."</td>";
print '<td align="right">'.($mt<0?price(-$mt):'')."</td>";
print "</tr>";
} }
} }
print "<tr ".$bc[$var].">";
// third party
//print "<td>".$conf->global->COMPTA_JOURNAL_BUY."</td>";
print "<td>".$val["date"]."</td>";
print "<td>".$invoicestatic->getNomUrl(1)."</td>";
foreach ($tabttc[$key] as $k => $mt)
{
print "<td>".$k."</td><td>".$langs->trans("ThirdParty")."</td>";
print '<td align="right">'.($mt<0?-price(-$mt):'')."</td>";
print '<td align="right">'.($mt>=0?price($mt):'')."</td>";
}
print "</tr>";
$var = !$var; $var = !$var;
} }
@ -206,5 +214,6 @@ print "</table>";
// End of page // End of page
llxFooter(); llxFooter();
$db->close(); $db->close();
?> ?>