Merge pull request #1786 from atm-maxime/develop

Fix on class not extending commonobject
Dolibarr · Aug 4, 2014 · 3024d82 · 3024d82
2 parents 7d3c266 + 94fee7a
commit 3024d82
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 4 deletions.
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
@@ -87,7 +87,7 @@ function fetch($id,$label='')
 
 		else
 		{
-			if ($label) $sql.= " WHERE label = '".$this->db->escape($label)."' AND entity=".$conf->entity;;
+			if ($label) $sql.= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category',1).")";
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);

diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
@@ -28,6 +28,34 @@
  */
 abstract class CommonObjectLine
 {
+    /**
+     * Call trigger based on this instance
+     * NB: Error from trigger are stacked in interface->errors
+     * NB2: If return code of triggers are < 0, action calling trigger should cancel all transaction.
+     *
+     * @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;
+    }
 }
 
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
@@ -24,6 +24,7 @@
  * 	\brief      Fichier de la classe des gestion des fiches interventions
  */
 require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php';
 
 
 /**
@@ -998,7 +999,7 @@ function fetch_lines()
 /**
  *	Classe permettant la gestion des lignes d'intervention
  */
-class FichinterLigne
+class FichinterLigne extends CommonObjectLine
 {
 	var $db;
 	var $error;

diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
@@ -28,7 +28,7 @@
 /**
  *	Class to manage stock movements
  */
-class MouvementStock
+class MouvementStock extends CommonObject
 {
     var $error;
     var $db;

diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
@@ -116,7 +116,7 @@
 
 		if ($object->delete($user) > 0)
 		{
-			header("Location: index.php");
+			header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id);
 			exit;
 		}
 		else