From 1e8aae4de46c2e4b701c65afd34452d362d9203f Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Wed, 28 Nov 2012 12:11:42 +0100
Subject: [PATCH 1/5] show local taxes on crabe pdf model

---
 .../modules/facture/doc/pdf_crabe.modules.php | 217 +++++++++++++-----
 1 file changed, 154 insertions(+), 63 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 33827261db1..f9b007f3d0b 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2012	Regis Houssin		<regis@dolibarr.fr>
  * Copyright (C) 2008		Raphael Bertrand	<raphael.bertrand@resultic.fr>
  * Copyright (C) 2010-2012	Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2012      	Christophe Battarel <christophe.battarel@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -371,16 +372,24 @@ class pdf_crabe extends ModelePDFFactures
 					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
 
 					$vatrate=(string) $object->lines[$i]->tva_tx;
-					$localtax1rate=(string) $object->lines[$i]->localtax1_tx;
-					$localtax2rate=(string) $object->lines[$i]->localtax2_tx;
 
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
 					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]='';
-					if (! isset($this->localtax1[$localtax1rate])) 	$this->localtax1[$localtax1rate]='';
-					if (! isset($this->localtax2[$localtax2rate])) 	$this->localtax2[$localtax2rate]='';
 					$this->tva[$vatrate] += $tvaligne;
-					$this->localtax1[$localtax1rate]+=$localtax1ligne;
-					$this->localtax2[$localtax2rate]+=$localtax2ligne;
+
+					// Search local taxes
+					$sql  = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type";
+					$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
+					$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$object->client->country_code."'";
+					$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
+
+					$resqlt=$this->db->query($sql);
+					if ($resqlt)
+					{
+						$objt = $this->db->fetch_object($resqlt);
+						$this->localtax1[$objt->localtax1_type][$objt->localtax1]+=$localtax1ligne;
+						$this->localtax2[$objt->localtax2_type][$objt->localtax2]+=$localtax2ligne;
+					}
 
 					// Add line
 					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
@@ -822,6 +831,84 @@ class pdf_crabe extends ModelePDFFactures
 			}
 			else
 			{
+				//Local tax 1 before VAT
+				if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				{
+					foreach( $this->localtax1 as $localtax_type => $localtax_rate ) {
+						switch ($localtax_type) {
+							case '1':
+							case '3':
+							case '5':
+							case '7':
+								continue 2;
+								break;
+						}
+						foreach( $localtax_rate as $tvakey => $tvaval )
+						{
+							if ($tvakey>0)    // On affiche pas taux 0
+							{
+								//$this->atleastoneratenotnull++;
+
+								$index++;
+								$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
+
+								$tvacompl='';
+								if (preg_match('/\*/',$tvakey))
+								{
+									$tvakey=str_replace('*','',$tvakey);
+									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+								}
+								$totalvat = $outputlangs->transnoentities("TotalLT1".$mysoc->pays_code).' ';
+								$totalvat.=vatrate($tvakey,1).$tvacompl;
+								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+								$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+							}
+						}
+					}
+	      }
+				//Local tax 2  before VAT
+				if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				{
+					foreach( $this->localtax2 as $localtax_type => $localtax_rate ) {
+						switch ($localtax_type) {
+							case '1':
+							case '3':
+							case '5':
+							case '7':
+								continue 2;
+								break;
+						}
+						foreach( $localtax_rate as $tvakey => $tvaval )
+						{
+							if ($tvakey>0)    // On affiche pas taux 0
+							{
+								//$this->atleastoneratenotnull++;
+
+
+
+								$index++;
+								$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
+
+								$tvacompl='';
+								if (preg_match('/\*/',$tvakey))
+								{
+									$tvakey=str_replace('*','',$tvakey);
+									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+								}
+								$totalvat = $outputlangs->transnoentities("TotalLT2".$mysoc->pays_code).' ';
+								$totalvat.=vatrate($tvakey,1).$tvacompl;
+								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+								$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+
+							}
+						}
+					}
+				}
+				// VAT
 				foreach($this->tva as $tvakey => $tvaval)
 				{
 					if ($tvakey > 0)    // On affiche pas taux 0
@@ -830,6 +917,7 @@ class pdf_crabe extends ModelePDFFactures
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
 						$tvacompl='';
 						if (preg_match('/\*/',$tvakey))
 						{
@@ -839,52 +927,31 @@ class pdf_crabe extends ModelePDFFactures
 						$totalvat =$outputlangs->transnoentities("TotalVAT").' ';
 						$totalvat.=vatrate($tvakey,1).$tvacompl;
 						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $tvaval), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
 					}
 				}
 
