diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index f0803e92621..5961f1c751d 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -455,7 +455,7 @@ class pdf_propale_azur extends ModelePDFPropales
 			$pdf->SetTextColor(0,0,0);
 			$pdf->SetFont('','', $default_font_size - 2);
 			$pdf->SetXY(82, $posy);
-			$lib_availability=$outputlangs->transnoentities("AvailabilityPeriod".$object->availability_code)!=('AvailabilityPeriod'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityPeriod".$object->availability_code):$outputlangs->convToOutputCharset($object->availability);
+			$lib_availability=$outputlangs->transnoentities("AvailabilityType".$object->availability_code)!=('AvailabilityType'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityType".$object->availability_code):$outputlangs->convToOutputCharset($object->availability);
 			$lib_availability=str_replace('\n',"\n",$lib_availability);
 			$pdf->MultiCell(80, 4, $lib_availability,0,'L');
 
diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
index 4014979dae0..7af1eb96165 100644
--- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2011 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2008      Raphael Bertrand     <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2010-2011 Juanjo Menent	    <jmenent@2byte.es>
  *
  * 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
@@ -20,20 +20,21 @@
  */
 
 /**
- * 	\file       htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
+ *	\file       htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
  *	\ingroup    propale
  *	\brief      Fichier de la classe permettant de generer les propales au modele Jaune
- *	\version    $Id: pdf_propale_jaune.modules.php,v 1.117 2011/07/31 23:28:16 eldy Exp $
+ *	\author	    Laurent Destailleur
  */
-
-require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");
+require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 
 
 /**
- * 	    \class      pdf_propale_jaune
- *		\brief      Classe permettant de generer les propales au modele Jaune
+ *	\class      pdf_propale_jaune
+ *	\brief      Classe permettant de generer les propales au modele Jaune
  */
 class pdf_propale_jaune extends ModelePDFPropales
 {
@@ -41,10 +42,11 @@ class pdf_propale_jaune extends ModelePDFPropales
 
 
 	/**
-	 * 		\brief  Constructeur
-	 *		\param	db		Database access handler
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$DB      Database handler
 	 */
-	function pdf_propale_jaune($db=0)
+	function pdf_propale_jaune($db)
 	{
 		global $conf,$langs,$mysoc;
 
@@ -57,35 +59,60 @@ class pdf_propale_jaune extends ModelePDFPropales
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
-		$this->page_largeur = 210;
-		$this->page_hauteur = 297;
+		$formatarray=pdf_getFormat();
+		$this->page_largeur = $formatarray['width'];
+		$this->page_hauteur = $formatarray['height'];
 		$this->format = array($this->page_largeur,$this->page_hauteur);
 		$this->marge_gauche=10;
 		$this->marge_droite=10;
 		$this->marge_haute=10;
 		$this->marge_basse=10;
 
+		$this->option_logo = 1;                    // Affiche logo
+		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
+		$this->option_modereg = 1;                 // Affiche mode reglement
+		$this->option_condreg = 1;                 // Affiche conditions reglement
+		$this->option_codeproduitservice = 1;      // Affiche code produit-service
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
+		$this->option_escompte = 1;                // Affiche si il y a eu escompte
+		$this->option_credit_note = 1;             // Gere les avoirs
+		$this->option_freetext = 1;				   // Support add of a personalised text
 		$this->option_draft_watermark = 1;		   //Support add of a watermark on drafts
 
-		$this->error = "";
+		$this->franchise=!$mysoc->tva_assuj;
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2);    // Par defaut, si on ne trouve pas
-	}
+		if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
 
+		// Defini position des colonnes
+		$this->posxdesc=$this->marge_gauche+1;
+		$this->posxtva=111;
+		$this->posxup=126;
+		$this->posxqty=145;
+		$this->posxdiscount=162;
+		$this->postotalht=174;
+
+		$this->tva=array();
+		$this->localtax1=array();
+		$this->localtax2=array();
+		$this->atleastoneratenotnull=0;
+		$this->atleastonediscount=0;
+	}
 
 	/**
      *  Function to build pdf onto disk
-     *  @param      object          Id of object to generate
-     *  @param      outputlangs     Lang output object
-     *  @param      srctemplatepath Full path of source filename for generator using a template file
-     *  @param      hidedetails     Do not show line details
-     *  @param      hidedesc        Do not show desc
-     *  @param      hideref         Do not show ref
-     *  @return     int             1=OK, 0=KO
+     *
+     *  @param		int		$object				Id of object to generate
+     *  @param		object	$outputlangs		Lang output object
+     *  @param		string	$srctemplatepath	Full path of source filename for generator using a template file
+     *  @param		int		$hidedetails		Do not show line details
+     *  @param		int		$hidedesc			Do not show desc
+     *  @param		int		$hideref			Do not show ref
+     *  @param		object	$hookmanager		Hookmanager object
+     *  @return     int             			1=OK, 0=KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
+	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
 	{
 		global $user,$langs,$conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -93,7 +120,7 @@ class pdf_propale_jaune extends ModelePDFPropales
 		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
 		$sav_charset_output=$outputlangs->charset_output;
-		if (!class_exists('TCPDF')) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -105,6 +132,7 @@ class pdf_propale_jaune extends ModelePDFPropales
 		if ($conf->propale->dir_output)
 		{
 			$object->fetch_thirdparty();
+
 			$deja_regle = "";
 
 			// Definition de $dir et $file
@@ -131,6 +159,9 @@ class pdf_propale_jaune extends ModelePDFPropales
 
 			if (file_exists($dir))
 			{
+				$nblignes = count($object->lines);
+
+				// Create pdf instance
                 $pdf=pdf_getInstance($this->format);
 
                 if (class_exists('TCPDF'))
@@ -154,67 +185,128 @@ class pdf_propale_jaune extends ModelePDFPropales
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 				$pdf->SetAutoPageBreak(1,0);
 
+				// Positionne $this->atleastonediscount si on a au moins une remise
+				for ($i = 0 ; $i < $nblignes ; $i++)
+				{
+					if ($object->lines[$i]->remise_percent)
+					{
+						$this->atleastonediscount++;
+					}
+				}
+
 				// New page
 				$pdf->AddPage();
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
+				$pdf->MultiCell(0, 4, '');		// Set interline to 4
 				$pdf->SetTextColor(0,0,0);
 
-				$tab_top = 100;
+				$tab_top = 90;
+				$tab_top_middlepage = 50;
+				$tab_top_newpage = 50;
 				$tab_height = 130;
+				$tab_height_middlepage = 200;
+				$tab_height_endpage = 170;
 
-				$pdf->SetFillColor(242,239,119);
-				$pdf->SetXY (10, $tab_top + 10 );
+				// Affiche notes
+				if (! empty($object->note_public))
+				{
+					$tab_top = 88;
 
-				$iniY = $tab_top + 12;
-				$curY = $tab_top + 12;
-				$nexY = $tab_top + 12;
-				$nblignes = sizeof($object->lines);
+					$pdf->SetFont('','', $default_font_size - 1);   // Dans boucle pour gerer multi-page
+					$pdf->SetXY($this->posxdesc-1, $tab_top);
+					$pdf->MultiCell(190, 4, $outputlangs->convToOutputCharset($object->note_public), 0, 'L');
+					$nexY = $pdf->GetY();
+					$height_note=$nexY-$tab_top;
+
+					// Rect prend une longueur en 3eme param
+					//$pdf->SetDrawColor(192,192,192);
+					//$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $nexY+6;
+				}
+				else
+				{
+					$height_note=0;
+				}
+
+				$iniY = $tab_top + 7;
+				$curY = $tab_top + 7;
+				$nexY = $tab_top + 7;
 
 				// Loop on each lines
 				for ($i = 0 ; $i < $nblignes ; $i++)
 				{
 					$curY = $nexY;
 
-                    $pdf->SetFont('','', $default_font_size - 1);   // Dans boucle pour gerer multi-page
+					$pdf->SetFont('','', $default_font_size - 1);   // Dans boucle pour gerer multi-page
 
-                    // Description de la ligne produit
-					pdf_writelinedesc($pdf,$object,$i,$outputlangs,102,4,30,$curY,1,$hidedesc);
+					// Description de la ligne produit
+					$curX = $this->posxdesc-1;
+					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc,0,$hookmanager);
 
 					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
 					$nexY = $pdf->GetY();
 
-					$ref = pdf_getlineref($object, $i, $outputlangs);
-					$pdf->SetXY (10, $curY );
-					$pdf->MultiCell(20, 4, $ref, 0, 'L', 0);
+					// TVA
+					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+					{
+						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$pdf->SetXY($this->posxtva, $curY);
+						$pdf->MultiCell($this->posxup-$this->posxtva-1, 4, $vat_rate, 0, 'R');
+					}
 
-					$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
-					$pdf->SetXY (132, $curY );
-					$pdf->MultiCell(12, 4, $vat_rate, 0, 'R');
+					// Prix unitaire HT avant remise
+					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails, $hookmanager);
+					$pdf->SetXY($this->posxup, $curY);
+					$pdf->MultiCell($this->posxqty-$this->posxup-1, 4, $up_excl_tax, 0, 'R', 0);
 
-					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
-					$pdf->SetXY (144, $curY );
-					$pdf->MultiCell(10, 4, $qty, 0, 'R', 0);
+					// Quantity
+					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails, $hookmanager);
+					$pdf->SetXY($this->posxqty, $curY);
+					$pdf->MultiCell($this->posxdiscount-$this->posxqty-1, 4, $qty, 0, 'R');
 
-					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
-					$pdf->SetXY (154, $curY );
-					$pdf->MultiCell(22, 4, $up_excl_tax, 0, 'R', 0);
+					// Remise sur ligne
+					$pdf->SetXY($this->posxdiscount, $curY);
+					if ($object->lines[$i]->remise_percent)
+					{
+						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 4, $remise_percent, 0, 'R');
+					}
 
-					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
-					$pdf->SetXY (176, $curY );
-					$pdf->MultiCell(24, 4, $total_excl_tax, 0, 'R', 0);
+					// Total HT ligne
+					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails, $hookmanager);
+					$pdf->SetXY($this->postotalht, $curY);
+					$pdf->MultiCell(26, 4, $total_excl_tax, 0, 'R', 0);
 
-					//$pdf->line(10, $curY, 200, $curY );
+					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
+					$tvaligne=$object->lines[$i]->total_tva;
+					$localtax1ligne=$object->lines[$i]->total_localtax1;
+					$localtax2ligne=$object->lines[$i]->total_localtax2;
+
+					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;
+					$localtax1rate=(string) $object->lines[$i]->localtax1_tx;
+					$localtax2rate=(string) $object->lines[$i]->localtax2_tx;
+
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
+
+					$this->tva[$vatrate] += $tvaligne;
+					$this->localtax1[$localtax1rate]+=$localtax1ligne;
+					$this->localtax2[$localtax2rate]+=$localtax2ligne;
 
 					$nexY+=2;    // Passe espace entre les lignes
 
-					// cherche nombre de lignes a venir pour savoir si place suffisante
-					if ($i < ($nblignes - 1))	// If it's not last line
+					// Cherche nombre de lignes a venir pour savoir si place suffisante
+					if ($i < ($nblignes - 1) && empty($hidedesc))	// If it's not last line
 					{
 						//on recupere la description du produit suivant
-						$follow_descproduitservice = $outputlangs->convToOutputCharset($object->lines[$i+1]->desc);
+						$follow_descproduitservice = $object->lines[$i+1]->desc;
 						//on compte le nombre de ligne afin de verifier la place disponible (largeur de ligne 52 caracteres)
 						$nblineFollowDesc = (dol_nboflines_bis($follow_descproduitservice,52,$outputlangs->charset_output)*4);
 					}
@@ -223,12 +315,29 @@ class pdf_propale_jaune extends ModelePDFPropales
 						$nblineFollowDesc = 0;
 					}
 
-					// test si besoin nouvelle page
-					if (($nexY+$nblineFollowDesc) > ($tab_top+$tab_height) && $i < ($nblignes - 1))
+					// Test if a new page is required
+					if ($pagenb == 1)
 					{
-						$this->_pagefoot($pdf,$object,$outputlangs);
+						$tab_top_in_current_page=$tab_top;
+						$tab_height_in_current_page=$tab_height;
+					}
+					else
+					{
+						$tab_top_in_current_page=$tab_top_newpage;
+						$tab_height_in_current_page=$tab_height_middlepage;
+					}
+					if (($nexY+$nblineFollowDesc) > ($tab_top_in_current_page+$tab_height_in_current_page) && $i < ($nblignes - 1))
+					{
+						if ($pagenb == 1)
+						{
+							$this->_tableau($pdf, $tab_top, $tab_height + 20, $nexY, $outputlangs);
+						}
+						else
+						{
+							$this->_tableau($pdf, $tab_top_newpage, $tab_height_middlepage, $nexY, $outputlangs);
+						}
 
-						$this->_tableau($pdf, $tab_top, $tab_height, $nexY, $outputlangs);
+						$this->_pagefoot($pdf,$object,$outputlangs);
 
 						// New page
 						$pdf->AddPage();
@@ -238,39 +347,34 @@ class pdf_propale_jaune extends ModelePDFPropales
 						$pdf->MultiCell(0, 3, '');		// Set interline to 3
 						$pdf->SetTextColor(0,0,0);
 
-						$nexY = $tab_top + 8;
+						$nexY = $tab_top_newpage + 7;
 					}
+
 				}
 
-				$this->_tableau($pdf, $tab_top, $tab_height, $nexY, $outputlangs);
-
-				$bottomlasttab=$tab_top + $tab_height + 1;
+				// Show square
+				if ($pagenb == 1)
+				{
+					$this->_tableau($pdf, $tab_top, $tab_height, $nexY, $outputlangs);
+					$bottomlasttab=$tab_top + $tab_height + 1;
+				}
+				else
+				{
+					$this->_tableau($pdf, $tab_top_newpage, $tab_height_endpage, $nexY, $outputlangs);
+					$bottomlasttab=$tab_top_newpage + $tab_height_endpage + 1;
+				}
 
 				// Affiche zone infos
-				$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
+				$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
 
-				$tab2_top = $tab_top + $tab_height;
-				$tab2_lh = 4;
+				// Affiche zone totaux
+				$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
-				$pdf->SetFont('','', $default_font_size);
-
-				$pdf->SetXY (132, $tab2_top + 0);
-				$pdf->MultiCell(42, $tab2_lh, $outputlangs->transnoentities("TotalHT"), 0, 'R', 0);
-
-				$pdf->SetXY (132, $tab2_top + $tab2_lh);
-				$pdf->MultiCell(42, $tab2_lh, $outputlangs->transnoentities("TotalVAT"), 0, 'R', 0);
-
-				$pdf->SetXY (132, $tab2_top + ($tab2_lh*2));
-				$pdf->MultiCell(42, $tab2_lh, $outputlangs->transnoentities("TotalTTC"), 1, 'R', 1);
-
-				$pdf->SetXY (174, $tab2_top + 0);
-				$pdf->MultiCell(26, $tab2_lh, price($object->total_ht), 0, 'R', 0);
-
-				$pdf->SetXY (174, $tab2_top + $tab2_lh);
-				$pdf->MultiCell(26, $tab2_lh, price($object->total_tva), 0, 'R', 0);
-
-				$pdf->SetXY (174, $tab2_top + ($tab2_lh*2));
-				$pdf->MultiCell(26, $tab2_lh, price($object->total_ttc), 1, 'R', 1);
+				// Affiche zone versements
+				if ($deja_regle)
+				{
+					$posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
+				}
 
 				// Pied de page
 				$this->_pagefoot($pdf,$object,$outputlangs);
@@ -282,18 +386,52 @@ class pdf_propale_jaune extends ModelePDFPropales
 				if (! empty($conf->global->MAIN_UMASK))
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-				return 1;
+				// Add external file
+				//$pdfConcat = new concat_pdf();
+				//$pdfConcat->setFiles(array($file, DOL_DOCUMENT_ROOT."/includes/modules/propale/morefile.pdf"));
+				//$pdfConcat->concat();
+				//$pdf->AliasNbPages();
+				//$pdfConcat->Output($file,'F');
+
+				$outputlangs->charset_output=$sav_charset_output;
+				return 1;   // Pas d'erreur
+			}
+			else
+			{
+				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				return 0;
 			}
 		}
+		else
+		{
+			$this->error=$langs->trans("ErrorConstantNotDefined","PROP_OUTPUTDIR");
+			return 0;
+		}
+
+		$this->error=$langs->trans("ErrorUnknown");
+		return 0;   // Erreur par defaut
 	}
 
+	/*
+	 *   Affiche tableau des versement
+	 *
+	 *   @param      pdf     	Objet PDF
+	 *   @param      object		Objet propale
+	 */
+	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
+	{
+
+	}
+
+
 	/**
-	 *	\brief      Affiche infos divers
-	 *	\param      pdf             Objet PDF
-	 *	\param      object          Objet commande
-	 *	\param		posy			Position depart
-	 *	\param		outputlangs		Objet langs
-	 *	\return     y               Position pour suite
+	 *	Affiche infos divers
+	 *
+	 *	@param      pdf             Objet PDF
+	 *	@param      object          Objet facture
+	 *	@param		posy			Position depart
+	 *	@param		outputlangs		Objet langs
+	 *	@return     y               Position pour suite
 	 */
 	function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -302,7 +440,7 @@ class pdf_propale_jaune extends ModelePDFPropales
 
 		$pdf->SetFont('','', $default_font_size - 1);
 
-        // If France, show VAT mention if not applicable
+		// If France, show VAT mention if not applicable
 		if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1)
 		{
 			$pdf->SetFont('','B', $default_font_size - 2);
@@ -322,14 +460,14 @@ class pdf_propale_jaune extends ModelePDFPropales
 			$pdf->SetTextColor(0,0,0);
 			$pdf->SetFont('','', $default_font_size - 2);
 			$pdf->SetXY(82, $posy);
-			$lib_availability=$outputlangs->transnoentities("AvailabilityPeriod".$object->availability_code)!=('AvailabilityPeriod'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityPeriod".$object->availability_code):$outputlangs->convToOutputCharset($object->availability);
+			$lib_availability=$outputlangs->transnoentities("AvailabilityType".$object->availability_code)!=('AvailabilityType'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityType".$object->availability_code):$outputlangs->convToOutputCharset($object->availability);
 			$lib_availability=str_replace('\n',"\n",$lib_availability);
 			$pdf->MultiCell(80, 4, $lib_availability,0,'L');
 
 			$posy=$pdf->GetY()+1;
 		}
 
-        // Show payments conditions
+		// Show payments conditions
 		if ($object->type != 2 && ($object->cond_reglement_code || $object->cond_reglement))
 		{
 			$pdf->SetFont('','B', $default_font_size - 2);
@@ -346,291 +484,558 @@ class pdf_propale_jaune extends ModelePDFPropales
 			$posy=$pdf->GetY()+3;
 		}
 
+
 		if ($object->type != 2)
 		{
-	        // Check a payment mode is defined
-	        /* Not used with orders
-	        if (empty($object->mode_reglement_code)
-	        	&& ! $conf->global->FACTURE_CHQ_NUMBER
-	        	&& ! $conf->global->FACTURE_RIB_NUMBER)
+			// Check a payment mode is defined
+			if (empty($object->mode_reglement_code)
+			&& ! $conf->global->FACTURE_CHQ_NUMBER
+			&& ! $conf->global->FACTURE_RIB_NUMBER)
 			{
-	            $pdf->SetXY($this->marge_gauche, $posy);
-	            $pdf->SetTextColor(200,0,0);
+				$pdf->SetXY($this->marge_gauche, $posy);
+				$pdf->SetTextColor(200,0,0);
 				$pdf->SetFont('','B', $default_font_size - 2);
-	            $pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
-	            $pdf->SetTextColor(0,0,0);
+				$pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
+				$pdf->SetTextColor(0,0,0);
 
-	            $posy=$pdf->GetY()+1;
-	        }*/
+				$posy=$pdf->GetY()+1;
+			}
 
-	      	// Show payment mode
-	        if ($object->mode_reglement_code
-	        	 && $object->mode_reglement_code != 'CHQ'
-	           	 && $object->mode_reglement_code != 'VIR')
-	           	 {
-		            $pdf->SetFont('','B', $default_font_size - 2);
-		            $pdf->SetXY($this->marge_gauche, $posy);
-		            $titre = $outputlangs->transnoentities("PaymentMode").':';
-		            $pdf->MultiCell(80, 5, $titre, 0, 'L');
+			// Shown payment mode
+			if ($object->mode_reglement_code
+			&& $object->mode_reglement_code != 'CHQ'
+			&& $object->mode_reglement_code != 'VIR')
+			{
+				$pdf->SetFont('','B', $default_font_size - 2);
+				$pdf->SetXY($this->marge_gauche, $posy);
+				$titre = $outputlangs->transnoentities("PaymentMode").':';
+				$pdf->MultiCell(80, 5, $titre, 0, 'L');
+				$pdf->SetFont('','', $default_font_size - 2);
+				$pdf->SetXY(50, $posy);
+				$lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
+				$pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
 
-		            $pdf->SetFont('','', $default_font_size - 2);
-		            $pdf->SetXY(50, $posy);
-		            //print "xxx".$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code);exit;
-		            $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
-		            $pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
-
-		            $posy=$pdf->GetY()+2;
-	           	 }
+				$posy=$pdf->GetY()+2;
+			}
 
 			// Show payment mode CHQ
-	        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-	        {
-	        	// Si mode reglement non force ou si force a CHQ
-		        if ($conf->global->FACTURE_CHQ_NUMBER)
-		        {
-		            if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-		            {
-		                $account = new Account($this->db);
-		                $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
+			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
+			{
+				// Si mode reglement non force ou si force a CHQ
+				if ($conf->global->FACTURE_CHQ_NUMBER)
+				{
+					if ($conf->global->FACTURE_CHQ_NUMBER > 0)
+					{
+						$account = new Account($this->db);
+						$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
 
-		                $pdf->SetXY($this->marge_gauche, $posy);
-		                $pdf->SetFont('','B', $default_font_size - 2);
-		                $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio).':',0,'L',0);
-			            $posy=$pdf->GetY()+1;
+						$pdf->SetXY($this->marge_gauche, $posy);
+						$pdf->SetFont('','B', $default_font_size - 2);
+						$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio).':',0,'L',0);
+						$posy=$pdf->GetY()+1;
 
-		                $pdf->SetXY($this->marge_gauche, $posy);
+						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('','', $default_font_size - 2);
-		                $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0);
-			            $posy=$pdf->GetY()+2;
-		            }
-		            if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-		            {
-		                $pdf->SetXY($this->marge_gauche, $posy);
-		                $pdf->SetFont('','B',$default_font_size - 2);
-		                $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedToShort').' '.$outputlangs->convToOutputCharset($this->emetteur->name).' '.$outputlangs->transnoentities('SendTo').':',0,'L',0);
-			            $posy=$pdf->GetY()+1;
+						$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0);
+						$posy=$pdf->GetY()+2;
+					}
+					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
+					{
+						$pdf->SetXY($this->marge_gauche, $posy);
+						$pdf->SetFont('','B', $default_font_size - 2);
+						$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedToShort').' '.$outputlangs->convToOutputCharset($this->emetteur->name).' '.$outputlangs->transnoentities('SendTo').':',0,'L',0);
+						$posy=$pdf->GetY()+1;
 
-			            $pdf->SetXY($this->marge_gauche, $posy);
+						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('','', $default_font_size - 2);
-		                $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
-			            $posy=$pdf->GetY()+2;
-		            }
-		        }
+						$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+						$posy=$pdf->GetY()+2;
+					}
+				}
 			}
 
