Fix : shipment PDF was not using generation params

Conflicts: htdocs/core/modules/expedition/modules_expedition.php htdocs/expedition/fiche.php
Dolibarr · May 6, 2015 · 72c4337 · 72c4337
1 parent ea95a46
commit 72c4337
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php
@@ -152,7 +152,7 @@ function getVersion()
  *  @return int             			<=0 if KO, >0 if OK
  * @deprecated Use the new function generateDocument of Expedition class
  */
-function expedition_pdf_create(DoliDB $db, Expedition $object, $modele, $outputlangs)
+function expedition_pdf_create(DoliDB $db, Expedition $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
-	return $object->generateDocument($modele, $outputlangs);
+	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 }
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
@@ -381,7 +381,7 @@
 	        $outputlangs = new Translate("",$conf);
 	        $outputlangs->setDefaultLang($newlang);
 	    }
-		$result = $object->generateDocument($object->modelpdf, $outputlangs);
+		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	    if ($result <= 0)
 	    {
 	        dol_print_error($db,$result);

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
@@ -1604,7 +1604,7 @@ function set_billed()
 	 * 	@param	Translate	$outputlangs	Objet lang a utiliser pour traduction
 	 *  @return int             			<=0 if KO, >0 if OK
 	 */
-	public function generateDocument($modele, $outputlangs)
+	public function generateDocument($modele, $outputlangs,$hidedetails=0, $hidedesc=0, $hideref=0)
 	{
 		global $conf,$user,$langs;
 
@@ -1627,7 +1627,7 @@ public function generateDocument($modele, $outputlangs)
 
 		$this->fetch_origin();
 
-		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, 0, 0, 0);
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
 }