From fc6382ea7e2c38190788cb31db3f79d6d901c859 Mon Sep 17 00:00:00 2001
From: KreizIT <KreizIT@users.noreply.github.com>
Date: Fri, 4 Jul 2014 15:15:36 +0200
Subject: [PATCH 1/7] Fix: [ bug #1463, #1464 ] Proposal triggers problem

---
 ChangeLog                                 |   1 +
 htdocs/comm/propal/class/propal.class.php | 162 ++++++++++------------
 2 files changed, 73 insertions(+), 90 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5b057b66175..fe765ee1015 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ For users:
 - Fix: [ bug #1494 ] CATEGORY_CREATE and CATEGORY_MODIFY triggers do not intercept trigger action
 - Fix: [ bug #1502 ] DON_CREATE trigger does not intercept trigger action
 - Fix: [ bug #1505, #1504] Project trigger problem
+- Fix: [ bug #1463, #1464 ] Proposal triggers problem
 
 
 For translators:
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 7f2ebf1de4b..0668b49121d 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -856,24 +856,22 @@ class Propal extends CommonObject
 
                         if (! $notrigger)
                         {
-                            // Appel des triggers
-                            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                            $interface=new Interfaces($this->db);
-                            $result=$interface->run_triggers('PROPAL_CREATE',$this,$user,$langs,$conf);
-                            if ($result < 0) {
-                                $error++; $this->errors=$interface->errors;
-                            }
-                            // Fin appel triggers
+                            // Call trigger
+                            $result=$this->call_trigger('PROPAL_CREATE',$user);
+                            if ($result < 0) { $error++; }            
+                            // End call triggers
                         }
                     }
                     else
                     {
+                        $this->error=$this->db->error();
                         $error++;
                     }
                 }
             }
             else
             {
+                $this->error=$this->db->error();
                 $error++;
             }
 
@@ -885,7 +883,6 @@ class Propal extends CommonObject
             }
             else
             {
-                $this->error=$this->db->error();
                 $this->db->rollback();
                 return -2;
             }
@@ -1006,14 +1003,10 @@ class Propal extends CommonObject
                 if ($reshook < 0) $error++;
             }
 
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('PROPAL_CLONE',$this,$user,$langs,$conf);
-            if ($result < 0) {
-                $error++; $this->errors=$interface->errors;
-            }
-            // Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('PROPAL_CLONE',$user);
+            if ($result < 0) { $error++; }            
+            // End call triggers
         }
 
         // End
@@ -1326,14 +1319,10 @@ class Propal extends CommonObject
             {
                 if (! $notrigger)
                 {
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('PROPAL_VALIDATE',$this,$user,$langs,$conf);
-                    if ($result < 0) {
-                        $error++; $this->errors=$interface->errors;
-                    }
-                    // Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('PROPAL_VALIDATE',$user);
+                    if ($result < 0) { $error++; }            
+                    // End call triggers
                 }
 
             	if (! $error)
@@ -1668,25 +1657,24 @@ class Propal extends CommonObject
 		{
 			if (! $notrigger)
 			{
-				// Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('PROPAL_REOPEN',$this,$user,$langs,$conf);
-                if ($result < 0) {
-                    $error++; $this->errors=$interface->errors;
-                }
-                // Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('PROPAL_REOPEN',$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);
-			}
+		    if (!empty($this->errors)) 
+		    { 
+    			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;
 		}
@@ -1751,14 +1739,10 @@ class Propal extends CommonObject
                 	propale_pdf_create($this->db, $this, $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL?$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL:$this->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
                 }
 
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('PROPAL_CLOSE_SIGNED',$this,$user,$langs,$conf);
-                if ($result < 0) {
-                    $error++; $this->errors=$interface->errors;
-                }
-                // Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('PROPAL_CLOSE_SIGNED',$user);
+                if ($result < 0) { $error++; }            
+                // End call triggers
             }
             else
             {
@@ -1777,18 +1761,21 @@ class Propal extends CommonObject
             		propale_pdf_create($this->db, $this, $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED?$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED:$this->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
             	}
 
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('PROPAL_CLOSE_REFUSED',$this,$user,$langs,$conf);
-                if ($result < 0) {
-                    $error++; $this->errors=$interface->errors;
-                }
-                // Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('PROPAL_CLOSE_REFUSED',$user);
+                if ($result < 0) { $error++; }            
+                // End call triggers
+            }
+            if ( ! $error )
+            {
+                $this->db->commit();
+                return 1;
+            }
+            else
+            {
+                $this->db->rollback();
+                return -1;
             }
-
-            $this->db->commit();
-            return 1;
         }
         else
         {
@@ -2039,15 +2026,11 @@ class Propal extends CommonObject
 
         $this->db->begin();
 
-        if (! $error && ! $notrigger)
+        if (! $notrigger)
         {
-            // Call triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('PROPAL_DELETE',$this,$user,$langs,$conf);
-            if ($result < 0) {
-                $error++; $this->errors=$interface->errors;
-            }
+            // Call trigger
+            $result=$this->call_trigger('PROPAL_DELETE',$user);
+            if ($result < 0) { $error++; }            
             // End call triggers
         }
 
@@ -2145,7 +2128,6 @@ class Propal extends CommonObject
         }
         else
         {
-            $this->error=$this->db->lasterror();
             $this->db->rollback();
             return -1;
         }