-	        // If payment mode not forced or forced to VIR, show payment with BAN
-	        /* Not enough space
-	        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-	        {
-		        if (! empty($conf->global->FACTURE_RIB_NUMBER))
-		        {
-	                $account = new Account($this->db);
-	                $account->fetch($conf->global->FACTURE_RIB_NUMBER);
+			// If payment mode not forced or forced to VIR, show payment with BAN
+			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
+			{
+				if (! empty($conf->global->FACTURE_RIB_NUMBER))
+				{
+					$account = new Account($this->db);
+					$account->fetch($conf->global->FACTURE_RIB_NUMBER);
 
-	                $curx=$this->marge_gauche;
-	                $cury=$posy;
+					$curx=$this->marge_gauche;
+					$cury=$posy;
 
-	                $posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account);
+					$posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account);
 
-	                $posy+=2;
-		        }
+					$posy+=2;
+				}
 			}
-			*/
 		}
 
 		return $posy;
 	}
 
+
 	/**
-	 * Enter description here...
+	 *	Show total to pay
 	 *
-	 * @param $pdf
-	 * @param $tab_top
-	 * @param $tab_height
-	 * @param $nexY
-	 * @param $outputlangs
+	 *	@param      pdf         	Objet PDF
+	 *	@param      object       	Objet propale
+	 *	@param      deja_regle  	Montant deja regle
+	 *	@param		posy			Position depart
+	 *	@param		outputlangs		Objet langs
+	 *	@return     y              Position pour suite
+	 */
+	function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	{
+		global $conf,$mysoc;
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		$tab2_top = $posy;
+		$tab2_hl = 4;
+		$pdf->SetFont('','', $default_font_size - 1);
+
+		// Tableau total
+		$lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x;
+
+		// Total HT
+		$pdf->SetFillColor(255,255,255);
+		$pdf->SetXY($col1x, $tab2_top + 0);
+		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+
+		$pdf->SetXY($col2x, $tab2_top + 0);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + $object->remise), 0, 'R', 1);
+
+		$index = 0;
+
+		// Show VAT by rates and total
+		$pdf->SetFillColor(248,248,248);
+
+		$this->atleastoneratenotnull=0;
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+		{
+			foreach( $this->tva 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("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($tvaval), 0, 'R', 1);
+				}
+			}
+
+			if (! $this->atleastoneratenotnull) // If not vat at all
+			{
+				$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($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->pays_code), $useborder, 'L', 1);
+					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+					$pdf->MultiCell($largcol2, $tab2_hl, price($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->pays_code), $useborder, 'L', 1);
+					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+					$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
+				}
+			}
+			else
+			{
+				//Local tax 1
+				if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				{
+					foreach( $this->localtax1 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
+				if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+					{
+					foreach( $this->localtax2 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);
+
+						}
+					}
+					}
+			}
+		}
+
+		$useborder=0;
+
+		// Total TTC
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+		{
+			$index++;
+			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+			$pdf->SetTextColor(0,0,60);
+			$pdf->SetFillColor(224,224,124);
+			$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($object->total_ttc), $useborder, 'R', 1);
+			$pdf->SetTextColor(0,0,0);
+		}
+
+		if ($deja_regle > 0)
+		{
+			$index++;
+
+			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+
+			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', 0);
+
+			$resteapayer = $object->total_ttc - $deja_regle;
+			if ($object->paye) $resteapayer=0;
+
+			if ($object->close_code == 'discount_vat')
+			{
+				$index++;
+				$pdf->SetFillColor(255,255,255);
+
+				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOffered"), $useborder, 'L', 1);
+
+				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle), $useborder, 'R', 1);
+
+				$resteapayer=0;
+			}
+
+			$index++;
+			$pdf->SetTextColor(0,0,60);
+			$pdf->SetFillColor(224,224,224);
+			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+
+			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', 1);
+
+			// Fin
+			$pdf->SetFont('','', $default_font_size - 1);
+			$pdf->SetTextColor(0,0,0);
+		}
+
+		$index++;
+		return ($tab2_top + ($tab2_hl * $index));
+	}
+
+	/**
+	 *   Affiche la grille des lignes de propales
+	 *
+	 *   @param      pdf     objet PDF
 	 */
 	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs)
 	{
-		global $langs,$conf;
-		$langs->load("main");
-		$langs->load("bills");
-
+		global $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		// Montants exprimes en     (en tab_top - 1)
 		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','', $default_font_size - 2);
+		$pdf->SetFont('','',$default_font_size - 2);
 		$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));
 		$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
 		$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
