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

Removed all now() and sysdate() database sql inline function by a date defined by PHP ($db->idate(mktime())).

Browse Source 
This is to be more portable, to solve problem when database server time differs from PHP server and to prepare for TZ support.
This commit is contained in:
Laurent Destailleur 2008-08-27 18:53:27 +00:00
parent a0f5d2fa8b
commit 4d0a68d48c
68 changed files with 120 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/accountancy/accountancyaccount.class.php
View File

@ -14,16 +14,13 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
* $Source$
*/
/**
\file htdocs/accountancy/accountancyaccount.class.php
\ingroup comptaexpert
\brief Fichier de la classe des comptes comptables
\version $Revision$
\version $Id$
*/
@ -66,7 +63,7 @@ class AccountancyAccount
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."accountingaccount";
$sql.= " (date_creation, fk_user_author, numero,intitule)";
$sql.= " VALUES (now(),".$user->id.",'".$this->numero."','".$this->intitule."')";
$sql.= " VALUES (".$this->db->idate(mktime()).",".$user->id.",'".$this->numero."','".$this->intitule."')";
$resql = $this->db->query($sql);
if ($resql)

7
htdocs/accountancy/accountancysystem.class.php
View File

@ -14,16 +14,13 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
* $Source$
*/
/**
\file htdocs/accountancy/accountancysystem.class.php
\ingroup comptaexpert
\brief Fichier de la classe des plans de comptes comptables
\version $Revision$
\version $Id$
*/
@ -66,7 +63,7 @@ class AccountancySystem
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."accountingsystem";
$sql.= " (date_creation, fk_user_author, numero,intitule)";
$sql.= " VALUES (now(),".$user->id.",'".$this->numero."','".$this->intitule."')";
$sql.= " VALUES (".$this->db->idate(mktime()).",".$user->id.",'".$this->numero."','".$this->intitule."')";
$resql = $this->db->query($sql);
if ($resql)

4
htdocs/adherents/adherent.class.php
View File

@ -1221,7 +1221,7 @@ class Adherent extends CommonObject
}
/**
* \brief Fonction qui verifie que l'utilisateur est valide
* \brief Function that validate a member
* \param user user adherent qui valide
* \return int <0 si ko, >0 si ok
*/
@ -1230,7 +1230,7 @@ class Adherent extends CommonObject
global $langs,$conf;
$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
$sql.= " statut=1, datevalid = now(),";
$sql.= " statut=1, datevalid = ".$this->db->idate(mktime()).",";
$sql.= " fk_user_valid=".$user->id;
$sql.= " WHERE rowid = ".$this->id;

2
htdocs/adherents/cartes/carte.php
View File

@ -75,7 +75,7 @@ $sql.= " t.libelle as type,";
$sql.= " p.libelle as pays";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON d.pays = p.rowid";
$sql.= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1 AND datefin >= now()";
$sql.= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1 AND datefin >= ".$db->idate(mktime());
$sql.= " ORDER BY d.rowid ASC";
$result = $db->query($sql);

2
htdocs/adherents/cartes/etiquette.php
View File

@ -65,7 +65,7 @@ $sql.= " t.libelle as type,";
$sql.= " p.libelle as pays";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON d.pays = p.rowid";
$sql.= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1 AND datefin >= now()";
$sql.= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1 AND datefin >= ".$db->idate(mktime());
$sql.= " ORDER BY d.rowid ASC";
$result = $db->query($sql);

2
htdocs/adherents/cotisation.class.php
View File

@ -71,7 +71,7 @@ class Cotisation extends CommonObject
}
$sql = "INSERT INTO ".MAIN_DB_PREFIX."cotisation (fk_adherent, datec, dateadh, datef, cotisation, note)";
$sql.= " VALUES (".$this->fk_adherent.", now(),";
$sql.= " VALUES (".$this->fk_adherent.", ".$this->db->idate(mktime()).",";
$sql.= " ".$this->db->idate($this->dateh).",";
$sql.= " ".$this->db->idate($this->datef).",";
$sql.= " ".$this->amount.",'".$this->note."')";

2
htdocs/adherents/htpasswd.php
View File

@ -51,7 +51,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d ";
$sql .= " WHERE d.statut = $statut ";
if ($cotis==1)
{
$sql .= " AND datefin > now() ";
$sql .= " AND datefin > ".$db->idate(mktime());
}
$sql.= " ORDER BY $sortfield $sortorder";
//$sql.=$db->plimit($conf->liste_limit, $offset);

2
htdocs/adherents/index.php
View File

@ -106,7 +106,7 @@ if ($result)
# Liste les cotisants a jour
$sql = "SELECT count(*) as somme , d.fk_adherent_type";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d";
$sql.= " WHERE d.statut = 1 AND d.datefin >= now()";
$sql.= " WHERE d.statut = 1 AND d.datefin >= ".$db->idate(mktime());
$sql.= " GROUP BY d.fk_adherent_type";
$result = $db->query($sql);

4
htdocs/adherents/liste.php
View File

@ -94,11 +94,11 @@ if ($_GET["search_email"])
}
if ($filter == 'uptodate')
{
$sql.=" AND datefin >= sysdate()";
$sql.=" AND datefin >= ".$db->idate(mktime());
}
if ($filter == 'outofdate')
{
$sql.=" AND datefin < sysdate()";
$sql.=" AND datefin < ".$db->idate(mktime());
}
// Count total nb of records
$nbtotalofrecords = 0;

2
htdocs/bookmarks/bookmark.class.php
View File

@ -100,7 +100,7 @@ class Bookmark
$sql.= " ,title,favicon";
if ($this->fk_soc) $sql.=",fk_soc";
$sql.= ")";
$sql.= " VALUES ('".$this->fk_user."', sysdate(),";
$sql.= " VALUES ('".$this->fk_user."', ".$this->db->idate(mktime()).",";
$sql.= " '".$this->url."', '".$this->target."',";
$sql.= " '".addslashes($this->title)."', '".$this->favicon."'";
if ($this->fk_soc) $sql.=",".$this->fk_soc;

4
htdocs/boutique/index.php
View File

