From 0e2de4f1559cb26ae80c004eb850f8fe7e552e03 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Apr 2012 01:58:46 +0200
Subject: [PATCH] Fix: [ bug #318 ] Journal des achats

---
 htdocs/compta/journal/purchasesjournal.php | 37 +++++++++++++---------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index e80654f49ae..a7fedabd644 100755
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -54,8 +54,8 @@ $html=new Form($db);
 
 $year_current = strftime("%Y",dol_now());
 $pastmonth = strftime("%m",dol_now()) - 1;
-$pastmonthyear = $year_current; 
-if ($pastmonth == 0) 
+$pastmonthyear = $year_current;
+if ($pastmonth == 0)
 {
 	$pastmonth = 12;
 	$pastmonthyear--;
@@ -156,17 +156,6 @@ foreach ($tabfac as $key => $val)
 	$invoicestatic->ref=$val["ref"];
 	$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
 	foreach ($tabht[$key] as $k => $mt)
 	{
@@ -176,7 +165,10 @@ foreach ($tabfac as $key => $val)
 			//print "<td>".$conf->global->COMPTA_JOURNAL_BUY."</td>";
 			print "<td>".$val["date"]."</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
@@ -189,9 +181,24 @@ foreach ($tabfac as $key => $val)
 			//print "<td>".$conf->global->COMPTA_JOURNAL_BUY."</td>";
 			print "<td>".$val["date"]."</td>";
 			print "<td>".$invoicestatic->getNomUrl(1)."</td>";
-			print "<td>".$k."</td><td>".$langs->trans("VAT")." ".$key."</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;
 }