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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2015-10-11 20:32:37 +02:00
commit 75b7815d08
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1332,7 +1332,7 @@ class Contrat extends CommonObject
if (empty($error)) { if (empty($error)) {
// Call trigger // Call trigger
$result=$this->call_trigger('LINECONTRACT_CREATE',$user); $result=$this->call_trigger('LINECONTRACT_INSERT',$user);
if ($result < 0) if ($result < 0)
{ {
$this->db->rollback(); $this->db->rollback();
@ -2644,7 +2644,7 @@ class ContratLigne extends CommonObjectLine
if (!$notrigger) if (!$notrigger)
{ {
// Call trigger // Call trigger
$result = $this->call_trigger('LINECONTRACT_CREATE', $user); $result = $this->call_trigger('LINECONTRACT_INSERT', $user);
if ($result < 0) { if ($result < 0) {
$this->db->rollback(); $this->db->rollback();
return -1; return -1;

2
htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
View File

@ -167,7 +167,7 @@ class InterfaceDemo extends DolibarrTriggers
case 'CONTRACT_CANCEL': case 'CONTRACT_CANCEL':
case 'CONTRACT_CLOSE': case 'CONTRACT_CLOSE':
case 'CONTRACT_DELETE': case 'CONTRACT_DELETE':
case 'LINECONTRACT_CREATE': case 'LINECONTRACT_INSERT':
case 'LINECONTRACT_UPDATE': case 'LINECONTRACT_UPDATE':
case 'LINECONTRACT_DELETE': case 'LINECONTRACT_DELETE':