Fix missing error management after afterPDFCreation hook.
Removed dead code
This commit is contained in:
parent
e2934a6b5f
commit
7625eb7cd4
@ -188,6 +188,11 @@ class CommActionRapport
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -253,6 +253,11 @@ class pdf_ban extends ModeleBankAccountDoc
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -398,6 +398,11 @@ class pdf_sepamandate extends ModeleBankAccountDoc
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -193,6 +193,11 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -626,6 +626,11 @@ class pdf_einstein extends ModelePDFCommandes
|
|||||||
$parameters=array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -691,6 +691,11 @@ class pdf_eratosthene extends ModelePDFCommandes
|
|||||||
$parameters=array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -475,6 +475,11 @@ class pdf_strato extends ModelePDFContract
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -422,6 +422,11 @@ class pdf_merou extends ModelePdfExpedition
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -638,6 +638,11 @@ class pdf_rouget extends ModelePdfExpedition
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -510,6 +510,11 @@ class pdf_standard extends ModeleExpenseReport
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
@ -1023,7 +1028,7 @@ class pdf_standard extends ModeleExpenseReport
|
|||||||
if ($num > 0 && $object->paid == 0)
|
if ($num > 0 && $object->paid == 0)
|
||||||
{
|
{
|
||||||
$y+=$tab3_height;
|
$y+=$tab3_height;
|
||||||
|
|
||||||
$pdf->SetXY($tab3_posx+17, $tab3_top+$y);
|
$pdf->SetXY($tab3_posx+17, $tab3_top+$y);
|
||||||
$pdf->MultiCell(15, 3, price($totalpaid), 0, 'R', 0);
|
$pdf->MultiCell(15, 3, price($totalpaid), 0, 'R', 0);
|
||||||
$pdf->SetXY($tab3_posx+35, $tab3_top+$y);
|
$pdf->SetXY($tab3_posx+35, $tab3_top+$y);
|
||||||
|
|||||||
@ -755,6 +755,11 @@ class pdf_crabe extends ModelePDFFactures
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -824,6 +824,11 @@ class pdf_sponge extends ModelePDFFactures
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -458,6 +458,11 @@ class pdf_soleil extends ModelePDFFicheinter
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -613,6 +613,11 @@ class pdf_typhon extends ModelePDFDeliveryOrder
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -568,6 +568,11 @@ class pdf_standard extends ModelePDFProduct
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -494,6 +494,11 @@ class pdf_baleine extends ModelePDFProjects
|
|||||||
$parameters=array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -646,6 +646,11 @@ class pdf_beluga extends ModelePDFProjects
|
|||||||
$parameters=array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -425,6 +425,11 @@ class pdf_timespent extends ModelePDFProjects
|
|||||||
$parameters=array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -811,6 +811,11 @@ class pdf_azur extends ModelePDFPropales
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -852,6 +852,11 @@ class pdf_cyan extends ModelePDFPropales
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -326,6 +326,11 @@ class pdf_paiement
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -568,6 +568,11 @@ class pdf_squille extends ModelePdfReception
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -804,6 +804,11 @@ class pdf_standard extends ModelePDFStock
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -783,6 +783,11 @@ class pdf_stdmovement extends ModelePDFMovement
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -584,6 +584,11 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -681,6 +681,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -491,6 +491,11 @@ class pdf_standard extends ModelePDFSuppliersPayments
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -678,6 +678,11 @@ class pdf_aurore extends ModelePDFSupplierProposal
|
|||||||
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
|
||||||
global $action;
|
global $action;
|
||||||
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if ($reshook < 0)
|
||||||
|
{
|
||||||
|
$this->error = $hookmanager->error;
|
||||||
|
$this->errors = $hookmanager->errors;
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_UMASK))
|
if (! empty($conf->global->MAIN_UMASK))
|
||||||
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
@chmod($file, octdec($conf->global->MAIN_UMASK));
|
||||||
|
|||||||
@ -319,34 +319,6 @@ class ActionsDatapolicy
|
|||||||
return $ret;
|
return $ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Execute action
|
|
||||||
*
|
|
||||||
* @param array $parameters Array of parameters
|
|
||||||
* @param Object $pdfhandler PDF builder handler
|
|
||||||
* @param string $action 'add', 'update', 'view'
|
|
||||||
* @return int <0 if KO,
|
|
||||||
* =0 if OK but we want to process standard actions too,
|
|
||||||
* >0 if OK and we want to replace standard actions.
|
|
||||||
*/
|
|
||||||
function afterPDFCreation($parameters, &$pdfhandler, &$action)
|
|
||||||
{
|
|
||||||
global $conf, $user, $langs;
|
|
||||||
global $hookmanager;
|
|
||||||
|
|
||||||
$outputlangs = $langs;
|
|
||||||
|
|
||||||
$ret = 0;
|
|
||||||
$deltemp = array();
|
|
||||||
dol_syslog(get_class($this) . '::executeHooks action=' . $action);
|
|
||||||
|
|
||||||
/* print_r($parameters); print_r($object); echo "action: " . $action; */
|
|
||||||
if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) { // do something only for the context 'somecontext1' or 'somecontext2'
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return $ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* addMoreActionsButtons
|
* addMoreActionsButtons
|
||||||
|
|||||||
@ -61,38 +61,6 @@ class ActionsTakePos
|
|||||||
$this->db = $db;
|
$this->db = $db;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Overloading the doActions function : replacing the parent's function with the one below
|
|
||||||
*
|
|
||||||
* @param array() $parameters Hook metadatas (context, etc...)
|
|
||||||
* @param CommonObject $object The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
|
|
||||||
* @param string $action Current action (if set). Generally create or edit or null
|
|
||||||
* @param HookManager $hookmanager Hook manager propagated to allow calling another hook
|
|
||||||
* @return int < 0 on error, 0 on success, 1 to replace standard code
|
|
||||||
*/
|
|
||||||
public function doActions($parameters, &$object, &$action, $hookmanager)
|
|
||||||
{
|
|
||||||
global $conf, $user, $langs;
|
|
||||||
|
|
||||||
$error = 0; // Error counter
|
|
||||||
|
|
||||||
/* print_r($parameters); print_r($object); echo "action: " . $action; */
|
|
||||||
if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2'))) // do something only for the context 'somecontext1' or 'somecontext2'
|
|
||||||
{
|
|
||||||
// Do what you want here...
|
|
||||||
// You can for example call global vars like $fieldstosearchall to overwrite them, or update database depending on $action and $_POST values.
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! $error) {
|
|
||||||
$this->results = array('myreturn' => 999);
|
|
||||||
$this->resprints = 'A text to show';
|
|
||||||
return 0; // or return 1 to replace standard code
|
|
||||||
} else {
|
|
||||||
$this->errors[] = 'Error message';
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Overloading the doActions function : replacing the parent's function with the one below
|
* Overloading the doActions function : replacing the parent's function with the one below
|
||||||
@ -107,113 +75,14 @@ class ActionsTakePos
|
|||||||
{
|
{
|
||||||
global $conf, $user, $langs;
|
global $conf, $user, $langs;
|
||||||
|
|
||||||
$error = 0; // Error counter
|
|
||||||
|
|
||||||
/* print_r($parameters); print_r($object); echo "action: " . $action; */
|
/* print_r($parameters); print_r($object); echo "action: " . $action; */
|
||||||
if (in_array($parameters['currentcontext'], array('invoicecard'))) // do something only for the context 'somecontext1' or 'somecontext2'
|
if (in_array($parameters['currentcontext'], array('invoicecard'))) // do something only for the context 'somecontext1' or 'somecontext2'
|
||||||
{
|
{
|
||||||
|
|
||||||
$receipt_url=DOL_URL_ROOT."/takepos/receipt.php";
|
$receipt_url=DOL_URL_ROOT."/takepos/receipt.php";
|
||||||
print '<div class="inline-block divButAction"><a target="_blank" class="butAction" href="' . $receipt_url . '?facid=' . $object->id.'">' . $langs->trans('Ticket') .'</a></div>';
|
$this->resprints = '<div class="inline-block divButAction"><a target="_blank" class="butAction" href="' . $receipt_url . '?facid=' . $object->id.'">' . $langs->trans('Ticket') .'</a></div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! $error) {
|
return 0; // or return 1 to replace standard code
|
||||||
$this->results = array('myreturn' => 999);
|
|
||||||
$this->resprints = 'A text to show';
|
|
||||||
return 0; // or return 1 to replace standard code
|
|
||||||
} else {
|
|
||||||
$this->errors[] = 'Error message';
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Overloading the addMoreMassActions function : replacing the parent's function with the one below
|
|
||||||
*
|
|
||||||
* @param array() $parameters Hook metadatas (context, etc...)
|
|
||||||
* @param CommonObject $object The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
|
|
||||||
* @param string $action Current action (if set). Generally create or edit or null
|
|
||||||
* @param HookManager $hookmanager Hook manager propagated to allow calling another hook
|
|
||||||
* @return int < 0 on error, 0 on success, 1 to replace standard code
|
|
||||||
*/
|
|
||||||
public function addMoreMassActions($parameters, &$object, &$action, $hookmanager)
|
|
||||||
{
|
|
||||||
global $conf, $user, $langs;
|
|
||||||
|
|
||||||
$error = 0; // Error counter
|
|
||||||
|
|
||||||
/* print_r($parameters); print_r($object); echo "action: " . $action; */
|
|
||||||
if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2'))) // do something only for the context 'somecontext1' or 'somecontext2'
|
|
||||||
{
|
|
||||||
$this->resprints = '<option value="0"'.($disabled?' disabled="disabled"':'').'>'.$langs->trans("TakePosMassAction").'</option>';
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! $error) {
|
|
||||||
return 0; // or return 1 to replace standard code
|
|
||||||
} else {
|
|
||||||
$this->errors[] = 'Error message';
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Execute action
|
|
||||||
*
|
|
||||||
* @param array $parameters Array of parameters
|
|
||||||
* @param Object $object Object output on PDF
|
|
||||||
* @param string $action 'add', 'update', 'view'
|
|
||||||
* @return int <0 if KO,
|
|
||||||
* =0 if OK but we want to process standard actions too,
|
|
||||||
* >0 if OK and we want to replace standard actions.
|
|
||||||
*/
|
|
||||||
function beforePDFCreation($parameters, &$object, &$action)
|
|
||||||
{
|
|
||||||
global $langs,$conf;
|
|
||||||
global $hookmanager;
|
|
||||||
|
|
||||||
$outputlangs=$langs;
|
|
||||||
|
|
||||||
$ret=0; $deltemp=array();
|
|
||||||
dol_syslog(get_class($this).'::executeHooks action='.$action);
|
|
||||||
|
|
||||||
/* print_r($parameters); print_r($object); echo "action: " . $action; */
|
|
||||||
if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2'))) // do something only for the context 'somecontext1' or 'somecontext2'
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return $ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Execute action
|
|
||||||
*
|
|
||||||
* @param array $parameters Array of parameters
|
|
||||||
* @param Object $pdfhandler PDF builder handler
|
|
||||||
* @param string $action 'add', 'update', 'view'
|
|
||||||
* @return int <0 if KO,
|
|
||||||
* =0 if OK but we want to process standard actions too,
|
|
||||||
* >0 if OK and we want to replace standard actions.
|
|
||||||
*/
|
|
||||||
function afterPDFCreation($parameters, &$pdfhandler, &$action)
|
|
||||||
{
|
|
||||||
global $langs,$conf;
|
|
||||||
global $hookmanager;
|
|
||||||
|
|
||||||
$outputlangs=$langs;
|
|
||||||
|
|
||||||
$ret=0; $deltemp=array();
|
|
||||||
dol_syslog(get_class($this).'::executeHooks action='.$action);
|
|
||||||
|
|
||||||
/* print_r($parameters); print_r($object); echo "action: " . $action; */
|
|
||||||
if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2'))) // do something only for the context 'somecontext1' or 'somecontext2'
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return $ret;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user