@ -55,7 +55,7 @@ print '<td align="right">'.$langs->trans("Total").'</td></tr>';
$sql = "SELECT sum(t.value) as value, MONTH(o.date_purchased) as mois";
$sql .= " FROM ".OSC_DB_NAME.".orders_total as t";
$sql .= " JOIN ".OSC_DB_NAME.".orders as o ON o.orders_id = t.orders_id";
$sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(now()) ";
$sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(".$dbosc->idate(mktime()).")";
$sql .= " GROUP BY mois ORDER BY mois";
$result=$dbosc->query($sql);
@ -92,7 +92,7 @@ else
$sql = "SELECT sum(t.value) as value";
$sql .= " FROM ".OSC_DB_NAME.".orders_total as t";
$sql .= " JOIN ".OSC_DB_NAME.".orders as o ON o.orders_id = t.orders_id";
$sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(now()) AND MONTH(o.date_purchased) = MONTH(now())";
$sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(".$dbosc->db->idate(mktime()).") AND MONTH(o.date_purchased) = MONTH(".$this->db->idate(mktime()).")";
if ( $dbosc->query($sql) )
{

2
htdocs/boutique/promotion/promotion.class.php
View File

@ -61,7 +61,7 @@ class Promotion {
$sql = "INSERT INTO ".OSC_DB_NAME.".specials ";
$sql .= " (products_id, specials_new_products_price, specials_date_added, specials_last_modified, expires_date, date_status_change, status) ";
$sql .= " VALUES ($pid, $newprice, now(),NULL,'$date_exp',NULL,1)";
$sql .= " VALUES ($pid, $newprice, ".$this->db->idate(mktime()).", NULL, '$date_exp',NULL,1)";
if ($this->db->query($sql) )
{

2
htdocs/chargesociales.class.php
View File

@ -389,7 +389,7 @@ class PaiementCharge
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiementcharge (fk_charge, datec, datep, amount,";
$sql.= " fk_typepaiement, num_paiement, note, fk_user_creat, fk_bank)";
$sql.= " VALUES ($this->chid, now(), ";
$sql.= " VALUES ($this->chid, ".$this->db->idate(mktime()).", ";
$sql.= $this->db->idate($this->datepaye).", ";
$sql.= price2num($total);
$sql.= ", ".$this->paiementtype.", '".$this->num_paiement."', '".addslashes($this->note)."', ".$user->id.",";

2
htdocs/comm/adresse_livraison.class.php
View File

@ -91,7 +91,7 @@ class AdresseLivraison
if ($result >= 0)
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_adresse_livraison (label, fk_societe, nom, datec, fk_user_creat) ";
$sql .= " VALUES ('".addslashes($this->label)."', '".$socid."', '".addslashes($this->nom)."', now(), '".$user->id."')";
$sql .= " VALUES ('".addslashes($this->label)."', '".$socid."', '".addslashes($this->nom)."', ".$this->db->idate(mktime()).", '".$user->id."')";
$result=$this->db->query($sql);
if ($result)

2
htdocs/comm/index.php
View File

@ -66,7 +66,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'add_bookmark')
{
dolibarr_print_error($db);
}
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_soc, dateb, fk_user) VALUES (".$_GET["socid"].", now(),".$user->id.");";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_soc, dateb, fk_user) VALUES (".$_GET["socid"].", ".$db->idate(mktime()).",".$user->id.");";
if (! $db->query($sql) )
{
dolibarr_print_error($db);

8
htdocs/comm/mailing/mailing.class.php
View File

@ -96,7 +96,7 @@ class Mailing
$sql = "INSERT INTO ".$this->db_table;
$sql .= " (date_creat, fk_user_creat)";
$sql .= " VALUES (now(), ".$user->id.")";
$sql .= " VALUES (".$this->db->idate(mktime()).", ".$user->id.")";
if (! $this->titre)
{
@ -229,8 +229,7 @@ class Mailing
dolibarr_syslog("Mailing::Valid");
$sql = "UPDATE ".MAIN_DB_PREFIX."mailing ";
$sql .= " SET statut = 1, date_valid = now(), fk_user_valid=".$user->id;
$sql .= " SET statut = 1, date_valid = ".$this->db->idate(mktime()).", fk_user_valid=".$user->id;
$sql .= " WHERE rowid = ".$this->id." AND statut = 0 ;";
if ($this->db->query($sql) )
@ -251,8 +250,7 @@ class Mailing
function approve($user)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."mailing ";
$sql .= " SET statut = 2, date_appro = now(), fk_user_appro=".$user->id;
$sql .= " SET statut = 2, date_appro = ".$this->db->idate(mktime()).", fk_user_appro=".$user->id;
$sql .= " WHERE rowid = ".$this->id." AND statut = 1 ;";
if ($this->db->query($sql) )

6
htdocs/commande/commande.class.php
View File

@ -237,7 +237,7 @@ class Commande extends CommonObject
$num = $this->ref;
}
$sql = 'UPDATE '.MAIN_DB_PREFIX."commande SET ref='$num', fk_statut = 1, date_valid=now(), fk_user_valid=$user->id";
$sql = 'UPDATE '.MAIN_DB_PREFIX."commande SET ref='$num', fk_statut = 1, date_valid=".$this->db->idate(mktime()).", fk_user_valid=$user->id";
$sql .= " WHERE rowid = $this->id AND fk_statut = 0";
$resql=$this->db->query($sql);
@ -386,7 +386,7 @@ class Commande extends CommonObject
$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
$sql.= ' SET fk_statut = 3,';
$sql.= ' fk_user_cloture = '.$user->id.',';
$sql.= ' date_cloture = now()';
$sql.= " date_cloture = ".$this->db->idate(mktime());
$sql.= " WHERE rowid = $this->id AND fk_statut > 0 ;";
if ($this->db->query($sql))
@ -513,7 +513,7 @@ class Commande extends CommonObject
$sql.= ' ref, fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note, note_public, ref_client,';
$sql.= ' model_pdf, fk_cond_reglement, fk_mode_reglement, date_livraison, fk_adresse_livraison,';
$sql.= ' remise_absolue, remise_percent)';
$sql.= " VALUES ('".$this->ref."',".$this->socid.', now(), '.$user->id.', '.$this->projetid.',';
$sql.= " VALUES ('".$this->ref."',".$this->socid.", ".$this->db->idate(mktime()).", ".$user->id.', '.$this->projetid.',';
$sql.= ' '.$this->db->idate($this->date_commande).',';
$sql.= ' '.$this->source.', ';
$sql.= " '".addslashes($this->note)."', ";

2
htdocs/companybankaccount.class.php
View File

@ -56,7 +56,7 @@ class CompanyBankAccount
*/
function create()
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, datec) values ($this->socid, now());";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, datec) values ($this->socid, ".$this->db->idate(mktime()).")";
if ($this->db->query($sql))
{
if ($this->db->affected_rows())

6
htdocs/compta/bank/account.class.php
View File

@ -226,7 +226,7 @@ class Account extends CommonObject
$datev = $date;
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (datec, dateo, datev, label, amount, fk_user_author, num_chq, fk_account, fk_type,emetteur,banque)";
$sql.= " VALUES (now(), '".$this->db->idate($date)."', '".$this->db->idate($datev)."', ";
$sql.= " VALUES (".$this->db->idate(mktime()).", '".$this->db->idate($date)."', '".$this->db->idate($datev)."', ";
$sql.= " '".addslashes($label)."', " . price2num($amount).", '".$user->id."', ";
$sql.= " ".($num_chq?"'".$num_chq."'":"null").", ";
$sql.= " '".$this->rowid."', ";
@ -293,7 +293,7 @@ class Account extends CommonObject
$sql.= "rappro, min_allowed, min_desired, ";
$sql.= "comment";
$sql.= ") values (";
$sql.= "now(),'" . addslashes($this->ref) . "', '" . addslashes($this->label) . "', ";
$sql.= "".$this->db->idate(mktime()).",'" . addslashes($this->ref) . "', '" . addslashes($this->label) . "', ";
$sql.= "'".addslashes($this->account_number) . "', '".$this->currency_code."', ";
$sql.= $this->rappro.", ".price2num($this->min_allowed).", ".price2num($this->min_desired).", ";
$sql.= "'".addslashes($this->comment)."'";
@ -309,7 +309,7 @@ class Account extends CommonObject
if ( $this->update() )
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (datec, label, amount, fk_account, datev, dateo, fk_type, rappro) ";
$sql .= " VALUES (now(),'(".$langs->trans("InitialBankBalance").")'," . price2num($this->solde) . ",'$this->id','".$this->db->idate($this->date_solde)."','".$this->db->idate($this->date_solde)."','SOLD',1);";
$sql .= " VALUES (".$this->db->idate(mktime()).",'(".$langs->trans("InitialBankBalance").")'," . price2num($this->solde) . ",'$this->id','".$this->db->idate($this->date_solde)."','".$this->db->idate($this->date_solde)."','SOLD',1);";
$this->db->query($sql);
}
return $this->id;

2
htdocs/compta/charges.php
View File

@ -36,7 +36,7 @@ $langs->load("tax");
* Action ajout en bookmark
*/
if ($action == 'add_bookmark') {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_soc, dateb, fk_user) VALUES ($socid, now(),".$user->id.");";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_soc, dateb, fk_user) VALUES (".$socid.", ".$db->idate(mktime()).",".$user->id.");";
if (! $db->query($sql) ) {
print $db->error();
}

2
htdocs/compta/comptacompte.class.php
View File

@ -69,7 +69,7 @@ class ComptaCompte
if ($row[0] == 0)
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."compta_compte_generaux (date_creation, fk_user_author, numero,intitule)";
$sql .= " VALUES (now(),".$user->id.",'".$this->numero."','".$this->intitule."')";
$sql .= " VALUES (".$this->db->idate(mktime()).",".$user->id.",'".$this->numero."','".$this->intitule."')";
$resql = $this->db->query($sql);
if ( $resql )

2
htdocs/compta/deplacement/deplacement.class.php
View File

@ -76,7 +76,7 @@ class Deplacement extends CommonObject
$sql = "INSERT INTO ".MAIN_DB_PREFIX."deplacement";
$sql.= " (datec, fk_user_author, fk_user, type)";
$sql.= " VALUES (now(), ".$user->id.", ".$this->fk_user.", '".$this->type."')";
$sql.= " VALUES (".$this->db->idate(mktime()).", ".$user->id.", ".$this->fk_user.", '".$this->type."')";
dolibarr_syslog("Deplacement::create sql=".$sql, LOG_DEBUG);
$result = $this->db->query($sql);

2
htdocs/compta/export/modules/compta.export.poivre.class.php
View File

@ -127,7 +127,7 @@ class ComptaExportPoivre extends ComptaExport
$this->ref = $dt . substr("000".$cc, -2);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."export_compta (ref, date_export, fk_user)";
$sql .= " VALUES ('".$this->ref."', now(),".$this->user->id.")";
$sql .= " VALUES ('".$this->ref."', ".$this->db->idate(mktime()).",".$this->user->id.")";
if ($this->db->query($sql))
{

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

@ -101,7 +101,7 @@ class FactureRec extends Facture
$this->brouillon = 1;
$sql = "INSERT INTO ".MAIN_DB_PREFIX."facture_rec (titre, fk_soc, datec, amount, remise, note, fk_user_author,fk_projet, fk_cond_reglement, fk_mode_reglement) ";
$sql.= " VALUES ('$this->titre', '$facsrc->socid', now(), '$facsrc->amount', '$facsrc->remise', '".addslashes($this->note)."','$user->id',";
$sql.= " VALUES ('$this->titre', '$facsrc->socid', ".$this->db->idate(mktime()).", '$facsrc->amount', '$facsrc->remise', '".addslashes($this->note)."','$user->id',";
$sql.= " ".($facsrc->projetid?"'".$facsrc->projetid."'":"null").", ";
$sql.= " '".$facsrc->cond_reglement_id."',";
$sql.= " '".$facsrc->mode_reglement_id."')";

2
htdocs/compta/index.php
View File

@ -64,7 +64,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'add_bookmark')
{
dolibarr_print_error($db);
}
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_soc, dateb, fk_user) VALUES ($socid, now(),".$user->id.");";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_soc, dateb, fk_user) VALUES (".$socid.", ".$db->idate(mktime()).",".$user->id.");";
if (! $db->query($sql) )
{
dolibarr_print_error($db);

2
htdocs/compta/paiement/cheque/remisecheque.class.php
View File

@ -125,7 +125,7 @@ class RemiseCheque extends CommonObject
$this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bordereau_cheque (datec, date_bordereau, fk_user_author, fk_bank_account, amount, number, nbcheque)";
$sql.= " VALUES (now(),now(),".$user->id.",".$account_id.",0,0,0)";
$sql.= " VALUES (".$this->db->idate(mktime()).",".$this->db->idate(mktime()).",".$user->id.",".$account_id.",0,0,0)";
dolibarr_syslog("RemiseCheque::Create sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql);

4
htdocs/compta/prelevement/bon-prelevement.class.php
View File

@ -837,7 +837,7 @@ class BonPrelevement
*/
$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_bons (ref,datec)";
$sql .= " VALUES ('".$ref."',now())";
$sql .= " VALUES ('".$ref."',".$this->db->idate(mktime()).")";
$resql = $this->db->query($sql);
@ -921,7 +921,7 @@ class BonPrelevement
*/
$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande";
$sql .= " SET traite = 1";
$sql .= ", date_traite=now()";
$sql .= ", date_traite=".$this->db->idate(mktime());
$sql .= ", fk_prelevement_bons = ".$prev_id;
$sql .= " WHERE rowid=".$fac[1];

2
htdocs/compta/prelevement/rejet-prelevement.class.php
View File

@ -80,7 +80,7 @@ class RejetPrelevement
$sql .= " , motif , fk_user_creation, date_creation, afacturer)";
$sql .= " VALUES (".$id;
$sql .= " ,'".$this->db->idate($date_rejet)."'";
$sql .= " ,".$motif.",". $user->id.", now(),".$facturation.");";
$sql .= " ,".$motif.",". $user->id.", ".$this->db->idate(mktime()).",".$facturation.");";
$result=$this->db->query($sql);

2
htdocs/contact.class.php
View File

@ -94,7 +94,7 @@ class Contact extends CommonObject
if (! $this->priv) $this->priv = 0;
$sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople (datec, fk_soc, name, fk_user_creat, priv)";
$sql.= " VALUES (now(),";
$sql.= " VALUES (".$this->db->idate(mktime()).",";
if ($this->socid > 0) $sql.= " ".$this->socid.",";
else $sql.= "null,";
$sql.= "'".addslashes($this->name)."',";

6
htdocs/contrat/contrat.class.php
View File

@ -178,7 +178,7 @@ class Contrat extends CommonObject
function cloture($user,$langs='',$conf='')
{
$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET statut = 2";
$sql .= " , date_cloture = now(), fk_user_cloture = ".$user->id;
$sql .= " , date_cloture = ".$this->db->idate(mktime()).", fk_user_cloture = ".$user->id;
$sql .= " WHERE rowid = ".$this->id . " AND statut = 1";
$resql = $this->db->query($sql) ;
@ -243,7 +243,7 @@ class Contrat extends CommonObject
function annule($user,$langs='',$conf='')
{
$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET statut = 0";
$sql .= " , date_cloture = now(), fk_user_cloture = ".$user->id;
$sql .= " , date_cloture = ".$this->db->idate(mktime()).", fk_user_cloture = ".$user->id;
$sql .= " WHERE rowid = ".$this->id . " AND statut = 1";
$resql = $this->db->query($sql) ;
@ -493,7 +493,7 @@ class Contrat extends CommonObject
$sql = "INSERT INTO ".MAIN_DB_PREFIX."contrat (datec, fk_soc, fk_user_author, date_contrat";
$sql.= ", fk_commercial_signature, fk_commercial_suivi";
$sql.= " , ref)";
$sql.= " VALUES (now(),".$this->socid.",".$user->id;
$sql.= " VALUES (".$this->db->idate(mktime()).",".$this->socid.",".$user->id;
$sql.= ",".$this->db->idate($this->date_contrat);
$sql.= ",".($this->commercial_signature_id>0?$this->commercial_signature_id:"NULL");
$sql.= ",".($this->commercial_suivi_id>0?$this->commercial_suivi_id:"NULL");

4
htdocs/contrat/index.php
View File

@ -163,8 +163,8 @@ print '</td><td width="70%" valign="top" class="notopnoleftnoright">';
$max=5;
$sql = 'SELECT ';
$sql.= ' sum('.$db->ifsql("cd.statut=0",1,0).') as nb_initial,';
$sql.= ' sum('.$db->ifsql("cd.statut=4 AND cd.date_fin_validite > sysdate()",1,0).') as nb_running,';
$sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= sysdate())",1,0).') as nb_late,';
$sql.= ' sum('.$db->ifsql("cd.statut=4 AND cd.date_fin_validite > ".$db->idate(mktime()),1,0).') as nb_running,';
$sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= ".$db->idate(mktime()).")",1,0).') as nb_late,';
$sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';
$sql.= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut, s.nom, s.rowid as socid";
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";

4
htdocs/contrat/liste.php
View File

@ -64,8 +64,8 @@ llxHeader();
$sql = 'SELECT';
$sql.= ' sum('.$db->ifsql("cd.statut=0",1,0).') as nb_initial,';
$sql.= ' sum('.$db->ifsql("cd.statut=4 AND cd.date_fin_validite > sysdate()",1,0).') as nb_running,';
$sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= sysdate())",1,0).') as nb_late,';
$sql.= ' sum('.$db->ifsql("cd.statut=4 AND cd.date_fin_validite > ".$db->idate(mktime()),1,0).') as nb_running,';
$sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= ".$db->idate(mktime()).")",1,0).') as nb_late,';
$sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';
$sql.= " c.rowid as cid, c.ref, c.datec, c.date_contrat, c.statut, s.nom, s.rowid as socid";
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";

2
htdocs/contrat/services.php
View File

@ -82,7 +82,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc
if ($mode == "0") $sql.= " AND cd.statut = 0";
if ($mode == "4") $sql.= " AND cd.statut = 4";
if ($mode == "5") $sql.= " AND cd.statut = 5";
if ($filter == "expired") $sql.= " AND date_fin_validite < sysdate()";
if ($filter == "expired") $sql.= " AND date_fin_validite < ".$this->db->idate(mktime());
if ($search_nom) $sql.= " AND s.nom like '%".addslashes($search_nom)."%'";
if ($search_contract) $sql.= " AND c.rowid = '".addslashes($search_contract)."'";
if ($search_service) $sql.= " AND (p.ref like '%".addslashes($search_service)."%' OR p.description like '%".addslashes($search_service)."%')";

2
htdocs/discount.class.php
View File

@ -144,7 +144,7 @@ class DiscountAbsolute
$sql.= " amount_ht, amount_tva, amount_ttc, tva_tx,";
$sql.= " fk_facture_source";
$sql.= ")";
$sql.= " VALUES (now(), ".$this->fk_soc.", ".$user->id.", '".addslashes($this->desc)."',";
$sql.= " VALUES (".$this->db->idate(mktime()).", ".$this->fk_soc.", ".$user->id.", '".addslashes($this->desc)."',";
$sql.= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.",";
$sql.= " ".($this->fk_facture_source?"'".$this->fk_facture_source."'":"null");
$sql.= ")";

2
htdocs/docs/document.class.php
View File

@ -83,7 +83,7 @@ class Document
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document";
$sql.= " (name,file_name,file_extension,date_generation) VALUES";
$sql.= " ('".$obj->name."','".$obj->file."','".$obj->extension."',now());";
$sql.= " ('".$obj->name."','".$obj->file."','".$obj->extension."',".$this->db->idate(mktime()).")";
$resql=$this->db->query($sql);

2
htdocs/don.class.php
View File

@ -295,7 +295,7 @@ class Don
$sql .= " fk_don_projet,";
}
$sql .= " note, fk_user_author, datedon, email)";
$sql .= " VALUES (now(),".price2num($this->amount).", $this->modepaiementid,'$this->prenom','$this->nom','$this->societe','$this->adresse', '$this->cp','$this->ville','$this->pays',$this->public, ";
$sql .= " VALUES (".$this->db->idate(mktime()).",".price2num($this->amount).", $this->modepaiementid,'$this->prenom','$this->nom','$this->societe','$this->adresse', '$this->cp','$this->ville','$this->pays',$this->public, ";
if ($this->projetid)
{
$sql .= " $this->projetid,";

4
htdocs/expedition/expedition.class.php
View File

@ -90,7 +90,7 @@ class Expedition extends CommonObject
$sql = "INSERT INTO ".MAIN_DB_PREFIX."expedition (ref, date_creation, fk_user_author, date_expedition";
$sql.= ", fk_soc";
$sql.= ")";
$sql.= " VALUES ('(PROV)', now(), $user->id, ".$this->db->idate($this->date_expedition);
$sql.= " VALUES ('(PROV)', ".$this->db->idate(mktime()).", $user->id, ".$this->db->idate($this->date_expedition);
$sql.= ", ".$this->socid;
$sql.= ")";
@ -328,7 +328,7 @@ class Expedition extends CommonObject
}
$sql = "UPDATE ".MAIN_DB_PREFIX."expedition";
$sql.= " SET ref='".$this->ref."', fk_statut = 1, date_valid = now(), fk_user_valid = ".$user->id;
$sql.= " SET ref='".$this->ref."', fk_statut = 1, date_valid = ".$this->db->idate(mktime()).", fk_user_valid = ".$user->id;
$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
dolibarr_syslog("Expedition::valid update expedition sql=".$sql);

