lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix : shipment PDF was not using generation params

Browse Source 
Conflicts:
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/fiche.php
This commit is contained in:
Maxime Kohlhaas 2015-05-06 12:16:36 +02:00 committed by Juanjo Menent
parent ea95a461e2
commit 72c4337f4b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/modules/expedition/modules_expedition.php
View File

@ -152,7 +152,7 @@ abstract class ModelNumRefExpedition
* @return int <=0 if KO, >0 if OK * @return int <=0 if KO, >0 if OK
* @deprecated Use the new function generateDocument of Expedition class * @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);
} }

2
htdocs/expedition/card.php
View File

@ -381,7 +381,7 @@ if (empty($reshook))
$outputlangs = new Translate("",$conf); $outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang); $outputlangs->setDefaultLang($newlang);
} }
$result = $object->generateDocument($object->modelpdf, $outputlangs); $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result <= 0) if ($result <= 0)
{ {
dol_print_error($db,$result); dol_print_error($db,$result);

4
htdocs/expedition/class/expedition.class.php
View File

@ -1604,7 +1604,7 @@ class Expedition extends CommonObject
* @param Translate $outputlangs Objet lang a utiliser pour traduction * @param Translate $outputlangs Objet lang a utiliser pour traduction
* @return int <=0 if KO, >0 if OK * @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; global $conf,$user,$langs;
@ -1627,7 +1627,7 @@ class Expedition extends CommonObject
$this->fetch_origin(); $this->fetch_origin();
return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, 0, 0, 0); return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
} }
} }