-				if (! $this->atleastoneratenotnull)	// If no vat at all
+				//Local tax 1 after VAT
+				if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				{
-					$index++;
-					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalVAT"), 0, 'L', 1);
-					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_tva), 0, 'R', 1);
-
-					// Total LocalTax1
-					if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on' && $object->total_localtax1>0)
-					{
-						$index++;
-						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalLT1".$mysoc->country_code), $useborder, 'L', 1);
-						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_localtax1), $useborder, 'R', 1);
-					}
-
-					// Total LocalTax2
-					if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on' && $object->total_localtax2>0)
-					{
-						$index++;
-						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalLT2".$mysoc->country_code), $useborder, 'L', 1);
-						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_localtax2), $useborder, 'R', 1);
-					}
-				}
-				else
-				{
-					if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
-					{
-						//Local tax 1
-						foreach($this->localtax1 as $tvakey => $tvaval)
+					foreach( $this->localtax1 as $localtax_type => $localtax_rate ) {
+						switch ($localtax_type) {
+							case '2':
+							case '4':
+							case '6':
+								continue 2;
+								break;
+						}
+						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey!=0)    // On affiche pas taux 0
+							if ($tvakey>0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+								$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
 								if (preg_match('/\*/',$tvakey))
@@ -892,27 +959,43 @@ class pdf_crabe extends ModelePDFFactures
 									$tvakey=str_replace('*','',$tvakey);
 									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 								}
-								$totalvat =$outputlangs->transnoentities("TotalLT1".$mysoc->country_code).' ';
-								$totalvat.=vatrate($tvakey,1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+								$totalvat = $outputlangs->transnoentities("TotalLT1".$mysoc->pays_code).' ';
+								if ($localtax_type == '7') {  // amount on order
+									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $tvaval), 0, 'R', 1);
+									$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
+								}
+								else
+								{
+									$totalvat.=vatrate($tvakey,1).$tvacompl;
+									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+									$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+								}
 							}
 						}
 					}
-
-					if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
-					{
-						//Local tax 2
-						foreach($this->localtax2 as $tvakey => $tvaval)
+	      		}
+				//Local tax 2  after VAT
+				if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				{
+					foreach( $this->localtax2 as $localtax_type => $localtax_rate ) {
+						switch ($localtax_type) {
+							case '2':
+							case '4':
+							case '6':
+								continue 2;
+								break;
+						}
+						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey!=0)    // On affiche pas taux 0
+							if ($tvakey>0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+								$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
 								if (preg_match('/\*/',$tvakey))
@@ -920,12 +1003,21 @@ class pdf_crabe extends ModelePDFFactures
 									$tvakey=str_replace('*','',$tvakey);
 									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 								}
-								$totalvat =$outputlangs->transnoentities("TotalLT2".$mysoc->country_code).' ';
-								$totalvat.=vatrate($tvakey,1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+								$totalvat = $outputlangs->transnoentities("TotalLT2".$mysoc->pays_code).' ';
 
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $tvaval), 0, 'R', 1);
+								if ($localtax_type == '7') {  // amount on order
+									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+									$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
+								}
+								else
+								{
+									$totalvat.=vatrate($tvakey,1).$tvacompl;
+									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+									$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+								}
 							}
 						}
 					}
@@ -936,11 +1028,10 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->SetTextColor(0,0,60);
 				$pdf->SetFillColor(224,224,224);
-				$text=$outputlangs->transnoentities("TotalTTC");
-				if ($object->type == 2) $text=$outputlangs->transnoentities("TotalTTCToYourCredit");
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $text, $useborder, 'L', 1);
+				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_ttc), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), $useborder, 'R', 1);
 			}
 		}
 

From f0918a25362777ee0d8b2ffff68205b6ba97f13f Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Wed, 28 Nov 2012 12:13:03 +0100
Subject: [PATCH 2/5] remove unused arrays into pdf models (localtaxes)