@@ -2931,14 +2913,14 @@ class PropaleLigne  extends CommonObject
 
             if (! $notrigger)
             {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result = $interface->run_triggers('LINEPROPAL_INSERT',$this,$user,$langs,$conf);
-                if ($result < 0) {
-                    $error++; $this->errors=$interface->errors;
-                }
-                // Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('LINEPROPAL_INSERT',$user);
+                if ($result < 0)
+                { 
+                    $this->db->rollback();
+                    return -1; 
+                }            
+                // End call triggers
             }
 
             $this->db->commit();
@@ -2981,14 +2963,14 @@ class PropaleLigne  extends CommonObject
         		}
         	}
 
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result = $interface->run_triggers('LINEPROPAL_DELETE',$this,$user,$langs,$conf);
-            if ($result < 0) {
-                $error++; $this->errors=$interface->errors;
-            }
-            // Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('LINEPROPAL_DELETE',$user);
+            if ($result < 0)
+            { 
+                $this->db->rollback();
+                return -1;
+            }            
+            // End call triggers
 
             $this->db->commit();
 
@@ -3091,14 +3073,14 @@ class PropaleLigne  extends CommonObject
 
             if (! $notrigger)
             {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result = $interface->run_triggers('LINEPROPAL_UPDATE',$this,$user,$langs,$conf);
-                if ($result < 0) {
-                    $error++; $this->errors=$interface->errors;
-                }
-                // Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('LINEPROPAL_UPDATE',$user);
+                if ($result < 0)            
+                { 
+                    $this->db->rollback();
+                    return -1;
+                }            
+                // End call triggers
             }
 
             $this->db->commit();