4
htdocs/facture.class.php
View File

@ -198,7 +198,7 @@ class Facture extends CommonObject
$sql.= ' fk_facture_source, fk_user_author, fk_projet,';
$sql.= ' fk_cond_reglement, fk_mode_reglement, date_lim_reglement, model_pdf)';
$sql.= ' VALUES (';
$sql.= "'(PROV)', '".$this->type."', '".$socid."', now(), '".$totalht."'";
$sql.= "'(PROV)', '".$this->type."', '".$socid."', ".$this->db->idate(mktime()).", '".$totalht."'";
$sql.= ",".($this->remise_absolue>0?$this->remise_absolue:'NULL');
$sql.= ",".($this->remise_percent>0?$this->remise_percent:'NULL');
$sql.= ",".$this->db->idate($this->date);
@ -2259,7 +2259,7 @@ class Facture extends CommonObject
$sql .= ' (fk_facture, amount, date_demande, fk_user_demande, code_banque, code_guichet, number, cle_rib)';
$sql .= ' VALUES ('.$this->id;
$sql .= ",'".price2num($this->total_ttc)."'";
$sql .= ',now(),'.$user->id;
$sql .= ",".$this->db->idate(mktime()).",".$user->id;
$sql .= ",'".$soc->bank_account->code_banque."'";
$sql .= ",'".$soc->bank_account->code_guichet."'";
$sql .= ",'".$soc->bank_account->number."'";

