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

Merge pull request #1665 from atm-maxime/develop

Browse Source 
Fix 1480, 1483, 1497 $this instead of $object
This commit is contained in:
Laurent Destailleur 2014-06-14 14:13:10 +02:00
commit 4c0fe98ae2
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal.php
View File

@ -473,7 +473,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
$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 ++; $error ++;
$this->errors = $interface->errors; $object->errors = $interface->errors;
} }
// Fin appel triggers // Fin appel triggers

2
htdocs/compta/facture.php
View File

@ -1607,7 +1607,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
$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 ++; $error ++;
$this->errors = $interface->errors; $object->errors = $interface->errors;
} }
// Fin appel triggers // Fin appel triggers

2
htdocs/expedition/fiche.php
View File

@ -500,7 +500,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

@ -730,7 +730,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

@ -911,7 +911,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

8
htdocs/societe/soc.php
View File

@ -432,12 +432,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);
} }
} }