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

Merge pull request #1674 from atm-maxime/3.5

Browse Source 
Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix...
This commit is contained in:
Laurent Destailleur 2014-06-20 13:20:50 +02:00
commit e7f08c6d37
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal.php
View File

@ -550,7 +550,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
$interface=new Interfaces($db); $interface=new Interfaces($db);
$result=$interface->run_triggers('PROPAL_SENTBYMAIL',$object,$user,$langs,$conf); $result=$interface->run_triggers('PROPAL_SENTBYMAIL',$object,$user,$langs,$conf);
if ($result < 0) { if ($result < 0) {
$error++; $this->errors=$interface->errors; $error++; $object->errors=$interface->errors;
} }
// Fin appel triggers // Fin appel triggers

2
htdocs/compta/facture.php
View File

@ -1785,7 +1785,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
$interface=new Interfaces($db); $interface=new Interfaces($db);
$result=$interface->run_triggers('BILL_SENTBYMAIL',$object,$user,$langs,$conf); $result=$interface->run_triggers('BILL_SENTBYMAIL',$object,$user,$langs,$conf);
if ($result < 0) { if ($result < 0) {
$error++; $this->errors=$interface->errors; $error++; $object->errors=$interface->errors;
} }
// Fin appel triggers // Fin appel triggers

2
htdocs/expedition/fiche.php
View File

@ -456,7 +456,7 @@ if ($action == 'send' && ! GETPOST('addfile','alpha') && ! GETPOST('removedfile'
$interface=new Interfaces($db); $interface=new Interfaces($db);
$result=$interface->run_triggers('SHIPPING_SENTBYMAIL',$object,$user,$langs,$conf); $result=$interface->run_triggers('SHIPPING_SENTBYMAIL',$object,$user,$langs,$conf);
if ($result < 0) { if ($result < 0) {
$error++; $this->errors=$interface->errors; $error++; $object->errors=$interface->errors;
} }
// Fin appel triggers // Fin appel triggers

2
htdocs/fichinter/fiche.php
View File

@ -736,7 +736,7 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA
$interface=new Interfaces($db); $interface=new Interfaces($db);
$result=$interface->run_triggers('FICHINTER_SENTBYMAIL',$object,$user,$langs,$conf); $result=$interface->run_triggers('FICHINTER_SENTBYMAIL',$object,$user,$langs,$conf);
if ($result < 0) { if ($result < 0) {
$error++; $this->errors=$interface->errors; $error++; $object->errors=$interface->errors;
} }
// Fin appel triggers // Fin appel triggers

2
htdocs/fourn/facture/fiche.php
View File

@ -881,7 +881,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P
$interface=new Interfaces($db); $interface=new Interfaces($db);
$result=$interface->run_triggers('BILL_SUPPLIER_SENTBYMAIL',$object,$user,$langs,$conf); $result=$interface->run_triggers('BILL_SUPPLIER_SENTBYMAIL',$object,$user,$langs,$conf);
if ($result < 0) { if ($result < 0) {
$error++; $this->errors=$interface->errors; $error++; $object->errors=$interface->errors;
} }
// Fin appel triggers // Fin appel triggers

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

@ -2870,7 +2870,7 @@ class Societe extends CommonObject
// Set outstanding amount // Set outstanding amount
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET "; $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
$sql.= " outstanding_limit= ".($outstanding!=''?$outstanding:'null'); $sql.= " outstanding_limit= '".($outstanding!=''?$outstanding:'null')."'";
$sql.= " WHERE rowid = ".$this->id; $sql.= " WHERE rowid = ".$this->id;
dol_syslog(get_class($this)."::set_outstanding sql=".$sql); dol_syslog(get_class($this)."::set_outstanding sql=".$sql);

8
htdocs/societe/soc.php
View File

@ -414,12 +414,12 @@ if (empty($reshook))
$sql = "UPDATE ".MAIN_DB_PREFIX."adherent"; $sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
$sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id; $sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id;
dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG); dol_syslog(get_class($object)."::delete sql=".$sql, LOG_DEBUG);
if (! $this->db->query($sql)) if (! $object->db->query($sql))
{ {
$error++; $error++;
$this->error .= $this->db->lasterror(); $object->error .= $object->db->lasterror();
dol_syslog(get_class($this)."::delete erreur -1 ".$this->error, LOG_ERR); dol_syslog(get_class($object)."::delete erreur -1 ".$object->error, LOG_ERR);
} }
} }