-		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetDrawColor(200,200,128);
 
-		$haut=6;
+		// Rect prend une longueur en 3eme param
+		$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height);
+		// line prend une position y en 3eme param
+		$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);
 
-		$pdf->SetXY(10,$tab_top);
-		$pdf->MultiCell(20,$haut,$outputlangs->transnoentities("Ref"),0,'L',1);
+		$pdf->SetFont('','',$default_font_size - 1);
 
-		$pdf->SetXY(30,$tab_top);
-		$pdf->MultiCell(102,$haut,$outputlangs->transnoentities("Designation"),0,'L',1);
+		$pdf->SetXY($this->posxdesc-1, $tab_top+1);
+		$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
 
-		$pdf->line(132, $tab_top, 132, $tab_top + $tab_height);
-		$pdf->SetXY(132,$tab_top);
-		$pdf->MultiCell(12, $haut,$outputlangs->transnoentities("VAT"),0,'C',1);
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+		{
+			$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
+			$pdf->SetXY($this->posxtva-3, $tab_top+1);
+			$pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
+		}
 
-		$pdf->line(144, $tab_top, 144, $tab_top + $tab_height);
-		$pdf->SetXY(144,$tab_top);
-		$pdf->MultiCell(10,$haut,$outputlangs->transnoentities("Qty"),0,'C',1);
+		$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+		$pdf->SetXY($this->posxup-1, $tab_top+1);
+		$pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
 
