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

Uniformize code:

Browse Source 
New: Call to hook after generation is also done into odt.
Fix: Missing hook before save.
This commit is contained in:
Laurent Destailleur 2014-08-21 15:02:18 +02:00
parent bc0c5fb55e
commit c799f0f10f
7 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
View File

@ -482,6 +482,8 @@ class doc_generic_order_odt extends ModelePDFCommandes
}
}
$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if (! empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));

2
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
View File

@ -482,6 +482,8 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
}
}
$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if (! empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));

2
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -439,6 +439,8 @@ class doc_generic_invoice_odt extends ModelePDFFactures
}
}
$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if (! empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));

2
htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
View File

@ -1019,6 +1019,8 @@ class doc_generic_project_odt extends ModelePDFProjects
}
}
$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if (! empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));

26
htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php
View File

@ -816,9 +816,31 @@ class doc_generic_task_odt extends ModelePDFTask
}
// Call the beforeODTSave hook
$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
// Write new file
$odfHandler->saveToDisk($file);
if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
try {
$odfHandler->exportAsAttachedPDF($file);
}catch (Exception $e){
$this->error=$e->getMessage();
return -1;
}
}
else {
try {
$odfHandler->saveToDisk($file);
}catch (Exception $e){
$this->error=$e->getMessage();
return -1;
}
}
$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if (! empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));

2
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
View File

@ -517,6 +517,8 @@ class doc_generic_proposal_odt extends ModelePDFPropales
}
}
$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if (! empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));

2
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
View File

@ -416,6 +416,8 @@ class doc_generic_odt extends ModeleThirdPartyDoc
}
}
$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if (! empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));