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

NEW adding hooks to createRecurringInvoices()

Browse Source 
For example : send the newly generated invoice by mail.

We send the counter and the total so launching some action
on the last loop (generated invoice or error) is possible.

(bonus: correcting error reporting $this->errors to $this->errors[] )
This commit is contained in:
Chl 2018-08-17 20:39:46 +02:00
parent 95b5d8790d
commit 864ce85341
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php');
/**
@ -1004,14 +1005,16 @@ class FactureRec extends CommonInvoice
*/
function createRecurringInvoices($restrictioninvoiceid=0, $forcevalidation=0)
{
global $conf, $langs, $db, $user;
global $conf, $langs, $db, $user, $hookmanager;
$error=0;
$nb_create=0;
// Load translation files required by the page
$langs->loadLangs(array("main","bills"));
$langs->loadLangs(array("main","bills"));
$nb_create=0;
$hookmanager->initHooks(array('createrecurringinvoices'));
$now = dol_now();
$tmparray=dol_getdate($now);
@ -1029,6 +1032,12 @@ class FactureRec extends CommonInvoice
$sql.=' AND rowid = '.$restrictioninvoiceid;
$sql.= $db->order('entity', 'ASC');
//print $sql;exit;
$parameters = array(
'entity' => $conf->entity,
'restrictioninvoiceid' => $restrictioninvoiceid,
'forcevalidation' => $forcevalidation,
);
$reshook = $hookmanager->executeHooks('writeSQL', $parameters, $sql); // note that $sql might be modified by hooks
$resql = $db->query($sql);
if ($resql)
@ -1051,6 +1060,7 @@ class FactureRec extends CommonInvoice
$invoiceidgenerated = 0;
$facture = null;
$facturerec = new FactureRec($db);
$facturerec->fetch($line->rowid);
@ -1073,7 +1083,7 @@ class FactureRec extends CommonInvoice
$invoiceidgenerated = $facture->create($user);
if ($invoiceidgenerated <= 0)
{
$this->errors = $facture->errors;
$this->errors[] = $facture->errors;
$this->error = $facture->error;
$error++;
}
@ -1082,7 +1092,7 @@ class FactureRec extends CommonInvoice
$result = $facture->validate($user);
if ($result <= 0)
{
$this->errors = $facture->errors;
$this->errors[] = $facture->errors;
$this->error = $facture->error;
$error++;
}
@ -1094,7 +1104,7 @@ class FactureRec extends CommonInvoice
$result = $facture->generateDocument($facturerec->modelpdf, $langs);
if ($result <= 0)
{
$this->errors = $facture->errors;
$this->errors[] = $facture->errors;
$this->error = $facture->error;
$error++;
}
@ -1120,6 +1130,16 @@ class FactureRec extends CommonInvoice
$db->rollback("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref);
}
$parameters = array(
'cpt' => $i,
'total' => $num,
'errorCount' => $error,
'invoiceidgenerated' => $invoiceidgenerated,
'facturerec' => $facturerec, // it's an object which PHP passes by "reference", so modifiable by hooks.
'this' => $this, // it's an object which PHP passes by "reference", so modifiable by hooks.
);
$reshook = $hookmanager->executeHooks('generatedInvoice', $parameters, $facture); // note: $facture can be modified by hooks (warning: $facture can be null)
$i++;
}