-		$pdf->line(154, $tab_top, 154, $tab_top + $tab_height);
-		$pdf->SetXY(154,$tab_top);
-		$pdf->MultiCell(22,$haut,$outputlangs->transnoentities("PriceU"),0,'R',1);
+		$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+		$pdf->SetXY($this->posxqty-1, $tab_top+1);
+		$pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
 
-		$pdf->line(176, $tab_top, 176, $tab_top + $tab_height);
-		$pdf->SetXY(176,$tab_top);
-		$pdf->MultiCell(24,$haut,$outputlangs->transnoentities("Total"),0,'R',1);
+		$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
+		if ($this->atleastonediscount)
+		{
+			$pdf->SetXY($this->posxdiscount-1, $tab_top+1);
+			$pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
+		}
 
-		$pdf->Rect(10, $tab_top, 190, $tab_height);
+		if ($this->atleastonediscount)
+		{
+			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
+		}
+		$pdf->SetXY($this->postotalht-1, $tab_top+1);
+		$pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHT"),'','C');
 
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','', $default_font_size);
 	}
 
-
-    /**
-     *      Show header of document
-     *      @param      pdf             Object PDF
-     *      @param      object          Object commercial proposal
-     *      @param      showaddress     0=no, 1=yes
-     *      @param      outputlangs     Object lang for output
-     */
-	function _pagehead(&$pdf, $object, $showadress=1, $outputlangs)
+	/**
+	 *   	Show header of document
+	 *
+	 *   	@param      pdf     		Object PDF
+	 *   	@param      object			Object commercial proposal
+	 *      @param      showaddress     0=no, 1=yes
+	 *      @param      outputlangs    	Object lang for output
+	 */
+	function _pagehead(&$pdf, $object, $showaddress=1, $outputlangs)
 	{
 		global $conf,$langs;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
+		$outputlangs->load("main");
+		$outputlangs->load("bills");
+		$outputlangs->load("propal");
+		$outputlangs->load("companies");
+
 		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
 		//Affiche le filigrane brouillon - Print Draft Watermark
-		if($object->statut==0 && ! empty($conf->global->PROPALE_DRAFT_WATERMARK))
+		if($object->statut==0 && (! empty($conf->global->PROPALE_DRAFT_WATERMARK)) )
 		{
             pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->PROPALE_DRAFT_WATERMARK);
 		}
 
