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

Can filter also on payment mode

Browse Source
This commit is contained in:
Laurent Destailleur 2021-04-19 11:11:01 +02:00
parent 83b5a325df
commit 23b11491d2
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/compta/facture/class/facture.class.php
View File

@ -5610,11 +5610,12 @@ class FactureLigne extends CommonInvoiceLine
* Send reminders by emails for ivoices that are due * Send reminders by emails for ivoices that are due
* CAN BE A CRON TASK * CAN BE A CRON TASK
* *
* @param int $nbdays Delay after due date (or before if delay is negative) * @param int $nbdays Delay after due date (or before if delay is negative)
* @param int $idtemplate Id or name of of email template (Must be a template of type 'invoice') * @param string $paymentmode '' or 'all' by default (no filter), or 'LIQ', 'CHQ', CB', ...
* @return int 0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK) * @param int|string $idtemplate Id or name of of email template (Must be a template of type 'invoice')
* @return int 0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
*/ */
public function sendEmailsReminderOnDueDate($nbdays = 0, $idtemplate = 0) public function sendEmailsReminderOnDueDate($nbdays = 0, $paymentmode = 'all', $idtemplate = '')
{ {
global $conf, $langs, $user; global $conf, $langs, $user;
@ -5653,10 +5654,16 @@ class FactureLigne extends CommonInvoiceLine
$this->db->begin(); $this->db->begin();
//Select all action comm reminder //Select all action comm reminder
$sql = "SELECT rowid as id FROM ".MAIN_DB_PREFIX."facture"; $sql = "SELECT rowid as id FROM ".MAIN_DB_PREFIX."facture as f";
$sql .= " WHERE paye = 0"; if (!empty($paymentmode) && $paymentmode != 'all') {
$sql .= " AND date_lim_reglement = '".$this->db->idate(dol_time_plus_duree($now, -1 * $nbdays, 'd'))."'"; // TODO Remove hours into filter $sql .= ", ".MAIN_DB_PREFIX."c_paiement as cp";
$sql .= " AND entity IN (".getEntity('facture').")"; }
$sql .= " WHERE f.paye = 0";
$sql .= " AND f.date_lim_reglement = '".$this->db->idate(dol_time_plus_duree($now, -1 * $nbdays, 'd'))."'"; // TODO Remove hours into filter
$sql .= " AND f.entity IN (".getEntity('facture').")";
if (!empty($paymentmode) && $paymentmode != 'all') {
$sql .= " AND f.fk_mode_reglement = cp.id AND cp.code = '".$this->db->escape($paymentmode)."'";
}
// TODO Add filter to check there is no payment started // TODO Add filter to check there is no payment started
$sql .= $this->db->order("date_lim_reglement", "ASC"); $sql .= $this->db->order("date_lim_reglement", "ASC");
$resql = $this->db->query($sql); $resql = $this->db->query($sql);

2
htdocs/core/modules/modFacture.class.php
View File

@ -121,7 +121,7 @@ class modFacture extends DolibarrModules
$datestart = dol_mktime(23, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']); $datestart = dol_mktime(23, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
$this->cronjobs = array( $this->cronjobs = array(
0=>array('label'=>'RecurringInvoices', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture-rec.class.php', 'objectname'=>'FactureRec', 'method'=>'createRecurringInvoices', 'parameters'=>'', 'comment'=>'Generate recurring invoices', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>1, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart), 0=>array('label'=>'RecurringInvoices', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture-rec.class.php', 'objectname'=>'FactureRec', 'method'=>'createRecurringInvoices', 'parameters'=>'', 'comment'=>'Generate recurring invoices', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>1, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
1=>array('label'=>'SendEmailsRemindersOnDueDate', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture.class.php', 'objectname'=>'Facture', 'method'=>'sendEmailsReminderOnDueDate', 'parameters'=>'10,0', 'comment'=>'Send an emails when an unpaid invoice reach a due date + n days', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>0, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart), 1=>array('label'=>'SendEmailsRemindersOnDueDate', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture.class.php', 'objectname'=>'Facture', 'method'=>'sendEmailsReminderOnDueDate', 'parameters'=>"10,all,0", 'comment'=>'Send an emails when the unpaid invoices reach a due date + n days', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>0, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
); );
// Permissions // Permissions