---
 htdocs/core/modules/commande/doc/pdf_einstein.modules.php | 3 +--
 htdocs/core/modules/propale/doc/pdf_azur.modules.php      | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index fd5c9446092..af52234361d 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2012	Regis Houssin		<regis@dolibarr.fr>
  * Copyright (C) 2008		Raphael Bertrand	<raphael.bertrand@resultic.fr>
  * Copyright (C) 2010-2012	Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2012      	Christophe Battarel <christophe.battarel@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -119,8 +120,6 @@ class pdf_einstein extends ModelePDFCommandes
 		$this->tva=array();
 		$this->localtax1=array();
 		$this->localtax2=array();
-		$this->localtax1_type=array();
-		$this->localtax2_type=array();
 		$this->atleastoneratenotnull=0;
 		$this->atleastonediscount=0;
 	}
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 5f3aa93d7f6..1fee81625e6 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -119,8 +119,6 @@ class pdf_azur extends ModelePDFPropales
 		$this->tva=array();
 		$this->localtax1=array();
 		$this->localtax2=array();
-		$this->localtax1_type=array();
-		$this->localtax2_type=array();
 		$this->atleastoneratenotnull=0;
 		$this->atleastonediscount=0;
 	}

From e459736977c877259f757248c5b575697e29fbc0 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Wed, 28 Nov 2012 17:47:15 +0100
Subject: [PATCH 3/5] add function gettypeoflocaltax and modify pdf models

---
 htdocs/core/lib/functions.lib.php             | 28 +++++++++
 .../commande/doc/pdf_einstein.modules.php     | 62 +++++++++++++-----
 .../modules/facture/doc/pdf_crabe.modules.php | 63 ++++++++++++++-----
 .../modules/propale/doc/pdf_azur.modules.php  | 61 +++++++++++++-----
 4 files changed, 169 insertions(+), 45 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4cc42423483..d87de10d8cd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4208,6 +4208,34 @@ function getCurrencySymbol($currency_code)
 
 	return $currency_sign;
 }
