Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into

Browse Source 
marcosgdf-oop-pdf

Conflicts:
	htdocs/projet/class/project.class.php
This commit is contained in:
Laurent Destailleur
2014-09-23 00:02:19 +02:00
parent bd6afa10ed 8f492a6677
commit dc96e10215
38 changed files with 586 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/projet/tasks/task.php
View File

@@ -159,7 +159,7 @@ if ($action == 'builddoc' && $user->rights->projet->creer)
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang(GETPOST('lang_id'));
}
$result=task_pdf_create($db, $object, $object->modelpdf, $outputlangs);
$result= $object->generateDocument($object->modelpdf, $outputlangs);
if ($result <= 0)
{
dol_print_error($db,$result);