From 1036eabd42c020ea43ea5c79f3d957b2d93b855d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 18 Jan 2009 17:07:27 +0000
Subject: [PATCH] New: Add hidden option MAIN_DISABLE_PDF_COMPRESSION

---
 ChangeLog                                     |  1 +
 htdocs/admin/limits.php                       | 25 ++++--
 htdocs/html.form.class.php                    | 84 +++++++++----------
 .../menus/barre_left/eldy_backoffice.php      |  2 +-
 .../menus/barre_left/eldy_frontoffice.php     |  2 +-
 .../modules/commande/pdf_edison.modules.php   |  1 +
 .../modules/commande/pdf_einstein.modules.php |  1 +
 .../pdf/pdf_expedition_merou.modules.php      |  1 +
 .../pdf/pdf_expedition_rouget.modules.php     |  1 +
 .../modules/facture/pdf_crabe.modules.php     |  1 +
 .../modules/facture/pdf_huitre.modules.php    |  1 +
 .../modules/facture/pdf_oursin.modules.php    |  1 +
 .../livraison/pdf/pdf_sirocco.modules.php     |  1 +
 .../livraison/pdf/pdf_typhon.modules.php      |  1 +
 .../propale/pdf_propale_azur.modules.php      |  1 +
 .../propale/pdf_propale_jaune.modules.php     |  1 +
 .../pdf/pdf_muscadet.modules.php              |  1 +
 htdocs/langs/en_US/admin.lang                 |  3 +-
 htdocs/langs/fr_FR/admin.lang                 |  3 +-
 19 files changed, 79 insertions(+), 53 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e959c8805dd..57f148e775a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ For users:
 - New: Add VAT number in export fields.
 - New: Upgrade FPDF to 1.6
 - New: Added keywords in PDF
+- New: Add hidden option MAIN_DISABLE_PDF_COMPRESSION.
 - Fix: Author, title and topic are correctly encoded i nPDF.
 - Fix: Now HTML output is always UTF8, this solve bad PDF encoding on old users.
 - Fix: Save new model when changed on interventions.
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index ecb34ea62c4..cea2b88273e 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2007-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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
@@ -44,10 +44,11 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update')
 	}
 	else
 	{
-		dolibarr_set_const($db, "MAIN_MAX_DECIMALS_UNIT",  $_POST["MAIN_MAX_DECIMALS_UNIT"]);
-		dolibarr_set_const($db, "MAIN_MAX_DECIMALS_TOT",   $_POST["MAIN_MAX_DECIMALS_TOT"]);
-		dolibarr_set_const($db, "MAIN_MAX_DECIMALS_SHOWN", $_POST["MAIN_MAX_DECIMALS_SHOWN"]);
-			
+		dolibarr_set_const($db, "MAIN_MAX_DECIMALS_UNIT",   $_POST["MAIN_MAX_DECIMALS_UNIT"]);
+		dolibarr_set_const($db, "MAIN_MAX_DECIMALS_TOT",    $_POST["MAIN_MAX_DECIMALS_TOT"]);
+		dolibarr_set_const($db, "MAIN_MAX_DECIMALS_SHOWN",  $_POST["MAIN_MAX_DECIMALS_SHOWN"]);
+		dolibarr_set_const($db, "MAIN_DISABLE_PDF_COMPRESSION", $_POST["MAIN_DISABLE_PDF_COMPRESSION"]);
+
 		Header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
 		exit;
 	}
@@ -90,7 +91,12 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td><td><input class="flat" name="MAIN_MAX_DECIMALS_SHOWN" size="3" value="' . $conf->global->MAIN_MAX_DECIMALS_SHOWN . '"></td></tr>';
 
-
+    /*
+    $var=!$var;
+    print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_PDF_COMPRESSION").'</td><td>';
+	print $html->selectyesno('MAIN_DISABLE_PDF_COMPRESSION',$conf->global->MAIN_DISABLE_PDF_COMPRESSION);
+    print '</td></tr>';
+	*/
 
     print '</table>';
 