+/**
+ * Get type of one localtax
+ *
+ *  @param		int	$vatrate			VAT Rate
+ *  @param		int	$number             Number of localtax (1 / 2)
+ *  @return		int      				Type of local tax (1 to 7 / 0 if not found)
+ */
+
+function getTypeOfLocalTaxFromRate($vatrate, $number)
+{
+	global $db, $mysoc;
+	
+	// Search local taxes
+	$sql  = "SELECT t.localtax1_type, t.localtax2_type";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
+	$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$mysoc->country_code."'";
+	$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
+
+	$resql=$db->query($sql);
+	if ($resql)
+	{
+		$obj = $db->fetch_object($resql);
+  		if ($number == 1) return $obj->localtax1_type;
+  		elseif ($number == 2) return $obj->localtax2_type;
+	}
+
+	return 0;
+}
 
 if (! function_exists('getmypid'))
 {
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index af52234361d..e6fffa4e03c 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -138,7 +138,7 @@ class pdf_einstein extends ModelePDFCommandes
 	 */
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
 	{
-		global $user,$langs,$conf;
+		global $user,$langs,$conf,$mysoc,$db;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -365,6 +365,10 @@ class pdf_einstein extends ModelePDFCommandes
 
 					$localtax1ligne=$object->lines[$i]->total_localtax1;
 					$localtax2ligne=$object->lines[$i]->total_localtax2;
+					$localtax1_rate=$object->lines[$i]->localtax1_tx;
+					$localtax2_rate=$object->lines[$i]->localtax2_tx;
+					$localtax1_type=$object->lines[$i]->localtax1_type;
+					$localtax2_type=$object->lines[$i]->localtax2_type;
 
 					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
 					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
@@ -372,24 +376,52 @@ class pdf_einstein extends ModelePDFCommandes
 
 					$vatrate=(string) $object->lines[$i]->tva_tx;
 
+					// TODO : store local taxes types into object lines and remove this
+					if (empty($localtax1_type))
+						$localtax1_type=getTypeOfLocalTaxFromRate($vatrate,1);
+					if (empty($localtax2_type))
+						$localtax2_type=getTypeOfLocalTaxFromRate($vatrate,2);
+					//end TODO
+					
+				    // retrieve global local tax
+					if ($localtax1_type == '7')
+					{
+						$sql  = "SELECT t.localtax1";
+						$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
+						$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$mysoc->country_code."'";
+						$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
+
+						$resql=$db->query($sql);
+						if ($resql)
+						{
+							$obj = $db->fetch_object($resql);
+							$localtax1_rate = $obj->localtax1;
+						}
+					}
+					if ($localtax2_type == '7')
+					{
+						$sql  = "SELECT t.localtax2";
+						$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
+						$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$mysoc->country_code."'";
+						$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
+
+						$resql=$db->query($sql);
+						if ($resql)
+						{
+							$obj = $db->fetch_object($resql);
+							$localtax2_rate = $obj->localtax2;
+						}
+					}
+
+					if ($localtax1ligne != 0 || $localtax1_type == '7')
+						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+					if ($localtax2ligne != 0 || $localtax2_type == '7')
+						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
 					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]='';
 					$this->tva[$vatrate] += $tvaligne;
 
-					// Search local taxes
-					$sql  = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type";
-					$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-					$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$object->client->country_code."'";
-					$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
-
-					$resqlt=$this->db->query($sql);
-					if ($resqlt)
-					{
-						$objt = $this->db->fetch_object($resqlt);
-						$this->localtax1[$objt->localtax1_type][$objt->localtax1]+=$localtax1ligne;
-						$this->localtax2[$objt->localtax2_type][$objt->localtax2]+=$localtax2ligne;
-					}
-
 					// Add line
 					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
 					{
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index f9b007f3d0b..2db960300e8 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -139,7 +139,7 @@ class pdf_crabe extends ModelePDFFactures
 	 */
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
 	{
-		global $user,$langs,$conf;
+		global $user,$langs,$conf,$mysoc,$db;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -366,31 +366,63 @@ class pdf_crabe extends ModelePDFFactures
 					$tvaligne=$object->lines[$i]->total_tva;
 					$localtax1ligne=$object->lines[$i]->total_localtax1;
 					$localtax2ligne=$object->lines[$i]->total_localtax2;
+					$localtax1_rate=$object->lines[$i]->localtax1_tx;
+					$localtax2_rate=$object->lines[$i]->localtax2_tx;
+					$localtax1_type=$object->lines[$i]->localtax1_type;
+					$localtax2_type=$object->lines[$i]->localtax2_type;
 
 					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
 					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
 					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
 
 					$vatrate=(string) $object->lines[$i]->tva_tx;
+					
+					// TODO : store local taxes types into object lines and remove this
+					if (empty($localtax1_type))
+						$localtax1_type=getTypeOfLocalTaxFromRate($vatrate,1);
+					if (empty($localtax2_type))
+						$localtax2_type=getTypeOfLocalTaxFromRate($vatrate,2);
+					//end TODO
+					
+				    // retrieve global local tax
+					if ($localtax1_type == '7')
+					{
+						$sql  = "SELECT t.localtax1";
+						$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
+						$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$mysoc->country_code."'";
+						$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
+
+						$resql=$db->query($sql);
+						if ($resql)
+						{
+							$obj = $db->fetch_object($resql);
+							$localtax1_rate = $obj->localtax1;
+						}
+					}
+					if ($localtax2_type == '7')
+					{
+						$sql  = "SELECT t.localtax2";
+						$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
+						$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$mysoc->country_code."'";
+						$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
+
+						$resql=$db->query($sql);
+						if ($resql)
+						{
+							$obj = $db->fetch_object($resql);
+							$localtax2_rate = $obj->localtax2;
+						}
+					}
+
+					if ($localtax1ligne != 0 || $localtax1_type == '7')
+						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+					if ($localtax2ligne != 0 || $localtax2_type == '7')
+						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
 
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
 					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]='';
 					$this->tva[$vatrate] += $tvaligne;
 
-					// Search local taxes
-					$sql  = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type";
-					$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-					$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$object->client->country_code."'";
-					$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
-
-					$resqlt=$this->db->query($sql);
-					if ($resqlt)
-					{
-						$objt = $this->db->fetch_object($resqlt);
-						$this->localtax1[$objt->localtax1_type][$objt->localtax1]+=$localtax1ligne;
-						$this->localtax2[$objt->localtax2_type][$objt->localtax2]+=$localtax2ligne;
-					}
-
 					// Add line
 					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
 					{
@@ -990,6 +1022,7 @@ class pdf_crabe extends ModelePDFFactures
 						}
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
+						    // retrieve global local tax
 							if ($tvakey>0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 1fee81625e6..49972bb9d8f 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -137,7 +137,7 @@ class pdf_azur extends ModelePDFPropales
 	 */
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
 	{
-		global $user,$langs,$conf;
+		global $user,$langs,$conf,$mysoc,$db;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -363,31 +363,62 @@ class pdf_azur extends ModelePDFPropales
 					$tvaligne=$object->lines[$i]->total_tva;
 					$localtax1ligne=$object->lines[$i]->total_localtax1;
 					$localtax2ligne=$object->lines[$i]->total_localtax2;
+					$localtax1_rate=$object->lines[$i]->localtax1_tx;
+					$localtax2_rate=$object->lines[$i]->localtax2_tx;
+					$localtax1_type=$object->lines[$i]->localtax1_type;
+					$localtax2_type=$object->lines[$i]->localtax2_type;
 
 					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
 					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
 					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
 
 					$vatrate=(string) $object->lines[$i]->tva_tx;
+					// TODO : store local taxes types into object lines and remove this
+					if (empty($localtax1_type))
+						$localtax1_type=getTypeOfLocalTaxFromRate($vatrate,1);
+					if (empty($localtax2_type))
+						$localtax2_type=getTypeOfLocalTaxFromRate($vatrate,2);
+					//end TODO
+
+				    // retrieve global local tax
+					if ($localtax1_type == '7')
+					{
+						$sql  = "SELECT t.localtax1";
+						$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
+						$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$mysoc->country_code."'";
+						$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
+
+						$resql=$db->query($sql);
+						if ($resql)
+						{
+							$obj = $db->fetch_object($resql);
+							$localtax1_rate = $obj->localtax1;
+						}
+					}
+					if ($localtax2_type == '7')
+					{
+						$sql  = "SELECT t.localtax2";
+						$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
+						$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$mysoc->country_code."'";
+						$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
+
+						$resql=$db->query($sql);
+						if ($resql)
+						{
+							$obj = $db->fetch_object($resql);
+							$localtax2_rate = $obj->localtax2;
+						}
+					}
+
+					if ($localtax1ligne != 0 || $localtax1_type == '7')
+						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+					if ($localtax2ligne != 0 || $localtax2_type == '7')
+						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
 
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
 					if (! isset($this->tva[$vatrate]))				$this->tva[$vatrate]='';
 					$this->tva[$vatrate] += $tvaligne;
 
-					// Search local taxes
-					$sql  = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type";
-					$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-					$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$object->client->country_code."'";
-					$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
-
-					$resqlt=$this->db->query($sql);
-					if ($resqlt)
-					{
-						$objt = $this->db->fetch_object($resqlt);
-						$this->localtax1[$objt->localtax1_type][$objt->localtax1]+=$localtax1ligne;
-						$this->localtax2[$objt->localtax2_type][$objt->localtax2]+=$localtax2ligne;
-					}
-
 					// Add line
 					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
 					{

From 53cf2ca8f571a3a791fb0e2f6740f06141de7385 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Wed, 28 Nov 2012 17:57:17 +0100
Subject: [PATCH 4/5] dont use ES translation for labels

---
 htdocs/societe/soc.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 528672e3592..45caee823b1 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -909,22 +909,22 @@ else
         // Local Taxes
         if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
         {
-            print '<tr><td>'.$langs->trans("LocalTax1IsUsed").'</td><td>';
+            print '<tr><td>'.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
             print $form->selectyesno('localtax1assuj_value',0,1);
-            print '</td><td>'.$langs->trans("LocalTax2IsUsed").'</td><td>';
+            print '</td><td>'.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
             print $form->selectyesno('localtax2assuj_value',0,1);
             print '</td></tr>';
 
         }
         elseif($mysoc->localtax1_assuj=="1")
         {
-            print '<tr><td>'.$langs->trans("LocalTax1IsUsed").'</td><td colspan="3">';
+            print '<tr><td>'.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).'</td><td colspan="3">';
             print $form->selectyesno('localtax1assuj_value',0,1);
             print '</td><tr>';
         }
         elseif($mysoc->localtax2_assuj=="1")
         {
-            print '<tr><td>'.$langs->trans("LocalTax2IsUsed").'</td><td colspan="3">';
+            print '<tr><td>'.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
             print $form->selectyesno('localtax2assuj_value',0,1);
             print '</td><tr>';
         }
@@ -1320,23 +1320,23 @@ else
             // Local Taxes
             if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
             {
-                print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
+                print '<tr><td>'.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
                 print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
-                print '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
+                print '</td><td>'.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
                 print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
                 print '</td></tr>';
 
             }
             elseif($mysoc->localtax1_assuj=="1")
             {
-                print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
+                print '<tr><td>'.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).'</td><td colspan="3">';
                 print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
                 print '</td></tr>';
 
             }
             elseif($mysoc->localtax2_assuj=="1")
             {
-                print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
+                print '<tr><td>'.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
                 print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
                 print '</td></tr>';
             }
@@ -1636,22 +1636,22 @@ else
         // Local Taxes
         if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
         {
-            print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
+            print '<tr><td>'.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
             print yn($object->localtax1_assuj);
-            print '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
+            print '</td><td>'.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
             print yn($object->localtax2_assuj);
             print '</td></tr>';
 
         }
         elseif($mysoc->localtax1_assuj=="1")
         {
-            print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
+            print '<tr><td>'.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).'</td><td colspan="3">';
             print yn($object->localtax1_assuj);
             print '</td><tr>';
         }
         elseif($mysoc->localtax2_assuj=="1")
         {
-            print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
+            print '<tr><td>'.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
             print yn($object->localtax2_assuj);
             print '</td><tr>';
         }

From 51d87f8f4ab431b8f3c98daae6214c292a203616 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Thu, 29 Nov 2012 11:36:59 +0100
Subject: [PATCH 5/5] function getTypeOfLocalTaxFromRate now receives
 thirdparty in parameter and returns array of localtax type and amount/rate.
 no more sql in pdf model.

---
 htdocs/core/lib/functions.lib.php             | 17 ++++-----
 .../commande/doc/pdf_einstein.modules.php     | 36 ++++---------------
 .../modules/facture/doc/pdf_crabe.modules.php | 36 ++++---------------
 .../modules/propale/doc/pdf_azur.modules.php  | 34 ++++--------------
 4 files changed, 29 insertions(+), 94 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d87de10d8cd..7aa197be58f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4213,25 +4213,26 @@ function getCurrencySymbol($currency_code)
  *
  *  @param		int	$vatrate			VAT Rate
  *  @param		int	$number             Number of localtax (1 / 2)
- *  @return		int      				Type of local tax (1 to 7 / 0 if not found)
+ *  @param		int	$thirdparty         company object
+ *  @return		array      				array(Type of local tax (1 to 7 / 0 if not found), rate or amount of localtax)
  */
 
-function getTypeOfLocalTaxFromRate($vatrate, $number)
+function getTypeOfLocalTaxFromRate($vatrate, $number, $thirdparty)
 {
-	global $db, $mysoc;
-	
+	global $db;
+
 	// Search local taxes
-	$sql  = "SELECT t.localtax1_type, t.localtax2_type";
+	$sql  = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-	$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$mysoc->country_code."'";
+	$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$thirdparty->country_code."'";
 	$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
 
 	$resql=$db->query($sql);
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-  		if ($number == 1) return $obj->localtax1_type;
-  		elseif ($number == 2) return $obj->localtax2_type;
+  		if ($number == 1) return array($obj->localtax1_type, $obj->localtax1);
+  		elseif ($number == 2) return array($obj->localtax2_type, $obj->localtax2);
 	}
 
 	return 0;
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index e6fffa4e03c..434d668826d 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -377,41 +377,19 @@ class pdf_einstein extends ModelePDFCommandes
 					$vatrate=(string) $object->lines[$i]->tva_tx;
 
 					// TODO : store local taxes types into object lines and remove this
+					$localtax1_array=getTypeOfLocalTaxFromRate($vatrate,1,$mysoc);
+					$localtax2_array=getTypeOfLocalTaxFromRate($vatrate,2,$mysoc);
 					if (empty($localtax1_type))
-						$localtax1_type=getTypeOfLocalTaxFromRate($vatrate,1);
+						$localtax1_type = $localtax1_array[0];
 					if (empty($localtax2_type))
-						$localtax2_type=getTypeOfLocalTaxFromRate($vatrate,2);
+						$localtax2_type = $localtax2_array[0];
 					//end TODO
-					
+
 				    // retrieve global local tax
 					if ($localtax1_type == '7')
-					{
-						$sql  = "SELECT t.localtax1";
-						$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-						$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$mysoc->country_code."'";
-						$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
-
-						$resql=$db->query($sql);
-						if ($resql)
-						{
-							$obj = $db->fetch_object($resql);
-							$localtax1_rate = $obj->localtax1;
-						}
-					}
+						$localtax1_rate = $localtax1_array[1];
 					if ($localtax2_type == '7')
-					{
-						$sql  = "SELECT t.localtax2";
-						$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-						$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$mysoc->country_code."'";
-						$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
-
-						$resql=$db->query($sql);
-						if ($resql)
-						{
-							$obj = $db->fetch_object($resql);
-							$localtax2_rate = $obj->localtax2;
-						}
-					}
+						$localtax2_rate = $localtax2_array[1];
 
 					if ($localtax1ligne != 0 || $localtax1_type == '7')
 						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 2db960300e8..c7d603f0622 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -378,41 +378,19 @@ class pdf_crabe extends ModelePDFFactures
 					$vatrate=(string) $object->lines[$i]->tva_tx;
 					
 					// TODO : store local taxes types into object lines and remove this
+					$localtax1_array=getTypeOfLocalTaxFromRate($vatrate,1,$mysoc);
+					$localtax2_array=getTypeOfLocalTaxFromRate($vatrate,2,$mysoc);
 					if (empty($localtax1_type))
-						$localtax1_type=getTypeOfLocalTaxFromRate($vatrate,1);
+						$localtax1_type = $localtax1_array[0];
 					if (empty($localtax2_type))
-						$localtax2_type=getTypeOfLocalTaxFromRate($vatrate,2);
+						$localtax2_type = $localtax2_array[0];
 					//end TODO
-					
+
 				    // retrieve global local tax
 					if ($localtax1_type == '7')
-					{
-						$sql  = "SELECT t.localtax1";
-						$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-						$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$mysoc->country_code."'";
-						$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
-
-						$resql=$db->query($sql);
-						if ($resql)
-						{
-							$obj = $db->fetch_object($resql);
-							$localtax1_rate = $obj->localtax1;
-						}
-					}
+						$localtax1_rate = $localtax1_array[1];
 					if ($localtax2_type == '7')
-					{
-						$sql  = "SELECT t.localtax2";
-						$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-						$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$mysoc->country_code."'";
-						$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
-
-						$resql=$db->query($sql);
-						if ($resql)
-						{
-							$obj = $db->fetch_object($resql);
-							$localtax2_rate = $obj->localtax2;
-						}
-					}
+						$localtax2_rate = $localtax2_array[1];
 
 					if ($localtax1ligne != 0 || $localtax1_type == '7')
 						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 49972bb9d8f..93a415bd7c1 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -374,41 +374,19 @@ class pdf_azur extends ModelePDFPropales
 
 					$vatrate=(string) $object->lines[$i]->tva_tx;
 					// TODO : store local taxes types into object lines and remove this
+					$localtax1_array=getTypeOfLocalTaxFromRate($vatrate,1,$mysoc);
+					$localtax2_array=getTypeOfLocalTaxFromRate($vatrate,2,$mysoc);
 					if (empty($localtax1_type))
-						$localtax1_type=getTypeOfLocalTaxFromRate($vatrate,1);
+						$localtax1_type = $localtax1_array[0];
 					if (empty($localtax2_type))
-						$localtax2_type=getTypeOfLocalTaxFromRate($vatrate,2);
+						$localtax2_type = $localtax2_array[0];
 					//end TODO
 
 				    // retrieve global local tax
 					if ($localtax1_type == '7')
-					{
-						$sql  = "SELECT t.localtax1";
-						$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-						$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$mysoc->country_code."'";
-						$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
-
-						$resql=$db->query($sql);
-						if ($resql)
-						{
-							$obj = $db->fetch_object($resql);
-							$localtax1_rate = $obj->localtax1;
-						}
-					}
+						$localtax1_rate = $localtax1_array[1];
 					if ($localtax2_type == '7')
-					{
-						$sql  = "SELECT t.localtax2";
-						$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-						$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$mysoc->country_code."'";
-						$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
-
-						$resql=$db->query($sql);
-						if ($resql)
-						{
-							$obj = $db->fetch_object($resql);
-							$localtax2_rate = $obj->localtax2;
-						}
-					}
+						$localtax2_rate = $localtax2_array[1];
 
 					if ($localtax1ligne != 0 || $localtax1_type == '7')
 						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;