-		$posy=42;
+		//Prepare la suite
+		$pdf->SetTextColor(0,0,60);
+		$pdf->SetFont('','B', $default_font_size + 3);
 
-		$pdf->SetXY($this->marge_gauche+2,$posy);
+        $posx=$this->page_largeur-$this->marge_droite-100;
+		$posy=$this->marge_haute;
 
-		// Sender name
-		$pdf->SetTextColor(0,0,00);
-		$pdf->SetFont('','B', $default_font_size);
-		$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+		$pdf->SetXY($this->marge_gauche,$posy);
 
-		// Sender properties
-		$carac_emetteur='';
-	 	// Add internal contact of proposal if defined
-		$arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
-	 	if (sizeof($arrayidcontact) > 0)
-	 	{
-	 		$object->fetch_user($arrayidcontact[0]);
-	 		$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
-	 	}
+		// Logo
+		$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+		if ($this->emetteur->logo)
+		{
+			if (is_readable($logo))
+			{
+				$pdf->Image($logo, $this->marge_gauche, $posy, 0, 24);
+			}
+			else
+			{
+				$pdf->SetTextColor(200,0,0);
+				$pdf->SetFont('','B',$default_font_size - 2);
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+			}
+		}
+		else
+		{
+			$text=$this->emetteur->name;
+			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+		}
 
