From 1c51716997f2c3cb09ffa2b7feea4c770289c41f Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Wed, 23 Jan 2019 17:02:20 +0100
Subject: [PATCH 1/4] Fix missing trigger

---
 .../sociales/class/chargesociales.class.php   | 38 +++++++++++++++----
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 61728562d2e..3a69cdca4f7 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -282,6 +282,7 @@ class ChargeSociales extends CommonObject
      */
     function update($user)
     {
+        $error=0;
         $this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales";
@@ -295,17 +296,40 @@ class ChargeSociales extends CommonObject
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql=$this->db->query($sql);
-        if ($resql)
+        
+        if (! $resql) {
+            $error++; $this->errors[]="Error ".$this->db->lasterror();
+        }
+        
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('SOCIALCHARGES_MODIFY',$user);
+                if ($result < 0) $error++;
+                // End call triggers
+            }
+        }
+        
+        // Commit or rollback
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
         {
             $this->db->commit();
             return 1;
         }
-        else
-        {
-            $this->error=$this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
+        
+        
     }
 
     /**

From 624d17c96a52d99c5c35bf40811571ae254f5ed1 Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Wed, 23 Jan 2019 17:32:49 +0100
Subject: [PATCH 2/4] Fix missing no trigger arg

---
 htdocs/compta/sociales/class/chargesociales.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 3a69cdca4f7..da8f7c8f250 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -280,7 +280,7 @@ class ChargeSociales extends CommonObject
      *      @param	User	$user   Utilisateur qui modifie
      *      @return int     		<0 si erreur, >0 si ok
      */
-    function update($user)
+    function update($user, $notrigger=0)
     {
         $error=0;
         $this->db->begin();

From 5dbc9ddae09e2034cd1929211ae9b688a1736c30 Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Mon, 28 Jan 2019 11:56:20 +0100
Subject: [PATCH 3/4] fix travis

---
 htdocs/compta/sociales/class/chargesociales.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index da8f7c8f250..fbba5c13e63 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -280,7 +280,7 @@ class ChargeSociales extends CommonObject
      *      @param	User	$user   Utilisateur qui modifie
      *      @return int     		<0 si erreur, >0 si ok
      */
-    function update($user, $notrigger=0)
+    function update($user,$notrigger=0)
     {
         $error=0;
         $this->db->begin();

From 6f12cdf23686aab9f29b0a048f74915ecb2eb1e0 Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Mon, 28 Jan 2019 11:58:16 +0100
Subject: [PATCH 4/4] Fix travis

---
 htdocs/compta/sociales/class/chargesociales.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index fbba5c13e63..c3995a2202d 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -278,6 +278,7 @@ class ChargeSociales extends CommonObject
      *      Met a jour une charge sociale
      *
      *      @param	User	$user   Utilisateur qui modifie
+     *      @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
      *      @return int     		<0 si erreur, >0 si ok
      */
     function update($user,$notrigger=0)