@@ -121,7 +127,12 @@ else
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td><td align="right">'.$conf->global->MAIN_MAX_DECIMALS_SHOWN.'</td></tr>';
 
-    print '</table><br>';
+    /*
+    $var=!$var;
+    print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_PDF_COMPRESSION").'</td><td align="right">'.yn($conf->global->MAIN_DISABLE_PDF_COMPRESSION).'</td></tr>';
+	*/
+
+    print '</table>';
 
     print '<div class="tabsAction">';
     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 0e68ee76317..5561e0f63bb 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -79,7 +79,7 @@ class Form
 
 		$paramfortooltiptext ='';
 		$paramfortooltippicto ='';
-	  
+
 		// Sanitize tooltip
 		$htmltext=ereg_replace("'","\'",$htmltext);
 		$htmltext=ereg_replace("&#039;","\'",$htmltext);
@@ -374,7 +374,7 @@ class Form
 			if ($selected == -1) print ' selected="true"';
 			print '>&nbsp;</option>';
 		}
-	  
+
 		$sql = "SELECT c.code, c.libelle as type FROM ".MAIN_DB_PREFIX."c_type_fees as c";
 		$sql.= " ORDER BY lower(c.libelle) ASC";
 		$resql=$db->query($sql);
@@ -529,7 +529,7 @@ class Form
 						$desc=$langs->trans("CreditNote");
 						//$desc.=$obj->fk_facture_source;
 					}
-						
+
 					$selectstring='';
 					if ($selected > 0 && $selected == $obj->rowid) $selectstring=' selected="true"';
 