-	 	$carac_emetteur .= pdf_build_address($outputlangs,$this->emetteur);
+		$pdf->SetFont('','B',$default_font_size + 3);
+		$pdf->SetXY($posx,$posy);
+		$pdf->SetTextColor(0,0,60);
+		$title=$outputlangs->transnoentities("CommercialProposal");
+		$pdf->MultiCell(100, 4, $title, '', 'R');
 
-		$pdf->SetFont('','', $default_font_size - 1);
-		$pdf->SetXY($this->marge_gauche+2,$posy+4);
-		$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
-
-
-		$pdf->rect(10, 40, 80, 40);
-
-		$pdf->SetXY(10,5);
-		$pdf->SetFont('','B', $default_font_size + 6);
-		$pdf->SetTextColor(0,0,200);
-		$pdf->MultiCell(200, 20, $outputlangs->transnoentities("CommercialProposal"), '' , 'C');
-
-		// Cadre client destinataire
-		$pdf->rect(100, 40, 100, 40);
-
-		$pdf->SetTextColor(200,0,0);
-		$pdf->SetFont('','B', $default_font_size + 2);
-
-		$pdf->rect(10, 90, 100, 10);
-		$pdf->rect(110, 90, 90, 10);
-
-		$pdf->SetXY(10,90);
-		$pdf->MultiCell(110, 10, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref), 0, 'L');
-		$pdf->SetXY(110,90);
-		$pdf->MultiCell(100, 10, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,'day',false,$outputlangs,true), 0, 'L');
-
-		$posy=15;
-		$pdf->SetFont('','', $default_font_size);
+		$pdf->SetFont('','B',$default_font_size + 2);
 
 		$posy+=5;
