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

Merge pull request #7565 from tarrsalah/fix_supplier_payment_builddoc

Browse Source 
Fix supplier payment builddoc
This commit is contained in:
Laurent Destailleur 2017-10-06 01:55:48 +02:00 committed by GitHub
commit 337d6d9f08
2 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fourn/class/paiementfourn.class.php
View File

@ -702,7 +702,7 @@ class PaiementFourn extends Paiement
} }
else else
{ {
$modelpath = "core/modules/supplier_payment/pdf/"; $modelpath = "core/modules/supplier_payment/doc/";
return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
} }

28
htdocs/fourn/paiement/card.php
View File

@ -140,30 +140,10 @@ if ($action == 'setdatep' && ! empty($_POST['datepday']))
} }
// Build document // Build document
if ($action == 'builddoc') $upload_dir = $conf->fournisseur->payment->dir_output;
{ // TODO: get the appropriate permisson
// Save modele used $permissioncreate = true;
$object->fetch($id); include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
$object->fetch_thirdparty();
// Save last template used to generate document
if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
$outputlangs = $langs;
$newlang=GETPOST('lang_id','aZ09');
if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
if (! empty($newlang))
{
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result < 0)
{
setEventMessages($object->error, $object->errors, 'errors');
$action='';
}
}
/* /*