From 1ded34aa9778e3e66f5e6c03b7446a0345468dbb Mon Sep 17 00:00:00 2001
From: KreizIT <KreizIT@users.noreply.github.com>
Date: Fri, 4 Jul 2014 15:33:16 +0200
Subject: [PATCH 2/7] Fix: [ bug #1498, #1499 ] Shipment/Delivery triggers
 problem

---
 ChangeLog                                    |  2 +-
 htdocs/expedition/class/expedition.class.php | 40 +++++++-----------
 htdocs/expedition/fiche.php                  | 44 ++++++++++++--------
 htdocs/livraison/class/livraison.class.php   | 25 +++++------
 4 files changed, 54 insertions(+), 57 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fe765ee1015..cb93b839133 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,7 +19,7 @@ For users:
 - Fix: [ bug #1502 ] DON_CREATE trigger does not intercept trigger action
 - Fix: [ bug #1505, #1504] Project trigger problem
 - Fix: [ bug #1463, #1464 ] Proposal triggers problem
-
+- Fix: [ bug #1498, #1499 ] Shipment/Delivery triggers problem
 
 For translators:
 - Update language files.
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 5b50a18368e..f6a92b91434 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -275,12 +275,10 @@ class Expedition extends CommonObject
 
 				if (! $error)
 				{
-					// Appel des triggers
-					include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-					$interface=new Interfaces($this->db);
-					$result=$interface->run_triggers('SHIPPING_CREATE',$this,$user,$langs,$conf);
-					if ($result < 0) { $error++; $this->errors=$interface->errors; }
-					// Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('SHIPPING_CREATE',$user);
+                    if ($result < 0) { $error++; }            
+                    // End call triggers
 
 					if (! $error)
 					{
@@ -656,12 +654,10 @@ class Expedition extends CommonObject
 
 		if (! $error)
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('SHIPPING_VALIDATE',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('SHIPPING_VALIDATE',$user);
+            if ($result < 0) { $error++; }            
+            // End call triggers
 		}
 
 		if (! $error)
@@ -867,12 +863,10 @@ class Expedition extends CommonObject
 		{
 			if (! $notrigger)
 			{
-	            // Call triggers
-	            include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-	            $interface=new Interfaces($this->db);
-	            $result=$interface->run_triggers('SHIPPING_MODIFY',$this,$user,$langs,$conf);
-	            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            // End call triggers
+                // Call trigger
+                $result=$this->call_trigger('SHIPPING_MODIFY',$user);
+                if ($result < 0) { $error++; }            
+                // End call triggers
 	    	}
 		}
 
@@ -982,12 +976,10 @@ class Expedition extends CommonObject
 
 					if ($this->db->query($sql))
 					{
-						// Call triggers
-			            include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-			            $interface=new Interfaces($this->db);
-			            $result=$interface->run_triggers('SHIPPING_DELETE',$this,$user,$langs,$conf);
-			            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			            // End call triggers
+                        // Call trigger
+                        $result=$this->call_trigger('SHIPPING_DELETE',$user);
+                        if ($result < 0) { $error++; }            
+                        // End call triggers
 
 			            if (! $error)
 			            {
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index ff6b23c10be..c2a2036c25f 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -241,26 +241,34 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->exped
     $object->fetch_thirdparty();
 
     $result = $object->valid($user);
-
-    // Define output language
-    $outputlangs = $langs;
-    $newlang='';
-    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id','alpha');
-    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-    if (! empty($newlang))
-    {
-        $outputlangs = new Translate("",$conf);
-        $outputlangs->setDefaultLang($newlang);
-    }
-    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-    {
-        $ret=$object->fetch($id);    // Reload to get new records
-        $result=expedition_pdf_create($db,$object,$object->modelpdf,$outputlangs);
-    }
+    
     if ($result < 0)
     {
-        dol_print_error($db,$result);
-        exit;
+		$langs->load("errors");
+        setEventMessage($langs->trans($object->error),'errors');
+    }
+    else
+    {
+        // Define output language
+        $outputlangs = $langs;
+        $newlang='';
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id','alpha');
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+        if (! empty($newlang))
+        {
+            $outputlangs = new Translate("",$conf);
+            $outputlangs->setDefaultLang($newlang);
+        }
+        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+        {
+            $ret=$object->fetch($id);    // Reload to get new records
+            $result=expedition_pdf_create($db,$object,$object->modelpdf,$outputlangs);
+        }
+        if ($result < 0)
+        {
+            dol_print_error($db,$result);
+            exit;
+        }
     }
 }
 
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 399050d0547..c46e333c191 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -446,15 +446,12 @@ class Livraison extends CommonObject
 			return -1;
 		}
 
-		// Appel des triggers
-		include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-		$interface = new Interfaces($this->db);
-		$result = $interface->run_triggers('DELIVERY_VALIDATE', $this, $user, $langs, $conf);
-		// Fin appel triggers
+        // Call trigger
+        $result=$this->call_trigger('DELIVERY_VALIDATE',$user);
+        // End call triggers
 		if ($result < 0)
 		{
 			$this->db->rollback();
-			$this->error = $interface->errors;
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -604,14 +601,14 @@ class Livraison extends CommonObject
 						}
 					}
 
-					// Call triggers
-					include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-					$interface=new Interfaces($this->db);
-					$result=$interface->run_triggers('DELIVERY_DELETE',$this,$user,$langs,$conf);
-					if ($result < 0) {
-						$error++; $this->errors=$interface->errors;
-					}
-					// End call triggers
+                    // Call trigger
+                    $result=$this->call_trigger('DELIVERY_DELETE',$user);
+                    if ($result < 0)
+                    {
+                        $this->db->rollback();
+                        return -4; 
+                    }            
+                    // End call triggers
 
 					return 1;
 				}

From 012fc4e8fee6b800e09ec7fc6e02ae7792177fd0 Mon Sep 17 00:00:00 2001
From: KreizIT <KreizIT@users.noreply.github.com>
Date: Fri, 4 Jul 2014 15:54:20 +0200
Subject: [PATCH 3/7] Fix: [ bug #1465, #1466 ] Product triggers problem

---
 ChangeLog                                     |  1 +
 .../interface_90_all_Demo.class.php-NORUN     |  4 +
 htdocs/product/class/product.class.php        | 91 +++++++++----------
 3 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cb93b839133..0c80f04d4b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@ For users:
 - Fix: [ bug #1505, #1504] Project trigger problem
 - Fix: [ bug #1463, #1464 ] Proposal triggers problem
 - Fix: [ bug #1498, #1499 ] Shipment/Delivery triggers problem
+- Fix: [ bug #1465, #1466 ] Product triggers problem
 
 For translators:
 - Update language files.
diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
index 62b758739c7..f19d717043a 100644
--- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
+++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
@@ -222,6 +222,10 @@ class InterfaceDemo
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
         }
         elseif ($action == 'PRODUCT_DELETE')
+        {
+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+        }
+        elseif ($action == 'PRODUCT_PRICE_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
         }
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 73859378d65..adf45fed387 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -427,12 +427,10 @@ class Product extends CommonObject
 
 			if (! $error && ! $notrigger)
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('PRODUCT_CREATE',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('PRODUCT_CREATE',$user);
+                if ($result < 0) { $error++; }            
+                // End call triggers
 			}
 
 			if (! $error)
@@ -665,12 +663,10 @@ class Product extends CommonObject
 
 				if (! $error && ! $notrigger)
 				{
-					// Appel des triggers
-					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-					$interface=new Interfaces($this->db);
-					$result=$interface->run_triggers('PRODUCT_MODIFY',$this,$user,$langs,$conf);
-					if ($result < 0) { $error++; $this->errors=$interface->errors; }
-					// Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('PRODUCT_MODIFY',$user);
+                    if ($result < 0) { $error++; }            
+                    // End call triggers
 				}
 
 				if (! $error && (is_object($this->oldcopy) && $this->oldcopy->ref != $this->ref))
@@ -763,34 +759,33 @@ class Product extends CommonObject
 
 			if (! $error)
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('PRODUCT_DELETE',$this,$user,$langs,$conf);
-				if ($result < 0) {
-					$error++; $this->errors=$interface->errors;
-				}
-				// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('PRODUCT_DELETE',$user);
+                if ($result < 0) { $error++; }            
+                // End call triggers
 			}
 
-			// Delete all child tables
-			$elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock');
-			foreach($elements as $table)
+   			// Delete all child tables
+			if (! $error)
 			{
-				if (! $error)
-				{
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
-					$sql.= " WHERE fk_product = ".$id;
-					dol_syslog(get_class($this).'::delete', LOG_DEBUG);
-					$result = $this->db->query($sql);
-					if (! $result)
-					{
-						$error++;
-						$this->errors[] = $this->db->lasterror();
-					}
-				}
+    			$elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock');
+    			foreach($elements as $table)
+    			{
+    				if (! $error)
+    				{
+    					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
+    					$sql.= " WHERE fk_product = ".$id;
+    					dol_syslog(get_class($this).'::delete', LOG_DEBUG);
+    					$result = $this->db->query($sql);
+    					if (! $result)
+    					{
+    						$error++;
+    						$this->errors[] = $this->db->lasterror();
+    					}
+    				}
+    			}
 			}
-
+            
 			// Delete product
 			if (! $error)
 			{
@@ -1227,6 +1222,8 @@ class Product extends CommonObject
 			$localtax2=get_localtax($newvat,2);
 			if (empty($localtax1)) $localtax1=0;	// If = '' then = 0
 			if (empty($localtax2)) $localtax2=0;	// If = '' then = 0
+			
+			$this->db->begin();
 
 			// Ne pas mettre de quote sur les numeriques decimaux.
 			// Ceci provoque des stockages avec arrondis en base au lieu des valeurs exactes.
@@ -1264,19 +1261,21 @@ class Product extends CommonObject
 
 				$this->level = $level;				// Store level of price edited for trigger
 
-				// Appel des triggers
-				include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('PRODUCT_PRICE_MODIFY',$this,$user,$langs,$conf);
-				if ($result < 0)
-				{
-					$error++; $this->errors=$interface->errors;
-				}
-				// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('PRODUCT_PRICE_MODIFY',$user);
+                if ($result < 0) 
+                { 
+                	$this->db->rollback();
+                	return -1;
+                }            
+                // End call triggers
+                
+                $this->db->commit();
 			}
 			else
 			{
-				dol_print_error($this->db);
+				$this->db->rollback();
+			    dol_print_error($this->db);
 			}
 		}
 

From 4666de85e2ed4f5b2a9605b2319aba1f6324f467 Mon Sep 17 00:00:00 2001
From: KreizIT <KreizIT@users.noreply.github.com>
Date: Fri, 4 Jul 2014 16:18:54 +0200
Subject: [PATCH 4/7] Fix: [ bug #1508 ] STOCK_MOVEMENT does not show trigger
 error message

---
 ChangeLog                                                  | 2 ++
 htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN | 6 ++++++
 htdocs/product/class/product.class.php                     | 4 ++--
 htdocs/product/stock/product.php                           | 7 +++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0c80f04d4b0..989c34bd305 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@ For users:
 - Fix: [ bug #1463, #1464 ] Proposal triggers problem
 - Fix: [ bug #1498, #1499 ] Shipment/Delivery triggers problem
 - Fix: [ bug #1465, #1466 ] Product triggers problem
+- Fix: [ bug #1508 ] STOCK_MOVEMENT does not show trigger error message
+
 
 For translators:
 - Update language files.
diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
index f19d717043a..ee99d202bdd 100644
--- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
+++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
@@ -226,6 +226,12 @@ class InterfaceDemo
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
         }
         elseif ($action == 'PRODUCT_PRICE_MODIFY')
+        {
+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+        }
+        
+        //Stock mouvement
+        elseif ($action == 'STOCK_MOVEMENT')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
         }
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index adf45fed387..b9d0da37c80 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2867,7 +2867,7 @@ class Product extends CommonObject
 			}
 			else
 			{
-				dol_print_error($this->db);
+			    $this->error=$movementstock->error;
 				$this->db->rollback();
 				return -1;
 			}
@@ -3454,7 +3454,7 @@ class Product extends CommonObject
 			}
 			else
 			{
-				dol_print_error($this->db);
+			    $this->error=$movementstock->error;
 				$this->db->rollback();
 				return -1;
 			}
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 338169a6154..a9b9c000553 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -154,6 +154,11 @@ if ($action == "correct_stock" && ! $cancel)
 	            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$product->id);
 				exit;
 			}
+			else 
+			{
+			    setEventMessage($product->error,'errors');
+			    $action='correction';
+			}
 		}
 	}
 }
@@ -253,6 +258,8 @@ if ($id > 0 || $ref)
 		$titre=$langs->trans("CardProduct".$product->type);
 		$picto=($product->type==1?'service':'product');
 		dol_fiche_head($head, 'stock', $titre, 0, $picto);
+		
+		dol_htmloutput_events();
 
 		$form = new Form($db);
 

From c70bdabeda0bf35de0274505e9b0e1340b1fb3cf Mon Sep 17 00:00:00 2001
From: KreizIT <KreizIT@users.noreply.github.com>
Date: Fri, 4 Jul 2014 16:23:10 +0200
Subject: [PATCH 5/7] Fix: [ bug #1501 ] DEPLACEMENT_CREATE trigger do not
 intercept trigger action

---
 ChangeLog                                      |  1 +
 .../deplacement/class/deplacement.class.php    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 989c34bd305..42b145f47cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@ For users:
 - Fix: [ bug #1498, #1499 ] Shipment/Delivery triggers problem
 - Fix: [ bug #1465, #1466 ] Product triggers problem
 - Fix: [ bug #1508 ] STOCK_MOVEMENT does not show trigger error message
+- Fix: [ bug #1501 ] DEPLACEMENT_CREATE trigger do not intercept trigger action
 
 
 For translators:
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 942ceb912c8..0f17c543b9d 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -126,15 +126,15 @@ class Deplacement extends CommonObject
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."deplacement");
 
-                        // Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('DEPLACEMENT_CREATE',$this,$user,$langs,$conf);
-			if ($result < 0) {
-				$error++; $this->errors=$interface->errors;
-			}
-			// Fin appel triggers
-
+            // Call trigger
+            $result=$this->call_trigger('DEPLACEMENT_CREATE',$user);
+            if ($result < 0)
+            {
+            	$this->db->rollback();
+            	return -2;
+            }            
+            // End call triggers
+			
 			$result=$this->update($user);
 			if ($result > 0)
 			{

From e4ad082214047739b4b8fa4b55498a170f4b281b Mon Sep 17 00:00:00 2001
From: KreizIT <KreizIT@users.noreply.github.com>
Date: Fri, 4 Jul 2014 16:39:54 +0200
Subject: [PATCH 6/7] Fix: [ bug #1506, #1507 ] ECM trigger error problem

---
 ChangeLog                                     |  2 +
 .../interface_90_all_Demo.class.php-NORUN     | 14 ++++
 htdocs/ecm/class/ecmdirectory.class.php       | 76 +++++++++++++------
 3 files changed, 69 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 42b145f47cb..e3c9b80c3cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@ For users:
 - Fix: [ bug #1465, #1466 ] Product triggers problem
 - Fix: [ bug #1508 ] STOCK_MOVEMENT does not show trigger error message
 - Fix: [ bug #1501 ] DEPLACEMENT_CREATE trigger do not intercept trigger action
+- Fix: [ bug #1506, #1507 ] ECM trigger error problem
+
 
 
 For translators:
diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
index ee99d202bdd..25d7bbb8196 100644
--- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
+++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
@@ -232,6 +232,20 @@ class InterfaceDemo
         
         //Stock mouvement
         elseif ($action == 'STOCK_MOVEMENT')
+        {
+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+        }
+        
+		//MYECMDIR
+		elseif ($action == 'MYECMDIR_DELETE')
+        {
+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+        }
+		elseif ($action == 'MYECMDIR_CREATE')
+        {
+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+        }
+        elseif ($action == 'MYECMDIR_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
         }
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 87f3bcd59ba..52c698c240f 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -152,12 +152,10 @@ class EcmDirectory // extends CommonObject
 				$result=dol_mkdir($dir);
 				if ($result < 0) { $error++; $this->error="ErrorFailedToCreateDir"; }
 
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('MYECMDIR_CREATE',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('MYECMDIR_CREATE',$user);
+                if ($result < 0) { $error++; }            
+                // End call triggers
 
 				if (! $error)
 				{
@@ -219,12 +217,10 @@ class EcmDirectory // extends CommonObject
 
 		if (! $error && ! $notrigger)
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('MYECMDIR_MODIFY',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('MYECMDIR_MODIFY',$user);
+            if ($result < 0) { $error++; }            
+            // End call triggers
 		}
 
 		if (! $error)
@@ -352,7 +348,18 @@ class EcmDirectory // extends CommonObject
 			$this->error="Error ".$this->db->lasterror();
 			return -2;
 		}
-
+		else
+		{
+            // Call trigger
+            $result=$this->call_trigger('MYECMDIR_DELETE',$user);
+            if ($result < 0)
+            {
+            	$this->db->rollback();
+            	return -2;
+            }            
+            // End call triggers
+		}
+		
 		if ($mode != 'databaseonly')
 		{
 			$file = $conf->ecm->dir_output . "/" . $relativepath;
@@ -371,16 +378,6 @@ class EcmDirectory // extends CommonObject
 			$error++;
 		}
 
-		if (! $error)
-		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('MYECMDIR_DELETE',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
-		}
-
 		if (! $error) return 1;
 		else return -1;
 	}
@@ -696,5 +693,38 @@ class EcmDirectory // extends CommonObject
 			return -1;
 		}
 	}
+	
+	/**
+     * Call trigger based on this instance
+     *
+     *  NB: Error from trigger are stacked in errors
+     *  NB2: if trigger fail, action should be canceled.
+     *  NB3: Should be deleted if EcmDirectory extend CommonObject
+     *
+     * @param   string    $trigger_name   trigger's name to execute
+     * @param   User      $user           Object user
+     * @return  int                       Result of run_triggers
+     */
+    function call_trigger($trigger_name, $user)
+    {
+        global $langs,$conf;
+
+        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+        $interface=new Interfaces($this->db);
+        $result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf);
+        if ($result < 0) {
+            if (!empty($this->errors))
+            {
+                $this->errors=array_merge($this->errors,$interface->errors);
+            }
+            else
+            {
+                $this->errors=$interface->errors;
+            }
+        }
+        return $result;
+
+    }
+	
 
 }

From c5bb55064f4dfa224c17d582db6885ef6601b22f Mon Sep 17 00:00:00 2001
From: KreizIT <KreizIT@users.noreply.github.com>
Date: Fri, 4 Jul 2014 17:10:19 +0200
Subject: [PATCH 7/7] Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and
 CONTACT_DELETE duplicates error message

---
 ChangeLog                                     |  1 +
 htdocs/contact/class/contact.class.php        | 43 +++++++------------
 htdocs/contact/fiche.php                      | 33 ++++++++++----
 .../interface_90_all_Demo.class.php-NORUN     |  4 ++
 4 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e3c9b80c3cd..da781f4bb5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@ For users:
 - Fix: [ bug #1508 ] STOCK_MOVEMENT does not show trigger error message
 - Fix: [ bug #1501 ] DEPLACEMENT_CREATE trigger do not intercept trigger action
 - Fix: [ bug #1506, #1507 ] ECM trigger error problem
+- Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message
 
 
 
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 95f949b123f..7858f81dcf9 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -183,12 +183,10 @@ class Contact extends CommonObject
 
             if (! $error)
             {
-    			// Appel des triggers
-    			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-    			$interface=new Interfaces($this->db);
-    			$result=$interface->run_triggers('CONTACT_CREATE',$this,$user,$langs,$conf);
-    			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-    			// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('CONTACT_CREATE',$user);
+                if ($result < 0) { $error++; }            
+                // End call triggers
             }
 
             if (! $error)
@@ -304,12 +302,10 @@ class Contact extends CommonObject
 
 			if (! $error && ! $notrigger)
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('CONTACT_MODIFY',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('CONTACT_MODIFY',$user);
+                if ($result < 0) { $error++; }            
+                // End call triggers
 			}
 
 			if (! $error)
@@ -319,7 +315,6 @@ class Contact extends CommonObject
 			}
 			else
 			{
-				$this->error=join(',',$this->errors);
 				dol_syslog(get_class($this)."::update Error ".$this->error,LOG_ERR);
 				$this->db->rollback();
 				return -$error;
@@ -777,14 +772,10 @@ class Contact extends CommonObject
 
 		if (! $error && ! $notrigger)
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('CONTACT_DELETE',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
-
-			if ($error) $this->error=join(',',$this->errors);
+            // Call trigger
+            $result=$this->call_trigger('CONTACT_DELETE',$user);
+            if ($result < 0) { $error++; }            
+            // End call triggers
 		}
 
 		if (! $error)
@@ -1067,12 +1058,10 @@ class Contact extends CommonObject
 		dol_syslog(get_class($this)."::setstatus", LOG_DEBUG);
 		if ($result)
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('CONTACT_ENABLEDISABLE',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('CONTACT_ENABLEDISABLE',$user);
+            if ($result < 0) { $error++; }            
+            // End call triggers
 		}
 
 		if ($error)
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 9cb52738bb8..0d8a26cf81f 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -138,19 +138,30 @@ if (empty($reshook))
     if ($action == 'disable')
     {
     	$object->fetch($id);
-    	$object->setstatus(0);
-    	header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
-    	exit;
+    	if ($object->setstatus(0)<0)
+    	{
+    	    setEventMessage($object->error,'errors');
+    	}
+    	else 
+    	{
+        	header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
+        	exit;    	    
+    	}
     }
 
     // Confirmation activation
     if ($action == 'enable')
     {
     	$object->fetch($id);
-    	$object->setstatus(1);
-    	header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
-    	exit;
-
+        	if ($object->setstatus(1)<0)
+    	{
+    	    setEventMessage($object->error,'errors');
+    	}
+    	else 
+    	{
+        	header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
+        	exit;    	    
+    	}    	
     }
 
     // Add contact
@@ -235,7 +246,8 @@ if (empty($reshook))
         }
         else
         {
-            $error=$object->error; $errors=$object->errors;
+            setEventMessage($object->error,'errors');
+            setEventMessage($object->errors,'errors');
         }
     }
 
@@ -295,7 +307,8 @@ if (empty($reshook))
             }
             else
             {
-                $error=$object->error; $errors=$object->errors;
+                setEventMessage($object->error,'errors');
+                setEventMessage($object->errors,'errors');
                 $action = 'edit';
             }
         }
@@ -367,6 +380,8 @@ else
 
         $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
         dol_fiche_head($head, 'card', $title, 0, 'contact');
+        
+        dol_htmloutput_events();
     }
 
     if ($user->rights->societe->contact->creer)
diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
index 25d7bbb8196..8bc4e42ed3f 100644
--- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
+++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
@@ -211,6 +211,10 @@ class InterfaceDemo
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
         }
+        elseif ($action == 'CONTACT_ENABLEDISABLE')
+        {
+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+        }
 
         // Products
         elseif ($action == 'PRODUCT_CREATE')