-		$pdf->SetXY(100,$posy);
+		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
+
+		$posy+=1;
+		$pdf->SetFont('','', $default_font_size);
 
 		if ($object->ref_client)
 		{
 			$posy+=5;
-			$pdf->SetXY(100,$posy);
+			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
-		$posy+=5;
-		$pdf->SetXY(100,$posy);
+		$posy+=4;
+		$pdf->SetXY($posx,$posy);
+		$pdf->SetTextColor(0,0,60);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,"day",false,$outputlangs,true), '', 'R');
+
+		$posy+=4;
+		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : " . dol_print_date($object->fin_validite,"day",false,$outputlangs,true), '', 'R');
 
 		if ($object->client->code_client)
 		{
-			$posy+=5;
-			$pdf->SetXY(100,$posy);
+			$posy+=4;
+			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R');
 		}
 
-		$posy=39;
-
-		$pdf->SetTextColor(0,0,0);
-
-		// If CUSTOMER contact defined, we use it
-		$usecontact=false;
-		$arrayidcontact=$object->getIdContact('external','CUSTOMER');
-		if (sizeof($arrayidcontact) > 0)
+		if ($showaddress)
 		{
-			$usecontact=true;
-			$result=$object->fetch_contact($arrayidcontact[0]);
+			// Sender properties
+			$carac_emetteur='';
+		 	// Add internal contact of proposal if defined
+			$arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+		 	if (count($arrayidcontact) > 0)
+		 	{
+		 		$object->fetch_user($arrayidcontact[0]);
+		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+		 	}
+
+		 	$carac_emetteur .= pdf_build_address($outputlangs,$this->emetteur);
+
+			// Show sender
+			$posy=42;
+		 	$posx=$this->marge_gauche;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+			$hautcadre=40;
+
+			// Show sender frame
+			$pdf->SetTextColor(0,0,0);
+			$pdf->SetFont('','', $default_font_size - 2);
+			$pdf->SetXY($posx,$posy-5);
+			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->SetXY($posx,$posy);
+			$pdf->SetFillColor(255,255,255);
+			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+
+			// Show sender name
+			$pdf->SetXY($posx+2,$posy+3);
+			$pdf->SetTextColor(0,0,60);
+			$pdf->SetFont('','B',$default_font_size);
+			$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+
+			// Show sender information
+			$pdf->SetFont('','', $default_font_size - 1);
+			$pdf->SetXY($posx+2,$posy+8);
+			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+
+
+			// If CUSTOMER contact defined, we use it
+			$usecontact=false;
+			$arrayidcontact=$object->getIdContact('external','CUSTOMER');
+			if (count($arrayidcontact) > 0)
+			{
+				$usecontact=true;
+				$result=$object->fetch_contact($arrayidcontact[0]);
+			}
+
+			// Recipient name
+			if (! empty($usecontact))
+			{
+				// On peut utiliser le nom de la societe du contact
+				if ($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) $socname = $object->contact->socname;
+				else $socname = $object->client->nom;
+				$carac_client_name=$outputlangs->convToOutputCharset($socname);
+			}
+			else
+			{
+				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+			}
+
+			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,$object->contact,$usecontact,'target');
+
+			// Show recipient
+			$posy=42;
+			$posx=$this->page_largeur-$this->marge_droite-100;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+
+			// Show recipient frame
+			$pdf->SetTextColor(0,0,0);
+			$pdf->SetFont('','', $default_font_size - 2);
+			$pdf->SetXY($posx,$posy-5);
+			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+			$pdf->rect($posx, $posy, 100, $hautcadre);
+			$pdf->SetTextColor(0,0,0);
+
+			// Show recipient name
+			$pdf->SetXY($posx+2,$posy+3);
+			$pdf->SetFont('','B', $default_font_size);
+			$pdf->MultiCell(100,4, $carac_client_name, 0, 'L');
+
+			// Show recipient information
+			$pdf->SetFont('','', $default_font_size - 1);
+			$pdf->SetXY($posx+2,$posy+8);
+			$pdf->MultiCell(100,4, $carac_client, 0, 'L');
 		}
-
-		// Recipient name
-		if (! empty($usecontact))
-		{
-			// On peut utiliser le nom de la societe du contact
-			if ($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) $socname = $object->contact->socname;
-			else $socname = $object->client->nom;
-			$carac_client_name=$outputlangs->convToOutputCharset($socname);
-		}
-		else
-		{
-			$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
-		}
-
-		$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,$object->contact,$usecontact,'target');
-
-		// Show recipient
-		$pdf->SetXY(102,$posy+3);
-		$pdf->SetFont('','B', $default_font_size);
-		$pdf->MultiCell(96,4, $carac_client_name, 0, 'L');
-
-		// Show address
-		$pdf->SetFont('','', $default_font_size - 1);
-		$pdf->SetXY(102,$posy+8);
-		$pdf->MultiCell(86,4, $carac_client, 0, 'L');
 	}
 
 	/**
@@ -646,4 +1051,5 @@ class pdf_propale_jaune extends ModelePDFPropales
 	}
 
 }
+
 ?>