@@ -585,7 +585,7 @@ class Form
 		{
 			$num=$this->db->num_rows($resql);
 			if ($num == 0) return 0;
-				
+
 			if ($htmlname != 'none') print '<select class="flat" name="'.$htmlname.'">';
 			if ($showempty) print '<option value="0">&nbsp;</option>';
 			$num = $this->db->num_rows($resql);
@@ -661,7 +661,7 @@ class Form
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object();
-						
+
 					if ((is_object($selected) && $selected->id == $obj->rowid) || (! is_object($selected) && $selected == $obj->rowid))
 					{
 						print '<option value="'.$obj->rowid.'" selected="true">'.$obj->name.' '.$obj->firstname.'</option>';
@@ -746,7 +746,7 @@ class Form
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
 		}
 		if($finished == 0)
-		{			
+		{
 			$sql.= " WHERE p.finished = ".$finished;
 		}
 		elseif($finished == 1)
@@ -788,7 +788,7 @@ class Form
 		if ($result)
 		{
 			$num = $this->db->num_rows($result);
-				
+
 			if ($conf->use_javascript_ajax)
 			{
 				if (! $num)
@@ -809,7 +809,7 @@ class Form
 				print '<select class="flat" name="'.$htmlname.'">';
 				print '<option value="0" selected="true">&nbsp;</option>';
 			}
-				
+
 			$i = 0;
 			while ($num && $i < $num)
 			{
@@ -881,9 +881,9 @@ class Form
 				print $opt;
 				$i++;
 			}
-				
+
 			print '</select>';
-				
+
 			$this->db->free($result);
 		}
 		else
@@ -948,9 +948,9 @@ class Form
 		$result=$this->db->query($sql);
 		if ($result)
 		{
-				
+
 			$num = $this->db->num_rows($result);
-				
+
 			if ($conf->use_javascript_ajax)
 			{
 				if (! $num)
@@ -970,7 +970,7 @@ class Form
 				if (! $selected) print '<option value="0" selected="true">&nbsp;</option>';
 				else print '<option value="0">&nbsp;</option>';
 			}
-				
+
 			$i = 0;
 			while ($i < $num)
 			{
@@ -1012,7 +1012,7 @@ class Form
 				$i++;
 			}
 			print '</select>';
-				
+
 			$this->db->free($result);
 		}
 		else
@@ -1050,9 +1050,9 @@ class Form
 		if ($result)
 		{
 			$num = $this->db->num_rows($result);
-				
+
 			$form = '<select class="flat" name="'.$htmlname.'">';
-				
+
 			if (! $num)
 			{
 				$form.= '<option value="0">-- '.$langs->trans("NoSupplierPriceDefinedForThisProduct").' --</option>';
@@ -1065,10 +1065,10 @@ class Form
 				while ($i < $num)
 				{
 					$objp = $this->db->fetch_object($result);
-						
+
 					$opt = '<option value="'.$objp->idprodfournprice.'"';
 					$opt.= '>'.$objp->nom.' - '.$objp->ref_fourn.' - ';
-						
+
 					if ($objp->quantity == 1)
 					{
 						$opt.= price($objp->fprice);
@@ -1092,7 +1092,7 @@ class Form
 					}
 					if ($objp->duration) $opt .= " - ".$objp->duration;
 					$opt .= "</option>\n";
-						
+
 					$form.= $opt;
 					$i++;
 				}
@@ -1437,7 +1437,7 @@ class Form
 			dolibarr_print_error($this->db);
 		}
 	}
-	 
+
 	/**
 	 *    \brief    Retourne la liste des catégories du type choisi
 	 *    \param    type			Type de categories (0=produit, 1=fournisseur, 2=client)
@@ -1663,7 +1663,7 @@ class Form
 	function form_date($page, $selected='', $htmlname)
 	{
 		global $langs;
-		
+
 		if ($htmlname != "none")
 		{
 			print '<form method="post" action="'.$page.'" name="form'.$htmlname.'">';
@@ -1686,7 +1686,7 @@ class Form
 			}
 		}
 	}
-	
+
 
 	/**
 	 *    \brief      Affiche formulaire de selection des modes de reglement
@@ -2009,7 +2009,7 @@ class Form
 		if (sizeof($txtva))
 		{
 			print '<select class="flat" name="'.$name.'">';
-				
+
 			for ($i = 0 ; $i < $nbdetaux ; $i++)
 			{
 				//print "xxxxx".$txtva[$i]."-".$nprtva[$i];
@@ -2109,12 +2109,12 @@ class Form
 					print '<input id="'.$prefix.'" name="'.$prefix.'" type="text" size="9" maxlength="11" value="'.$formated_date.'"';
 					print ' onChange="dpChangeDay(\''.$prefix.'\',\''.$conf->format_date_short_java.'\'); "';
 					print '>';
-						
+
 					// Icone calendrier
 					print '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons"';
 					$base=DOL_URL_ROOT.'/lib/';
 					print ' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$conf->format_date_short_java.'\');">'.img_object($langs->trans("SelectDate"),'calendar').'</button>';
-						
+
 					print '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";
 					print '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
 					print '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";
@@ -2149,7 +2149,7 @@ class Form
 					}
 				}
 			}
-			 
+
 			/*
 			 * Affiche date en select
 			 */
@@ -2157,7 +2157,7 @@ class Form
 			{
 				// Jour
 				print '<select class="flat" name="'.$prefix.'day">';
-	    
+
 				if ($empty || $set_time == -1)
 				{
 					print '<option value="0" selected="true">&nbsp;</option>';
@@ -2175,15 +2175,15 @@ class Form
 					}
 					print "</option>";
 				}
-	    
+
 				print "</select>";
-	    
+
 				print '<select class="flat" name="'.$prefix.'month">';
 				if ($empty || $set_time == -1)
 				{
 					print '<option value="0" selected="true">&nbsp;</option>';
 				}
-	    
+
 				// Mois
 				for ($month = 1 ; $month <= 12 ; $month++)
 				{
@@ -2192,7 +2192,7 @@ class Form
 					print "</option>";
 				}
 				print "</select>";
-	    
+
 				// Année
 				if ($empty || $set_time == -1)
 				{
@@ -2201,7 +2201,7 @@ class Form
 				else
 				{
 					print '<select class="flat" name="'.$prefix.'year">';
-					 
+
 					for ($year = $syear - 5; $year < $syear + 10 ; $year++)
 					{
 						if ($year == $syear)
@@ -2246,7 +2246,7 @@ class Form
 			print "</select>";
 			print "H\n";
 		}
-		 
+
 		if ($m)
 		{
 			/*
@@ -2279,7 +2279,7 @@ class Form
 		{
 			// Script which will be inserted in the OnClick of the "Now" button
 			$reset_scripts = "";
-			
+
 			// Generate the date part, depending on the use or not of the javascript calendar
 			if ($conf->use_popup_calendar)
 			{
@@ -2304,14 +2304,14 @@ class Form
 			}
 			// If reset_scripts is not empty, print the button with the reset_scripts in OnClick
 			if ($reset_scripts)
-			{			
+			{
 				print '<button class="dpInvisibleButtons" id="'.$prefix.'ButtonNow" type="button" name="_useless" value="Maintenant" onClick="'.$reset_scripts.'">';
 				print $langs->trans("Now");
 				//print img_refresh($langs->trans("Now"));
 				print '</button> ';
 			}
 		}
-		
+
 	}
 
 	/**
@@ -2324,7 +2324,7 @@ class Form
 		if ($iSecond)
 		{
 			require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
-				
+
 			$hourSelected = ConvertSecondToTime($iSecond,'hour');
 			$minSelected = ConvertSecondToTime($iSecond,'min');
 		}
@@ -2404,7 +2404,7 @@ class Form
 			else
 			{
 				$newval=($translate?$langs->trans($value):$value);
-				$selectOptionValue = ($maxlen?dolibarr_trunc($newval,$maxlen):$newval); 
+				$selectOptionValue = ($maxlen?dolibarr_trunc($newval,$maxlen):$newval);
 				if ($value == '' || $value == '-') { $selectOptionValue='&nbsp;'; }
 				print $selectOptionValue;
 			}
@@ -2421,7 +2421,7 @@ class Form
 	 *    \param      value           Valeur pré-sélectionnée
 	 *    \param      option          0 retourne yes/no, 1 retourne 1/0
 	 */
-	function selectyesno($name,$value='',$option=0)
+	function selectyesno($htmlname,$value='',$option=0)
 	{
 		global $langs;
 
@@ -2433,7 +2433,7 @@ class Form
 			$no="0";
 		}
 
-		$resultyesno = '<select class="flat" name="'.$name.'">'."\n";
+		$resultyesno = '<select class="flat" name="'.$htmlname.'">'."\n";
 		if (("$value" == 'yes') || ($value == 1))
 		{
 			$resultyesno .= '<option value="'.$yes.'" selected="true">'.$langs->trans("yes").'</option>'."\n";
@@ -2459,7 +2459,7 @@ class Form
 	 */
 	function select_export_model($selected='',$htmlname='exportmodelid',$type='',$useempty=0)
 	{
-			
+
 		$sql = "SELECT rowid, label";
 		$sql.= " FROM ".MAIN_DB_PREFIX."export_model";
 		$sql.= " WHERE type = '".$type."'";
@@ -2591,7 +2591,7 @@ class Form
 		if ($morehtmlref) {
 			$ret.=' '.$morehtmlref;
 		}
-		
+
 		if ($morehtml) {
 			$ret.='</td><td class="nobordernopadding" align="right">'.$morehtml;
 		}
diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php
index aba4325405f..fa141c0b26d 100644
--- a/htdocs/includes/menus/barre_left/eldy_backoffice.php
+++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php
@@ -134,8 +134,8 @@ class MenuLeft {
 					if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/delais.php",$langs->trans("Alerts"));
 
 					if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/perms.php", $langs->trans("Security"));
-					if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/mails.php", $langs->trans("Emails"));
 					if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/limits.php", $langs->trans("MenuLimits"));
+					if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/mails.php", $langs->trans("Emails"));
 					if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/dict.php", $langs->trans("DictionnarySetup"));
 					if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/const.php", $langs->trans("OtherSetup"));
 
diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php
index 95773c38c10..d410821233f 100644
--- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php
+++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php
@@ -136,8 +136,8 @@ class MenuLeft {
 					if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/delais.php",$langs->trans("Alerts"));
 
 					if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/perms.php", $langs->trans("Security"));
-					if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/mails.php", $langs->trans("Emails"));
 					if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/limits.php", $langs->trans("Limits"));
+					if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/mails.php", $langs->trans("Emails"));
 					if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/dict.php", $langs->trans("DictionnarySetup"));
 					if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/const.php", $langs->trans("OtherSetup"));
 
diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php
index 31f10887860..2ca6e54dfb8 100644
--- a/htdocs/includes/modules/commande/pdf_edison.modules.php
+++ b/htdocs/includes/modules/commande/pdf_edison.modules.php
@@ -160,6 +160,7 @@ class pdf_edison extends ModelePDFCommandes
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->fullname));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($com->ref)." ".$outputlangs->transnoentities("Order"));
+				if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 				$pdf->SetAutoPageBreak(1,0);
diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php
index 17a3f7c80ca..1b67f044608 100644
--- a/htdocs/includes/modules/commande/pdf_einstein.modules.php
+++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php
@@ -182,6 +182,7 @@ class pdf_einstein extends ModelePDFCommandes
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->fullname));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($com->ref)." ".$outputlangs->transnoentities("Order"));
+				if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 				$pdf->SetAutoPageBreak(1,0);
diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
index 13ad6d03896..41297846e0f 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
@@ -164,6 +164,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->fullname));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($this->expe->ref)." ".$outputlangs->transnoentities("Sending"));
+				if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 
 				$pdf->SetMargins(10, 10, 10);
 				$pdf->SetAutoPageBreak(1,0);
diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
index 3aeb66942d5..9ca07db7801 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
@@ -179,6 +179,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->fullname));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($fac->ref)." ".$outputlangs->transnoentities("Sending"));
+				if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 				$pdf->SetAutoPageBreak(1,0);
diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index 5c7e739bbe9..083d6f597fa 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -184,6 +184,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->fullname));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($fac->ref)." ".$outputlangs->transnoentities("Invoice"));
+				if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 				$pdf->SetAutoPageBreak(1,0);
diff --git a/htdocs/includes/modules/facture/pdf_huitre.modules.php b/htdocs/includes/modules/facture/pdf_huitre.modules.php
index 4e2da424d6e..b390d203e5b 100644
--- a/htdocs/includes/modules/facture/pdf_huitre.modules.php
+++ b/htdocs/includes/modules/facture/pdf_huitre.modules.php
@@ -162,6 +162,7 @@ class pdf_huitre extends ModelePDFFactures
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->fullname));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($fac->ref)." ".$outputlangs->transnoentities("Invoice"));
+				if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 
 				$pdf->SetMargins(10, 10, 10);
 				$pdf->SetAutoPageBreak(1,0);
diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php
index bf413bf277f..d5d9f3a906d 100644
--- a/htdocs/includes/modules/facture/pdf_oursin.modules.php
+++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php
@@ -172,6 +172,7 @@ class pdf_oursin extends ModelePDFFactures
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->fullname));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($fac->ref)." ".$outputlangs->transnoentities("Invoice"));
+				if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 
 				$pdf->SetMargins(10, 10, 10);
 				$pdf->SetAutoPageBreak(1,0);
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
index 50214236053..a78badbf9d9 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
@@ -154,6 +154,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->fullname));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($delivery->ref)." ".$outputlangs->transnoentities("DeliveryOrder"));
+				if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 
 				$this->_pagehead($pdf, $delivery, $outputlangs);
 
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
index ea0ebaba920..f7293a62050 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
@@ -182,6 +182,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->fullname));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($delivery->ref)." ".$outputlangs->transnoentities("DeliveryOrder"));
+				if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 				$pdf->SetAutoPageBreak(1,0);
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index 0d90eacc752..25ccc5c14fc 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -184,6 +184,7 @@ class pdf_propale_azur extends ModelePDFPropales
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->fullname));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($propale->ref)." ".$outputlangs->transnoentities("CommercialProposal"));
+				if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 				$pdf->SetAutoPageBreak(1,0);
diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
index a5ee2900e68..964b08c948e 100644
--- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
@@ -163,6 +163,7 @@ class pdf_propale_jaune extends ModelePDFPropales
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->fullname));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($propale->ref)." ".$outputlangs->transnoentities("CommercialProposal"));
+				if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 				$pdf->SetAutoPageBreak(1,0);
diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
index 907364d705d..6dca4807a06 100644
--- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -186,6 +186,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->fullname));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($com->ref)." ".$outputlangs->transnoentities("Order"));
+				if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 				$pdf->SetAutoPageBreak(1,0);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9c079b06104..ecb1dbe5497 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -604,10 +604,11 @@ ConstDesc=This page allows you to edit all other parameters not available in pre
 OnceSetupFinishedCreateUsers=Warning, you are a Dolibarr administrator user. Administrator users are used to setup Dolibarr. For a usual usage of Dolibarr, it is recommended to use a non administrator user created from Users & Groups menu.
 MiscellanousDesc=Define here all other parameters related to security.
 LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits and precision used by Dolibarr here
+LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
 MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
 MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
+MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
 ParameterActiveForNextInputOnly=Parameter effective for next input only
 NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
 NoEventFoundWithCriteria=No security event has been found for such search criterias.
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 68767d9282f..358ca6719e7 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -603,10 +603,11 @@ ConstDesc=Cet 
 OnceSetupFinishedCreateUsers=Attention, vous êtes sous un compte administrateur de Dolibarr. Les administrateurs sont utilisés pour configurer Dolibarr. Pour une utilisation courante de Dolibarr, il est recommandé d'utiliser un compte non administrateur créé depuis le menu "Utilisateurs & Groupes".
 MiscellanousDesc=Définissez ici les autres paramètres en rapport avec la sécurité.
 LimitsSetup=Configuration des limites et precisions
-LimitsDesc=Vous pouvez définir ici les limites et précisions utilisées par Dolibarr
+LimitsDesc=Vous pouvez définir ici les limites, précisions et optimisations utilisées par Dolibarr
 MAIN_MAX_DECIMALS_UNIT=Nombre de décimals maximum pour les prix unitaires
 MAIN_MAX_DECIMALS_TOT=Nombre de décimals maximum pour les prix totaux
 MAIN_MAX_DECIMALS_SHOWN=Nombre de décimals maximum pour les montant affichés à l'écran (Mettre <b>...</b> après ce nombre max si vous voulez voir <b>...</b> quand le nombre est tronqué à l'affichage écran)
+MAIN_DISABLE_PDF_COMPRESSION=Utiliser la compression PDF pour les fichiers PDF générés.
 ParameterActiveForNextInputOnly=Parametre effectif pour les prochaines saisies uniquement
 NoEventOrNoAuditSetup=Aucun évenement d'audit de sécurité n'a été enregistré. Ceci peut etre normal si l'audit n'a pas été activé dans la configuration - sécurité - audit.
 NoEventFoundWithCriteria=Aucun évenement d'audit de sécurité trouvé avec ces critères.