Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

More substitutions

Browse Source
This commit is contained in:
Marcos García de La Fuente
2014-06-13 01:42:00 +02:00
parent ca0a6cb307
commit 88cd5dec40
15 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/categories/class/categorie.class.php
View File

@@ -633,7 +633,6 @@ class Categorie extends CommonObject
else
{
$this->error=$this->db->error().' sql='.$sql;
dol_syslog(get_class($this)."::getObjectsInCateg ".$this->error, LOG_ERR);
return -1;
}
}
@@ -677,7 +676,6 @@ class Categorie extends CommonObject
return $this->db->fetch_object($resql)->nb;
} else {
$this->error=$this->db->error().' sql='.$sql;
dol_syslog(get_class($this)."::containsObject ".$this->error, LOG_ERR);
return -1;
}
}
@@ -1218,7 +1216,6 @@ class Categorie extends CommonObject
else
{
$this->error=$this->db->error().' sql='.$sql;
dol_syslog(get_class($this)."::rechercher ".$this->error, LOG_ERR);
return -1;
}
}
@@ -1438,7 +1435,7 @@ class Categorie extends CommonObject
$sql2.= " VALUES(".$this->id.",'".$key."','". $this->db->escape($this->label);
$sql2.= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
}
dol_syslog(get_class($this).'::setMultiLangs sql='.$sql2);
dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
if (! $this->db->query($sql2))
{
$this->error=$this->db->lasterror();
@@ -1464,7 +1461,7 @@ class Categorie extends CommonObject
// on ne sauvegarde pas des champs vides
if ( $this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"] )
dol_syslog(get_class($this).'::setMultiLangs sql='.$sql2);
dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
if (! $this->db->query($sql2))
{
$this->error=$this->db->lasterror();

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

@@ -1401,7 +1401,6 @@ class Commande extends CommonOrder
else
{
$this->error='Order with id '.$id.' not found sql='.$sql;
dol_syslog(get_class($this).'::fetch '.$this->error);
return 0;
}
}

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

@@ -269,7 +269,6 @@ class FactureRec extends Facture
if ($result < 0)
{
$this->error=$this->db->error();
dol_syslog('Facture::Fetch Error '.$this->error, LOG_ERR);
return -3;
}
return 1;

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

@@ -929,7 +929,6 @@ class Facture extends CommonInvoice
else
{
$this->error=$this->db->error();
dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
return -1;
}
}
@@ -1427,7 +1426,7 @@ class Facture extends CommonInvoice
if (is_numeric($cond_reglement)) $sqltemp.= " WHERE c.rowid=".$cond_reglement;
else $sqltemp.= " WHERE c.code='".$this->db->escape($cond_reglement)."'";
dol_syslog(get_class($this).'::calculate_date_lim_reglement sql='.$sqltemp);
dol_syslog(get_class($this).'::calculate_date_lim_reglement', LOG_DEBUG);
$resqltemp=$this->db->query($sqltemp);
if ($resqltemp)
{

1
htdocs/contact/class/contact.class.php
View File

@@ -328,7 +328,6 @@ class Contact extends CommonObject
else
{
$this->error=$this->db->lasterror().' sql='.$sql;
dol_syslog(get_class($this)."::update Error ".$this->error,LOG_ERR);
$this->db->rollback();
return -1;
}

1
htdocs/core/class/discount.class.php
View File

@@ -169,7 +169,6 @@ class DiscountAbsolute
else
{
$this->error=$this->db->lasterror().' - sql='.$sql;
dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
return -1;
}
}

7
htdocs/core/lib/admin.lib.php
View File

@@ -215,7 +215,6 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
}
else
{
dol_syslog('Admin.lib::run_sql Failed to get max rowid for '.$table.' '.$db->lasterror().' sql='.$sqlgetrowid, LOG_ERR);
if (! $silent) print '<tr><td valign="top" colspan="2">';
if (! $silent) print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div></td>";
if (! $silent) print '</tr>';
@@ -226,7 +225,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
$from='__+MAX_'.$table.'__';
$to='+'.$listofmaxrowid[$table];
$newsql=str_replace($from,$to,$newsql);
dol_syslog('Admin.lib::run_sql New Request '.($i+1).' (replacing '.$from.' to '.$to.') sql='.$newsql, LOG_DEBUG);
dol_syslog('Admin.lib::run_sql New Request '.($i+1).' (replacing '.$from.' to '.$to.')', LOG_DEBUG);
$arraysql[$i]=$newsql;
}
@@ -251,7 +250,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
// Ajout trace sur requete (eventuellement a commenter si beaucoup de requetes)
if (! $silent) print '<tr><td valign="top">'.$langs->trans("Request").' '.($i+1)." sql='".dol_htmlentities($newsql,ENT_NOQUOTES)."'</td></tr>\n";
dol_syslog('Admin.lib::run_sql Request '.($i+1).' sql='.$newsql, LOG_DEBUG);
dol_syslog('Admin.lib::run_sql Request '.($i+1), LOG_DEBUG);
$sqlmodified=0;
// Replace for encrypt data
@@ -300,7 +299,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
$sqlmodified++;
}
if ($sqlmodified) dol_syslog('Admin.lib::run_sql New Request '.($i+1).' sql='.$newsql, LOG_DEBUG);
if ($sqlmodified) dol_syslog('Admin.lib::run_sql New Request '.($i+1), LOG_DEBUG);
$result=$db->query($newsql,$usesavepoint);
if ($result)

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

