From e8e4cc08dec5a1ac787979c01782a020037546ee Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Wed, 28 Nov 2012 10:35:16 +0100
Subject: [PATCH] show localtaxes in order

---
 htdocs/commande/fiche.php | 48 ++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 3f77370edf5..e7533d0055d 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -1581,18 +1581,16 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 			print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
 			print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($objectsrc->total_ht).'</td></tr>';
 			print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($objectsrc->total_tva)."</td></tr>";
-			if ($mysoc->country_code=='ES')
+			if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
 			{
-				if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
-				{
-					print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax1)."</td></tr>";
-				}
-
-				if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
-				{
-					print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax2)."</td></tr>";
-				}
+				print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax1)."</td></tr>";
 			}
+
+			if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
+			{
+				print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax2)."</td></tr>";
+			}
+
 			print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($objectsrc->total_ttc)."</td></tr>";
 		}
 		else
@@ -1814,11 +1812,8 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 			if (! empty($conf->projet->enabled)) $nbrow++;
 
 			//Local taxes
-			if ($mysoc->country_code=='ES')
-			{
-				if($mysoc->localtax1_assuj=="1") $nbrow++;
-				if($mysoc->localtax2_assuj=="1") $nbrow++;
-			}
+			if($mysoc->localtax1_assuj=="1") $nbrow++;
+			if($mysoc->localtax2_assuj=="1") $nbrow++;
 
 			print '<table class="border" width="100%">';
 
@@ -2075,20 +2070,17 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 			print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>';
 
 			// Amount Local Taxes
-			if ($mysoc->country_code=='ES')
+			if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
 			{
-				if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
-				{
-					print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
-					print '<td align="right">'.price($object->total_localtax1).'</td>';
-					print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-				}
-				if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
-				{
-					print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
-					print '<td align="right">'.price($object->total_localtax2).'</td>';
-					print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-				}
+				print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
+				print '<td align="right">'.price($object->total_localtax1).'</td>';
+				print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+			}
+			if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
+			{
+				print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
+				print '<td align="right">'.price($object->total_localtax2).'</td>';
+				print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
 			}
 
 			// Total TTC