From 03fddd48af55363089ad6082be122d407922ced5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 May 2020 12:14:45 +0200
Subject: [PATCH] Clean some constructors

---
 htdocs/compta/prelevement/bons.php                     |  2 +-
 htdocs/compta/prelevement/card.php                     |  4 ++--
 .../compta/prelevement/class/bonprelevement.class.php  | 10 ++++------
 .../prelevement/class/ligneprelevement.class.php       |  4 +---
 .../prelevement/class/rejetprelevement.class.php       |  3 ++-
 htdocs/compta/prelevement/factures.php                 |  2 +-
 htdocs/compta/prelevement/fiche-rejet.php              |  2 +-
 htdocs/compta/prelevement/fiche-stat.php               |  4 ++--
 htdocs/compta/prelevement/line.php                     |  4 ++--
 htdocs/compta/prelevement/list.php                     |  4 ++--
 htdocs/compta/prelevement/rejets.php                   |  2 +-
 htdocs/compta/prelevement/stats.php                    |  2 +-
 12 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 7f0bd46c450..c7c717e702b 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -54,7 +54,7 @@ $statut = GETPOST('statut', 'int');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 
-$bon = new BonPrelevement($db, "");
+$bon = new BonPrelevement($db);
 $hookmanager->initHooks(array('withdrawalsreceiptslist'));
 
 
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 68f40999aa7..4dcd9f33388 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -58,7 +58,7 @@ $pagenext = $page + 1;
 if (!$sortfield) $sortfield = 'pl.fk_soc';
 if (!$sortorder) $sortorder = 'DESC';
 
-$object = new BonPrelevement($db, "");
+$object = new BonPrelevement($db);
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
@@ -321,7 +321,7 @@ if ($id > 0 || $ref)
 	}
 
 
-	$ligne = new LignePrelevement($db, $user);
+	$ligne = new LignePrelevement($db);
 
 	/*
 	 * Lines into withdraw request
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 0a033e2df53..0c21a3e6d2b 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -83,18 +83,16 @@ class BonPrelevement extends CommonObject
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      	Database handler
-	 *  @param		string		$filename	Filename of withdraw receipt
 	 */
-	public function __construct($db, $filename = '')
+	public function __construct($db)
 	{
 		global $conf, $langs;
 
-		$error = 0;
 		$this->db = $db;
 
-		$this->filename = $filename;
+		$this->filename = '';
 
-		$this->date_echeance = time();
+		$this->date_echeance = dol_now();
 		$this->raison_sociale = "";
 		$this->reference_remise = "";
 
@@ -892,7 +890,7 @@ class BonPrelevement extends CommonObject
 							if ($bac->verif() >= 1)
 							{
 								$factures_prev[$i] = $fac;
-								/* second tableau necessaire pour BonPrelevement */
+								/* second array necessary for BonPrelevement */
 								$factures_prev_id[$i] = $fac[0];
 								$i++;
 								//dol_syslog(__METHOD__."::RIB is ok", LOG_DEBUG);
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index dd24ad9522c..88b612554df 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -48,14 +48,12 @@ class LignePrelevement
 	 *  Constructor
 	 *
 	 *  @param	DoliDb	$db			Database handler
-	 *  @param 	User	$user       Objet user
 	 */
-	public function __construct($db, $user)
+	public function __construct($db)
 	{
 		global $conf, $langs;
 
 		$this->db = $db;
-		$this->user = $user;
 
 		// List of language codes for status
 
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 74626baed13..8c033353637 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -247,6 +247,7 @@ class RejetPrelevement
 			$sendto = $emuser->getFullName($langs)." <".$emuser->email.">";
 			$from = $this->user->getFullName($langs)." <".$this->user->email.">";
 			$msgishtml = 1;
+			$trackid = 'use'.$emuser->id;
 
 			$arr_file = array();
 			$arr_mime = array();
@@ -258,7 +259,7 @@ class RejetPrelevement
 
 			$message = $langs->trans("InfoRejectMessage", $facref, $socname, $amount, $userinfo);
 
-			$mailfile = new CMailFile($subject, $sendto, $from, $message, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $this->user->email);
+			$mailfile = new CMailFile($subject, $sendto, $from, $message, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $this->user->email, '', $trackid);
 
 			$result = $mailfile->sendfile();
 			if ($result)
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index ec004717946..fb0a5548426 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -53,7 +53,7 @@ $pagenext = $page + 1;
 if (!$sortfield) $sortfield = 'p.ref';
 if (!$sortorder) $sortorder = 'DESC';
 
-$object = new BonPrelevement($db, "");
+$object = new BonPrelevement($db);
 
 
 
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 44be3d1cd01..1cc454a3d4d 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -51,7 +51,7 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$object = new BonPrelevement($db, "");
+$object = new BonPrelevement($db);
 
 
 
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 6e8e8390ae8..18028e2059a 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -50,7 +50,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 
-$object = new BonPrelevement($db, "");
+$object = new BonPrelevement($db);
 
 
 /*
@@ -142,7 +142,7 @@ if ($prev_id > 0 || $ref)
 	/*
 	 * Stats
 	 */
-	$ligne = new LignePrelevement($db, $user);
+	$ligne = new LignePrelevement($db);
 
 	$sql = "SELECT sum(pl.amount), pl.statut";
 	$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 6eef29d1e3e..29bb5c435e3 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -90,7 +90,7 @@ if ($action == 'confirm_rejet')
 
 		if (!$error)
 		{
-			$lipre = new LignePrelevement($db, $user);
+			$lipre = new LignePrelevement($db);
 
 			if ($lipre->fetch($id) == 0)
 
@@ -132,7 +132,7 @@ $h++;
 
 if ($id)
 {
-	$lipre = new LignePrelevement($db, $user);
+	$lipre = new LignePrelevement($db);
 
 	if ($lipre->fetch($id) == 0)
 	{
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index bebb838652d..48f9bcc7c54 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -64,8 +64,8 @@ $search_code = GETPOST('search_code', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
 $statut = GETPOST('statut', 'int');
 
-$bon = new BonPrelevement($db, "");
-$line = new LignePrelevement($db, $user);
+$bon = new BonPrelevement($db);
+$line = new LignePrelevement($db);
 $company = new Societe($db);
 
 $hookmanager->initHooks(array('withdrawalsreceiptslineslist'));
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 928aaba51b1..6d1994b7a4b 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -57,7 +57,7 @@ if ($sortorder == "") $sortorder = "DESC";
 if ($sortfield == "") $sortfield = "p.datec";
 
 $rej = new RejetPrelevement($db, $user);
-$line = new LignePrelevement($db, $user);
+$line = new LignePrelevement($db);
 
 $hookmanager->initHooks(array('withdrawalsreceiptsrejectedlist'));
 
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index c19603df967..c6d1962ff46 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -73,7 +73,7 @@ if ($resql)
 print '<br>';
 print load_fiche_titre($langs->trans("WithdrawStatistics"), '', '');
 
-$ligne = new LignePrelevement($db, $user);
+$ligne = new LignePrelevement($db);
 
 $sql = "SELECT sum(pl.amount), count(pl.amount), pl.statut";
 $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";