From 0e144dd7c3926fc2b283639e82f1f38deaaa13a4 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Wed, 28 Nov 2012 10:32:24 +0100
Subject: [PATCH] fix wrong test for localtax assuj check

---
 htdocs/comm/propal.php | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index dec991e07f3..36dae818cfa 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1565,25 +1565,20 @@ print '<td align="right" nowrap>'.price($object->total_tva).'</td>';
 print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
 // Amount Local Taxes
-if ($mysoc->hasLocalTax(1))
+if ($mysoc->localtax1_assuj=="1") //Localtax1
 {
-	if ($mysoc->localtax1_assuj=="1") //Localtax1
-	{
-		print '<tr><td height="10">'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
-		print '<td align="right" nowrap>'.price($object->total_localtax1).'</td>';
-		print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-	}
+	print '<tr><td height="10">'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
+	print '<td align="right" nowrap>'.price($object->total_localtax1).'</td>';
+	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
 }
-if ($mysoc->hasLocalTax(2))
+if ($mysoc->localtax2_assuj=="1") //Localtax2
 {
-	if ($mysoc->localtax2_assuj=="1") //Localtax2
-	{
-		print '<tr><td height="10">'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
-		print '<td align="right" nowrap>'.price($object->total_localtax2).'</td>';
-		print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-	}
+	print '<tr><td height="10">'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
+	print '<td align="right" nowrap>'.price($object->total_localtax2).'</td>';
+	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
 }
 
+
 // Amount TTC
 print '<tr><td height="10">'.$langs->trans('AmountTTC').'</td>';
 print '<td align="right" nowrap>'.price($object->total_ttc).'</td>';