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

Fix: Parameter delay not used when set to 0

Browse Source
This commit is contained in:
Laurent Destailleur 2013-05-15 22:32:28 +02:00
parent 4fede61c16
commit b05548a633
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/invoices/email_unpaid_invoices_to_customers.php
View File

@ -58,17 +58,17 @@ $langs->load('main');
*/ */
$now=dol_now('tzserver'); $now=dol_now('tzserver');
$duration_value=$argv[2]; $duration_value=isset($argv[2])?$argv[2]:-1;
$error = 0; $error = 0;
print $script_file." launched with mode ".$mode.($duration_value?" delay=".$duration_value:"")."\n"; print $script_file." launched with mode ".$mode.($duration_value>=0?" delay=".$duration_value:"")."\n";
$sql = "SELECT f.facnumber, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, s.email, s.default_lang"; $sql = "SELECT f.facnumber, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, s.email, s.default_lang";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql .= " , ".MAIN_DB_PREFIX."societe as s"; $sql .= " , ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE f.fk_statut != 0 AND f.paye = 0"; $sql .= " WHERE f.fk_statut != 0 AND f.paye = 0";
$sql .= " AND f.fk_soc = s.rowid"; $sql .= " AND f.fk_soc = s.rowid";
if ($duration_value) $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'"; if ($duration_value>=0) $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'";
$sql .= " ORDER BY s.email ASC, s.rowid ASC"; // Order by email to allow one message per email $sql .= " ORDER BY s.email ASC, s.rowid ASC"; // Order by email to allow one message per email
//print $sql; //print $sql;

6
scripts/invoices/email_unpaid_invoices_to_representatives.php
View File

@ -58,10 +58,10 @@ $langs->load('main');
*/ */
$now=dol_now('tzserver'); $now=dol_now('tzserver');
$duration_value=$argv[2]; $duration_value=isset($argv[2])?$argv[2]:-1;
$error = 0; $error = 0;
print $script_file." launched with mode ".$mode.($duration_value?" delay=".$duration_value:"")."\n"; print $script_file." launched with mode ".$mode.($duration_value>=0?" delay=".$duration_value:"")."\n";
$sql = "SELECT f.facnumber, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, u.rowid as uid, u.lastname, u.firstname, u.email, u.lang"; $sql = "SELECT f.facnumber, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, u.rowid as uid, u.lastname, u.firstname, u.email, u.lang";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
@ -70,7 +70,7 @@ $sql .= " , ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " , ".MAIN_DB_PREFIX."user as u"; $sql .= " , ".MAIN_DB_PREFIX."user as u";
$sql .= " WHERE f.fk_statut != 0 AND f.paye = 0"; $sql .= " WHERE f.fk_statut != 0 AND f.paye = 0";
$sql .= " AND f.fk_soc = s.rowid"; $sql .= " AND f.fk_soc = s.rowid";
if ($duration_value) $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'"; if ($duration_value>=0) $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'";
$sql .= " AND sc.fk_soc = s.rowid"; $sql .= " AND sc.fk_soc = s.rowid";
$sql .= " AND sc.fk_user = u.rowid"; $sql .= " AND sc.fk_user = u.rowid";
$sql .= " ORDER BY u.email ASC, s.rowid ASC"; // Order by email to allow one message per email $sql .= " ORDER BY u.email ASC, s.rowid ASC"; // Order by email to allow one message per email