4
htdocs/fichinter/fichinter.class.php
View File

@ -107,7 +107,7 @@ class Fichinter extends CommonObject
$sql.= ") ";
$sql.= " VALUES (".$this->socid.",";
$sql.= " ".$this->db->idate($this->date).",";
$sql.= " now(), '".$this->ref."', ".$this->author;
$sql.= " ".$this->db->idate(mktime()).", '".$this->ref."', ".$this->author;
$sql.= ", '".addslashes($this->description)."', '".$this->modelpdf."'";
if ($this->projet_id) $sql .= ", ".$this->projet_id;
$sql.= ")";
@ -222,7 +222,7 @@ class Fichinter extends CommonObject
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
$sql.= " SET fk_statut = 1, date_valid=now(), fk_user_valid=".$user->id;
$sql.= " SET fk_statut = 1, date_valid=".$this->db->idate(mktime()).", fk_user_valid=".$user->id;
$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
dolibarr_syslog("Fichinter::valid sql=".$sql);

2
htdocs/fourn/facture/paiementfourn.class.php
View File

@ -141,7 +141,7 @@ class PaiementFourn
{
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiementfourn (';
$sql.= 'datec, datep, amount, fk_paiement, num_paiement, note, fk_user_author, fk_bank)';
$sql.= ' VALUES (now(),';
$sql.= ' VALUES (".$this->db->idate(mktime()).",';
$sql.= " ".$this->db->idate($this->datepaye).", '".$this->total."', ".$this->paiementid.", '".$this->num_paiement."', '".addslashes($this->note)."', ".$user->id.", 0)";
dolibarr_syslog("PaiementFourn::create sql=".$sql);

6
htdocs/fourn/fournisseur.commande.class.php
View File

@ -232,7 +232,7 @@ class CommandeFournisseur extends Commande
$num = $this->ref;
}
$sql = 'UPDATE '.MAIN_DB_PREFIX."commande_fournisseur SET ref='$num', fk_statut = 1, date_valid=now(), fk_user_valid=$user->id";
$sql = 'UPDATE '.MAIN_DB_PREFIX."commande_fournisseur SET ref='$num', fk_statut = 1, date_valid=".$this->db->idate(mktime()).", fk_user_valid=$user->id";
$sql .= " WHERE rowid = $this->id AND fk_statut = 0";
$resql=$this->db->query($sql);
@ -622,7 +622,7 @@ class CommandeFournisseur extends Commande
$this->brouillon = 1;
$sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseur (ref, fk_soc, date_creation, fk_user_author, fk_statut, source, model_pdf) ";
$sql .= " VALUES ('',".$this->socid.", now(), ".$user->id.",0,0,'".$conf->global->COMMANDE_SUPPLIER_ADDON_PDF."')";
$sql .= " VALUES ('',".$this->socid.", ".$this->db->idate(mktime()).", ".$user->id.",0,0,'".$conf->global->COMMANDE_SUPPLIER_ADDON_PDF."')";
if ( $this->db->query($sql) )
{
@ -837,7 +837,7 @@ class CommandeFournisseur extends Commande
$sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseur_dispatch ";
$sql.= " (fk_commande,fk_product, qty, fk_entrepot, fk_user, datec) VALUES ";
$sql.= " ('".$this->id."','".$product."','".$qty."','".$entrepot."','".$user->id."',now() );";
$sql.= " ('".$this->id."','".$product."','".$qty."','".$entrepot."','".$user->id."',".$this->db->idate(mktime()).")";
$resql = $this->db->query($sql);
if (! $resql)

2
htdocs/fourn/fournisseur.facture.class.php
View File

@ -117,7 +117,7 @@ class FactureFournisseur extends Facture
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn (facnumber, libelle, fk_soc, datec, datef, note, fk_user_author, date_lim_reglement) ';
$sql .= " VALUES ('".addslashes($number)."','".addslashes($this->libelle)."',";
$sql .= $this->socid.", now(),'".$this->db->idate($this->date)."','".addslashes($this->note)."', ".$user->id.",'".$this->db->idate($this->date_echeance)."');";
$sql .= $this->socid.", ".$this->db->idate(mktime()).",'".$this->db->idate($this->date)."','".addslashes($this->note)."', ".$user->id.",'".$this->db->idate($this->date_echeance)."');";
$resql=$this->db->query($sql);
if ($resql)
{

4
htdocs/fourn/fournisseur.product.class.php
View File

@ -180,7 +180,7 @@ class ProductFournisseur extends Product
// Ajoute prix courant du fournisseur pour cette quantité
$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price";
$sql.= " SET datec = now()";
$sql.= " SET datec = ".$this->db->idate(mktime());
$sql.= " ,fk_product_fournisseur = ".$this->product_fourn_id;
$sql.= " ,fk_user = ".$user->id;
$sql.= " ,price = ".price2num($buyprice);
@ -197,7 +197,7 @@ class ProductFournisseur extends Product
{
// Ajoute modif dans table log
$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_log ";
$sql .= " SET datec = now()";
$sql .= " SET datec = ".$this->db->idate(mktime());
$sql .= " ,fk_product_fournisseur = ".$this->product_fourn_id;
$sql .= " ,fk_user = ".$user->id;
$sql .= " ,price = ".price2num($buyprice);

2
htdocs/fourn/stats.php
View File

@ -85,7 +85,7 @@ if ($search_ville)
{
$sql .= " AND s.ville LIKE '%".$search_ville."%'";
}
$sql .= " AND ca.year > (date_format(now(),'%Y') - 5)";
$sql .= " AND ca.year > (date_format(".$db->idate(mktime()).",'%Y') - 5)";
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);

2
htdocs/includes/modules/DolibarrModules.class.php
View File

@ -355,7 +355,7 @@ class DolibarrModules
$sql ="INSERT INTO ".MAIN_DB_PREFIX."dolibarr_modules (numero,active,active_date,active_version)";
$sql .= " VALUES (";
$sql .= $this->numero.",1,now(),'".$this->version."')";
$sql .= $this->numero.",1,".$this->db->idate(mktime()).",'".$this->version."')";
$this->db->query($sql);

4
htdocs/includes/modules/mailings/fraise.modules.php
View File

@ -130,8 +130,8 @@ class mailing_fraise extends MailingTargets
foreach($filtersarray as $key)
{
if ($key == '-1') $sql.= " AND a.statut=-1";
if ($key == '1a') $sql.= " AND a.statut=1 AND datefin >= sysdate()";
if ($key == '1b') $sql.= " AND a.statut=1 AND datefin < sysdate()";
if ($key == '1a') $sql.= " AND a.statut=1 AND datefin >= ".$this->db->idate(mktime());
if ($key == '1b') $sql.= " AND a.statut=1 AND datefin < ".$this->db->idate(mktime());
if ($key == '0') $sql.= " AND a.statut=0";
}
$sql.= " ORDER BY a.email";

1
htdocs/index.php
View File

@ -42,7 +42,6 @@ $infobox=new InfoBox($db);
llxHeader();
print_fiche_titre($langs->trans("HomeArea"));
if (! empty($conf->global->MAIN_MOTD))

2
htdocs/lib/databases/mysql.lib.php
View File

@ -548,7 +548,7 @@ class DoliDb
/**
\brief Formatage (par PHP) d'une date vers format texte pour insertion dans champ date.
Fonction à utiliser pour générer les INSERT.
Fonction à utiliser pour générer les INSERT ou UPDATE.
\param param Date TMS à convertir
\return date Date au format texte YYYYMMDDHHMMSS.
*/

4
htdocs/livraison/livraison.class.php
View File

@ -94,7 +94,7 @@ class Livraison extends CommonObject
$sql.= " fk_adresse_livraison";
if ($this->expedition_id) $sql.= ", fk_expedition";
$sql.= ")";
$sql.= " VALUES ('(PROV)', ".$this->socid.", now(), $user->id,";
$sql.= " VALUES ('(PROV)', ".$this->socid.", ".$this->db->idate(mktime()).", $user->id,";
$sql.= " ".($this->adresse_livraison_id > 0?$this->adresse_livraison_id:"null");
if ($this->expedition_id) $sql.= ", $this->expedition_id";
$sql.= ")";
@ -369,7 +369,7 @@ class Livraison extends CommonObject
}
$sql = "UPDATE ".MAIN_DB_PREFIX."livraison ";
$sql.= " SET ref='".addslashes($this->ref)."', fk_statut = 1, date_valid = now(), fk_user_valid = ".$user->id;
$sql.= " SET ref='".addslashes($this->ref)."', fk_statut = 1, date_valid = ".$this->db->idate(mktime()).", fk_user_valid = ".$user->id;
$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
$resql=$this->db->query($sql);
if ($resql)

2
htdocs/lolix/cv/cv.class.php
View File

@ -75,7 +75,7 @@ class Cv {
$result = $this->db->query($sql);
$sql = "INSERT INTO lolixfr.res_statutlog (datel, fk_cand, fk_statut,author)";
$sql .= " VALUES (now(),$this->id,0,'bots')";
$sql .= " VALUES (".$this->db->idate(mktime()).",$this->id,0,'bots')";
$result = $this->db->query($sql);
$header = "From: webmaster@lolix.org\r\nReply-To: webmaster@lolix.org\r\nX-Mailer: Dolibarr";

2
htdocs/notify.class.php
View File

@ -157,7 +157,7 @@ class Notify
$sendto = htmlentities($sendto);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_contact, objet_type, objet_id)";
$sql .= " VALUES (now(), ".$action." ,".$obj->rowid." , '".$objet_type."', ".$objet_id.");";
$sql.= " VALUES (".$this->db->idate(mktime()).", ".$action." ,".$obj->rowid." , '".$objet_type."', ".$objet_id.");";
if (! $this->db->query($sql) )
{
dolibarr_print_error($db);

2
htdocs/oscommerce_ws/clients/osc_customer.class.php
View File

@ -153,7 +153,7 @@ class Osc_customer
// $this->db->rollback();
// return -1;
}
$sql = "INSERT INTO ".MAIN_DB_PREFIX."osc_customer VALUES (".$oscid." , now() , ".$socid.") ;";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."osc_customer VALUES (".$oscid.", ".$this->db->idate(mktime()).", ".$socid.") ;";
$result=$this->db->query($sql);
if ($result)

2
htdocs/oscommerce_ws/commandes/osc_order.class.php
View File

@ -212,7 +212,7 @@ class Osc_order
// $this->db->rollback();
// return -1;
}
$sql = "INSERT INTO ".MAIN_DB_PREFIX."osc_order VALUES (".$osc_orderid." , now() , ".$doli_orderid.") ;";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."osc_order VALUES (".$osc_orderid.", ".$this->db->idate(mktime()).", ".$doli_orderid.") ;";
$result=$this->db->query($sql);
if ($result)

2
htdocs/oscommerce_ws/produits/osc_product.class.php
View File

@ -170,7 +170,7 @@ class Osc_product
// $this->db->rollback();
// return -1;
}
$sql = "INSERT INTO ".MAIN_DB_PREFIX."osc_product VALUES (".$oscid." , now() , ".$prodid.") ;";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."osc_product VALUES (".$oscid.", ".$this->db->idate(mktime()).", ".$prodid.") ;";
$result=$this->db->query($sql);
if ($result)

