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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-12-11 11:00:37 +01:00
commit cee805f473
6 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -751,8 +751,9 @@ class Adherent extends CommonObject
{ {
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{ {
$result=$this->deleteExtraFields($this); $result=$this->deleteExtraFields();
if ($result < 0) { if ($result < 0)
{
$error++; $error++;
$errorflag=-4; $errorflag=-4;
dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);

8
htdocs/comm/action/class/actioncomm.class.php
View File

@ -370,8 +370,12 @@ class ActionComm extends CommonObject
// Removed extrafields // Removed extrafields
if (! $error) { if (! $error) {
$result=$this->deleteExtraFields($this); $result=$this->deleteExtraFields();
if ($result < 0) $error++; if ($result < 0)
{
$error++;
dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
}
} }
if (!$error) if (!$error)

9
htdocs/core/class/commonobject.class.php
View File

@ -2070,7 +2070,7 @@ abstract class CommonObject
/** /**
* Delete all extra fields values for the current object. * Delete all extra fields values for the current object.
* *
* @return void * @return int <0 if KO, >0 if OK
*/ */
function deleteExtraFields() function deleteExtraFields()
{ {
@ -2081,13 +2081,12 @@ abstract class CommonObject
$this->db->begin(); $this->db->begin();
$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id; $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id;
dol_syslog(get_class($this)."::insertExtraFields delete sql=".$sql_del); dol_syslog(get_class($this)."::deleteExtraFields delete sql=".$sql_del);
$this->db->query($sql_del); $resql=$this->db->query($sql_del);
if (! $resql) if (! $resql)
{ {
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
dol_syslog(get_class($this)."::delete ".$this->error,LOG_ERR); dol_syslog(get_class($this)."::deleteExtraFields ".$this->error,LOG_ERR);
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }

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

@ -629,8 +629,9 @@ class Product extends CommonObject
// Removed extrafields // Removed extrafields
if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
{ {
$result=$this->deleteExtraFields($this); $result=$this->deleteExtraFields();
if ($result < 0) { if ($result < 0)
{
$error++; $error++;
dol_syslog(get_class($this).'::delete error '.$this->error, LOG_ERR); dol_syslog(get_class($this).'::delete error '.$this->error, LOG_ERR);
} }

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

@ -1018,7 +1018,7 @@ class Societe extends CommonObject
{ {
$error++; $error++;
$this->error = $this->db->lasterror(); $this->error = $this->db->lasterror();
dol_syslog(get_class($this)."::Delete erreur -2 ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::delete erreur -2 ".$this->error, LOG_ERR);
} }
} }
@ -1040,10 +1040,11 @@ class Societe extends CommonObject
// Removed extrafields // Removed extrafields
if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
{ {
$result=$this->deleteExtraFields($this); $result=$this->deleteExtraFields();
if ($result < 0) { if ($result < 0)
{
$error++; $error++;
dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
} }
} }

5
htdocs/user/class/user.class.php
View File

@ -721,8 +721,9 @@ class User extends CommonObject
// Remove extrafields // Remove extrafields
if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
{ {
$result=$this->deleteExtraFields($this); $result=$this->deleteExtraFields();
if ($result < 0) { if ($result < 0)
{
$error++; $error++;
dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
} }