@@ -473,14 +473,13 @@ class Expedition extends CommonObject
}
else
{
dol_syslog(get_class($this).'::Fetch Error -2');
dol_syslog(get_class($this).'::Fetch Error -2', LOG_ERR);
$this->error='Delivery with id '.$id.' not found sql='.$sql;
return -2;
}
}
else
{
dol_syslog(get_class($this).'::Fetch Error -1');
$this->error=$this->db->error();
return -1;
}

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

@@ -1074,7 +1074,6 @@ class FichinterLigne
else
{
$this->error=$this->db->error().' sql='.$sql;
dol_print_error($this->db,$this->error, LOG_ERR);
return -1;
}
}

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

@@ -432,7 +432,6 @@ class FactureFournisseur extends CommonInvoice
else
{
$this->error="Error ".$this->db->lasterror();
dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
}

2
htdocs/holiday/class/holiday.class.php
View File

@@ -929,7 +929,7 @@ class Holiday extends CommonObject
$sql2 = "UPDATE ".MAIN_DB_PREFIX."holiday_users SET";
$sql2.= " nb_holiday = nb_holiday + ".$nb_holiday;
dol_syslog(get_class($this).'::updateSoldeCP sql='.$sql2);
dol_syslog(get_class($this).'::updateSoldeCP', LOG_DEBUG);
$result= $this->db->query($sql2);
if ($result) return 1;

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

@@ -318,7 +318,6 @@ class Livraison extends CommonObject
}
else
{
dol_syslog(get_class($this).'::fetch Error '.$this->error, LOG_ERR);
$this->error=$this->db->error();
return -1;
}

9
htdocs/product/class/product.class.php
View File

@@ -795,13 +795,12 @@ class Product extends CommonObject
{
$sqlz = "DELETE FROM ".MAIN_DB_PREFIX."product";
$sqlz.= " WHERE rowid = ".$id;
dol_syslog(get_class($this).'::delete sql='.$sqlz, LOG_DEBUG);
dol_syslog(get_class($this).'::delete', LOG_DEBUG);
$resultz = $this->db->query($sqlz);
if ( ! $resultz )
{
$error++;
$this->errors[] = $this->db->lasterror();
dol_syslog(get_class($this).'::delete error '.$this->error, LOG_ERR);
}
}
@@ -896,11 +895,10 @@ class Product extends CommonObject
$sql2.= "','".$this->db->escape($this->description);
$sql2.= "','".$this->db->escape($this->note)."')";
}
dol_syslog(get_class($this).'::setMultiLangs sql='.$sql2);
dol_syslog(get_class($this).'::setMultiLangs');
if (! $this->db->query($sql2))
{
$this->error=$this->db->lasterror();
dol_syslog(get_class($this).'::setMultiLangs error='.$this->error, LOG_ERR);
return -1;
}
}
@@ -924,11 +922,10 @@ class Product extends CommonObject
// on ne sauvegarde pas des champs vides
if ( $this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"] )
dol_syslog(get_class($this).'::setMultiLangs sql='.$sql2);
dol_syslog(get_class($this).'::setMultiLangs');
if (! $this->db->query($sql2))
{
$this->error=$this->db->lasterror();
dol_syslog(get_class($this).'::setMultiLangs error='.$this->error, LOG_ERR);
return -1;
}
}

6
htdocs/societe/class/companybankaccount.class.php
View File

@@ -323,7 +323,7 @@ class CompanyBankAccount extends Account
$sql1 = "SELECT rowid as id, fk_soc FROM ".MAIN_DB_PREFIX."societe_rib";
$sql1.= " WHERE rowid = ".($rib?$rib:$this->id);
dol_syslog(get_class($this).'::setAsDefault sql='.$sql1);
dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
$result1 = $this->db->query($sql1);
if ($result1)
{
@@ -339,12 +339,12 @@ class CompanyBankAccount extends Account
$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0 ";
$sql2.= "WHERE fk_soc = ".$obj->fk_soc;
dol_syslog(get_class($this).'::setAsDefault sql='.$sql2);
dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
$result2 = $this->db->query($sql2);
$sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1 ";
$sql3.= "WHERE rowid = ".$obj->id;
dol_syslog(get_class($this).'::setAsDefault sql='.$sql3);
dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
$result3 = $this->db->query($sql3);
if (!$result2 || !$result3)

1
htdocs/societe/class/societe.class.php
View File

@@ -1193,7 +1193,6 @@ class Societe extends CommonObject
else
{
$this->error=$this->db->error().' sql='.$sql;
dol_syslog(get_class($this)."::searchByName ".$this->error, LOG_ERR);
return -1;
}
}