2
htdocs/paiement.class.php
View File

@ -141,7 +141,7 @@ class Paiement
if ($this->total <> 0) // On accepte les montants négatifs pour les rejets de prélèvement
{
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiement (datec, datep, amount, fk_paiement, num_paiement, note, fk_user_creat)';
$sql.= ' VALUES (now(), '.$this->db->idate($this->datepaye).', \''.$this->total.'\', '.$this->paiementid.', \''.$this->num_paiement.'\', \''.addslashes($this->note).'\', '.$user->id.')';
$sql.= ' VALUES ('.$this->db->idate(mktime()).', '.$this->db->idate($this->datepaye).', \''.$this->total.'\', '.$this->paiementid.', \''.$this->num_paiement.'\', \''.addslashes($this->note).'\', '.$user->id.')';
$resql = $this->db->query($sql);
dolibarr_syslog("Paiement::Create insert paiement sql=".$sql);

20
htdocs/product.class.php
View File

@ -205,7 +205,7 @@ class Product extends CommonObject
if ($this->ref) $sql.= "ref, ";
$sql.= "label, ";
$sql.= "fk_user_author, fk_product_type, price, price_ttc, price_base_type, canvas)";
$sql.= " VALUES (now(), ";
$sql.= " VALUES (".$this->db->idate(mktime()).", ";
if ($this->ref) $sql.= "'".$this->ref."',";
$sql.= " ".($this->libelle?"'".addslashes($this->libelle)."'":"null").",";
$sql.= $user->id.",";
@ -644,8 +644,8 @@ class Product extends CommonObject
// On ajoute nouveau tarif
$sql_multiprix = "INSERT INTO ".MAIN_DB_PREFIX."product_price(date_price,fk_product,fk_user_author,price_level,price,price_ttc,price_base_type,tva_tx) ";
$sql_multiprix .= " VALUES(now(),".$this->id.",".$user->id.",".$i.",".price2num($multiprice_ht).",'".price2num($multiprice_ttc)."','".$this->multiprices_base_type["$i"]."',".$this->tva_tx;
$sql_multiprix .= ")";
$sql_multiprix.= " VALUES(".$this->db->idate(mktime()).",".$this->id.",".$user->id.",".$i.",".price2num($multiprice_ht).",'".price2num($multiprice_ttc)."','".$this->multiprices_base_type["$i"]."',".$this->tva_tx;
$sql_multiprix.= ")";
if (! $this->db->query($sql_multiprix) )
{
$queryError = true;
@ -656,7 +656,7 @@ class Product extends CommonObject
{
// On ajoute nouveau tarif
$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(date_price,fk_product,fk_user_author,price,price_ttc,price_base_type,envente,tva_tx) ";
$sql .= " VALUES(now(),".$this->id.",".$user->id.",".$this->price.",".$this->price_ttc.",'".$this->price_base_type."',".$this->status.",".$this->tva_tx;
$sql .= " VALUES(".$this->db->idate(mktime()).",".$this->id.",".$user->id.",".$this->price.",".$this->price_ttc.",'".$this->price_base_type."',".$this->status.",".$this->tva_tx;
$sql .= ")";
if (! $this->db->query($sql) )
$queryError = true;
@ -673,7 +673,7 @@ class Product extends CommonObject
{
// On ajoute nouveau tarif
$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(date_price,fk_product,fk_user_author,price,price_ttc,price_base_type,envente,tva_tx) ";
$sql .= " VALUES(now(),".$this->id.",".$user->id.",".$this->price.",".$this->price_ttc.",'".$this->price_base_type."',".$this->status.",".$this->tva_tx;
$sql .= " VALUES(".$this->db->idate(mktime()).",".$this->id.",".$user->id.",".$this->price.",".$this->price_ttc.",'".$this->price_base_type."',".$this->status.",".$this->tva_tx;
$sql .= ")";
dolibarr_syslog("Product::_log_price sql=".$sql);
@ -1590,7 +1590,7 @@ class Product extends CommonObject
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur ";
$sql .= " (datec, fk_product, fk_soc, ref_fourn, fk_user_author)";
$sql .= " VALUES (now(), ".$this->id.", ".$id_fourn.", '".$ref_fourn."', ".$user->id.")";
$sql .= " VALUES (".$this->db->idate(mktime()).", ".$this->id.", ".$id_fourn.", '".$ref_fourn."', ".$user->id.")";
if ($this->db->query($sql))
{
@ -1740,7 +1740,7 @@ class Product extends CommonObject
// les fournisseurs
$sql = "insert ".MAIN_DB_PREFIX."product_fournisseur ("
. " datec, fk_product, fk_soc, ref_fourn, fk_user_author )"
. " select now(), ".$toId.", fk_soc, ref_fourn, fk_user_author"
. " select '".$this->db->idate(mktime())."', ".$toId.", fk_soc, ref_fourn, fk_user_author"
. " from ".MAIN_DB_PREFIX."product_fournisseur "
. " where fk_product = ".$fromId .";" ;
if ( ! $db->query($sql ) ) {
@ -1750,7 +1750,7 @@ class Product extends CommonObject
// les prix de fournisseurs.
$sql = "insert ".MAIN_DB_PREFIX."product_fournisseur_price ("
. " datec, fk_product, fk_soc, price, quantity, fk_user )"
. " select now(), ".$toId. ", fk_soc, price, quantity, fk_user"
. " select '".$this->db->idate(mktime())."', ".$toId. ", fk_soc, price, quantity, fk_user"
. " from ".MAIN_DB_PREFIX."product_fournisseur_price"
. " where fk_product = ".$fromId.";";
if ( ! $db->query($sql ) ) {
@ -2017,7 +2017,7 @@ class Product extends CommonObject
if ($resql)
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."stock_mouvement (datem, fk_product, fk_entrepot, value, type_mouvement, fk_user_author)";
$sql .= " VALUES (now(), ".$this->id.", ".$id_entrepot.", ".$nbpiece.", 0, ".$user->id.")";
$sql .= " VALUES (".$this->db->idate(mktime()).", ".$this->id.", ".$id_entrepot.", ".$nbpiece.", 0, ".$user->id.")";
dolibarr_syslog("Product::create_stock sql=".$sql);
$resql=$this->db->query($sql);
@ -2102,7 +2102,7 @@ class Product extends CommonObject
if ($resql)
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."stock_mouvement (datem, fk_product, fk_entrepot, value, type_mouvement, fk_user_author)";
$sql .= " VALUES (now(), ".$this->id.", ".$id_entrepot.", ".$op[$mouvement].", 0, ".$user->id.")";
$sql .= " VALUES (".$this->db->idate(mktime()).", ".$this->id.", ".$id_entrepot.", ".$op[$mouvement].", 0, ".$user->id.")";
dolibarr_syslog("Product::ajust_stock sql=".$sql);
$resql=$this->db->query($sql);

2
htdocs/product/stock/entrepot.class.php
View File

@ -77,7 +77,7 @@ class Entrepot
$this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."entrepot (datec, fk_user_author, label)";
$sql .= " VALUES (now(),".$user->id.",'".addslashes($this->libelle)."')";
$sql .= " VALUES (".$this->db->idate(mktime()).",".$user->id.",'".addslashes($this->libelle)."')";
dolibarr_syslog("Entrepot::create sql=".$sql);
$result=$this->db->query($sql);

18
htdocs/product/stock/mouvementstock.class.php
View File

@ -54,7 +54,7 @@ class MouvementStock
$sql = "INSERT INTO ".MAIN_DB_PREFIX."stock_mouvement";
$sql.= " (datem, fk_product, fk_entrepot, value, type_mouvement, fk_user_author, price)";
$sql.= " VALUES (now(), ".$fk_product.", ".$entrepot_id.", ".$qty.", ".$type.", ".$user->id;
$sql.= " VALUES (".$this->db->idate(mktime()).", ".$fk_product.", ".$entrepot_id.", ".$qty.", ".$type.", ".$user->id;
$sql.= ",'".price2num($price)."')";
if ($resql = $this->db->query($sql))
@ -230,7 +230,7 @@ class MouvementStock
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."entrepot_valorisation";
$sql.= " (date_calcul, fk_entrepot, valo_pmp)";
$sql.= " VALUES (now(), $entrepot_id";
$sql.= " VALUES (".$this->db->idate(mktime()).", ".$entrepot_id;
$sql.= ",'".ereg_replace(",",".",$new_value)."');";
}
@ -351,13 +351,13 @@ class MouvementStock
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."stock_valorisation";
$sql.= " (date_valo, fk_product, fk_stock_mouvement, qty_ope, price_ope, valo_ope, price_pmp, qty_stock, valo_pmp)";
$sql.= " VALUES (now(), $fk_product, $mvid";
$sql.= ",'".ereg_replace(",",".",$qty)."'";
$sql.= ",'".ereg_replace(",",".",$price)."'";
$sql.= ",'".ereg_replace(",",".",$value_ope)."'";
$sql.= ",'".ereg_replace(",",".",$new_pmp)."'";
$sql.= ",'".ereg_replace(",",".",$new_stock_qty)."'";
$sql.= ",'".ereg_replace(",",".",$new_stock_value_pmp)."');";
$sql.= " VALUES (".$this->db->idate(mktime()).", $fk_product, $mvid";
$sql.= ",'".price2num($qty)."'";
$sql.= ",'".price2num($price)."'";
$sql.= ",'".price2num($value_ope)."'";
$sql.= ",'".price2num($new_pmp)."'";
$sql.= ",'".price2num($new_stock_qty)."'";
$sql.= ",'".price2num($new_stock_value_pmp)."')";
if ($this->db->query($sql))
{

2
htdocs/project.class.php
View File

@ -69,7 +69,7 @@ class Project extends CommonObject
$sql.= " VALUES ('".addslashes($this->ref)."', '".addslashes($this->title)."',";
$sql.= " ".($this->socid > 0?$this->socid:"null").",";
$sql.= " ".$user->id.",";
$sql.= " ".$this->user_resp_id.", now(), 0)";
$sql.= " ".$this->user_resp_id.", ".$this->db->idate(mktime()).", 0)";
dolibarr_syslog("Project::create sql=".$sql);
$resql=$this->db->query($sql);

6
htdocs/propal.class.php
View File

@ -530,7 +530,7 @@ class Propal extends CommonObject
$sql.= ") ";
$sql.= " VALUES (".$this->socid.", 0,";
$sql.= " ".$this->remise.", ".($this->remise_percent?$this->remise_percent:'null').", ".($this->remise_absolue?$this->remise_absolue:'null').",";
$sql.= " 0,0,".$this->db->idate($this->datep).", now(), '".$this->ref."', ";
$sql.= " 0,0,".$this->db->idate($this->datep).", ".$this->db->idate(mktime()).", '".$this->ref."', ";
$sql.= ($user->id > 0 ? "'".$user->id."'":"null").",";
$sql.= "'".addslashes($this->note)."',";
$sql.= "'".addslashes($this->note_public)."',";
@ -829,7 +829,7 @@ class Propal extends CommonObject
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
$sql.= " SET fk_statut = 1, date_valid=now(), fk_user_valid=".$user->id;
$sql.= " SET fk_statut = 1, date_valid=".$this->db->idate(mktime()).", fk_user_valid=".$user->id;
$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
if ($this->db->query($sql))
@ -1051,7 +1051,7 @@ class Propal extends CommonObject
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
$sql.= " SET fk_statut = ".$statut.", note = '".addslashes($note)."', date_cloture=now(), fk_user_cloture=".$user->id;
$sql.= " SET fk_statut = ".$statut.", note = '".addslashes($note)."', date_cloture=".$this->db->idate(mktime()).", fk_user_cloture=".$user->id;
$sql.= " WHERE rowid = ".$this->id;
$resql=$this->db->query($sql);

6
htdocs/service.class.php
View File

@ -64,7 +64,7 @@ class Service
function create($user) {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."service (datec, fk_user_author) VALUES (now(), ".$user->id.")";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."service (datec, fk_user_author) VALUES (".$this->db->idate(mktime()).", ".$user->id.")";
if ($this->db->query($sql) ) {
$id = $this->db->last_insert_id(MAIN_DB_PREFIX."service");
@ -114,7 +114,7 @@ class Service
if ($datedeb) {
$sql .= " SET debut_comm = '$datedeb'";
} else {
$sql .= " SET debut_comm = now()";
$sql .= " SET debut_comm = ".$this->db->idate(mktime());
}
$sql .= ",fk_user_modif = " . $user->id ;
@ -139,7 +139,7 @@ class Service
if ($datefin) {
$sql .= " SET fin_comm = '$datefin'";
} else {
$sql .= " SET fin_comm = now()";
$sql .= " SET fin_comm = ".$this->db->idate(mktime());
}
$sql .= ",fk_user_modif = " . $user->id ;

8
htdocs/societe.class.php
View File

@ -151,7 +151,7 @@ class Societe extends CommonObject
if ($result >= 0)
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, datec, datea, fk_user_creat)";
$sql.= " VALUES ('".addslashes($this->nom)."', now(), now(),";
$sql.= " VALUES ('".addslashes($this->nom)."', ".$this->db->idate(mktime()).", ".$this->db->idate(mktime()).",";
$sql.= " ".($user->id > 0 ? "'".$user->id."'":"null");
$sql.= ")";
@ -356,7 +356,7 @@ class Societe extends CommonObject
$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
$sql.= " SET nom = '" . addslashes($this->nom) ."'"; // Champ obligatoire
$sql.= ",datea = now()";
$sql.= ",datea = ".$this->db->idate(mktime());
$sql.= ",address = '" . addslashes($this->adresse) ."'";
$sql.= ",cp = ".($this->cp?"'".$this->cp."'":"null");
@ -933,7 +933,7 @@ class Societe extends CommonObject
// Ecrit trace dans historique des remises
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise ";
$sql.= " (datec, fk_soc, remise_client, note, fk_user_author)";
$sql.= " VALUES (now(), ".$this->id.", '".$remise."',";
$sql.= " VALUES (".$this->db->idate(mktime()).", ".$this->id.", '".$remise."',";
$sql.= " '".addslashes($note)."',";
$sql.= " ".$user->id;
$sql.= ")";
@ -1066,7 +1066,7 @@ class Societe extends CommonObject
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_prices ";
$sql .= " ( datec, fk_soc, price_level, fk_user_author )";
$sql .= " VALUES (now(),".$this->id.",'".$price_level."',".$user->id.")";
$sql .= " VALUES (".$this->db->idate(mktime()).",".$this->id.",'".$price_level."',".$user->id.")";
if (! $this->db->query($sql) )
{

2
htdocs/societe/notify/fiche.php
View File

@ -58,7 +58,7 @@ if ($_POST["action"] == 'add')
if ($db->query($sql))
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
$sql .= " VALUES (now(),$socid,".$_POST["contactid"].",".$_POST["actionid"].")";
$sql .= " VALUES (".$db->idate(mktime()).",".$socid.",".$_POST["contactid"].",".$_POST["actionid"].")";
if ($db->query($sql))
{

3
htdocs/user.class.php
View File

@ -717,7 +717,8 @@ class User extends CommonObject
}
else
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec,login,ldap_sid) VALUES(now(),'".addslashes($this->login)."','".$this->ldap_sid."')";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec,login,ldap_sid)";
$sql.= " VALUES(".$this->db->idate(mktime()).",'".addslashes($this->login)."','".$this->ldap_sid."')";
$result=$this->db->query($sql);
dolibarr_syslog("User::Create sql=".$sql, LOG_DEBUG);

2
htdocs/usergroup.class.php
View File

@ -390,7 +390,7 @@ class UserGroup
global $user,$conf,$langs;
$sql = "INSERT into ".MAIN_DB_PREFIX."usergroup (datec,nom)";
$sql .= " VALUES(now(),'".addslashes($this->nom)."')";
$sql .= " VALUES(".$this->db->idate(mktime()).",'".addslashes($this->nom)."')";
$result=$this->db->query($sql);
if ($result)

4
scripts/cron/facture-paye-stats.php
View File

@ -75,7 +75,7 @@ if ($resql)
while ($row = $db->fetch_row($resql))
{
$sqli = "INSERT INTO ".MAIN_DB_PREFIX."facture_stats";
$sqli .= " VALUES (now(),now(),'paye $row[0]',$row[1])";
$sqli .= " VALUES (".$db->idate(mktime()).",".$this->db->idate(mktime()).",'paye $row[0]',$row[1])";
$resqli = $db->query($sqli);
}
@ -93,7 +93,7 @@ if ($resql)
while ($row = $db->fetch_row($resql))
{
$sqli = "INSERT INTO ".MAIN_DB_PREFIX."facture_stats";
$sqli .= " VALUES (now(),now(),'total $row[0]','$row[1]')";
$sqli .= " VALUES (".$this->db->idate(mktime()).",".$this->db->idate(mktime()).",'total $row[0]','$row[1]')";
$resqli = $db->query($sqli);
}

6
scripts/cron/fournisseur-calcul-ca_genere.php
View File

@ -194,7 +194,7 @@ foreach($ca_fourns as $key => $value)
$resqld = $db->query($sqld);
$sqli = "INSERT INTO ".MAIN_DB_PREFIX."fournisseur_ca";
$sqli .= " VALUES ($key,now(),$year,'".str_replace(',','.',$value)."'";
$sqli .= " VALUES ($key,".$db->idate(mktime()).",$year,'".price2num($value)."'";
$sqli.= ",'". $fournisseurs_ca_achat[$key][$year] ."');";
$resqli = $db->query($sqli);
@ -206,12 +206,12 @@ foreach($ca_fourns as $key => $value)
foreach($ca_products as $key => $value)
{
$sqld = "DELETE FROM ".MAIN_DB_PREFIX."product_ca";
$sqld .= " WHERE year = $year AND fk_societe=$key;";
$sqld .= " WHERE year = ".$year." AND fk_societe=".$key;
$resqld = $db->query($sqld);
$sqli = "INSERT INTO ".MAIN_DB_PREFIX."product_ca";
$sqli .= " VALUES ($key,now(),$year,'".str_replace(',','.',$value)."');";
$sqli .= " VALUES (".$key.",".$db->idate(mktime()).",".$year.",'".price2num($value)."')";
$resqli = $db->query($sqli);
}

4
scripts/prelevement/prelevement.php
View File

@ -211,7 +211,7 @@ if (sizeof($factures_prev) > 0)
*/
$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_bons (ref,datec)";
$sql .= " VALUES ('".$ref."',now())";
$sql .= " VALUES ('".$ref."',".$db->idate(mktime()).")";
if ($db->query($sql))
{
@ -291,7 +291,7 @@ if (sizeof($factures_prev) > 0)
*/
$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande";
$sql .= " SET traite = 1";
$sql .= ", date_traite=now()";
$sql .= ", date_traite=".$db->idate(mktime());
$sql .= ", fk_prelevement_bons = ".$prev_id;
$sql .= " WHERE rowid=".$fac[1];