Selaa lähdekoodia

Normalize code

Laurent Destailleur 8 vuotta sitten
vanhempi
commit
c3f5962058

+ 1 - 0
htdocs/product/stock/card.php

@@ -111,6 +111,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->stock->su
 	$result=$object->delete($user);
 	if ($result > 0)
 	{
+	    setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		header("Location: ".DOL_URL_ROOT.'/product/stock/list.php');
 		exit;
 	}

+ 11 - 10
htdocs/product/stock/class/entrepot.class.php

@@ -214,20 +214,21 @@ class Entrepot extends CommonObject
 	/**
 	 *	Delete a warehouse
 	 *
-	 *	@param		User	$user		Object user that made deletion
-	 *	@return		int					<0 if KO, >0 if OK
+	 *	@param		User	$user		   Object user that made deletion
+	 *  @param      int     $notrigger     1=No trigger
+	 *	@return		int					   <0 if KO, >0 if OK
 	 */
-	function delete($user)
+	function delete($user, $notrigger=0)
 	{
 		$this->db->begin();
 
-			if (! $error && empty($notrigger))
-			{
-                // Call trigger
-                $result=$this->call_trigger('WAREHOUSE_DELETE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-			}
+		if (! $error && empty($notrigger))
+		{
+            // Call trigger
+            $result=$this->call_trigger('WAREHOUSE_DELETE',$user);
+            if ($result < 0) { $error++; }
+            // End call triggers
+		}
 		
 		$elements = array('stock_mouvement','product_stock','product_warehouse_properties');
 		foreach($elements as $table)

+ 1 - 1
test/phpunit/EntrepotTest.php

@@ -233,7 +233,7 @@ class EntrepotTest extends PHPUnit_Framework_TestCase
 		$localobject=new Entrepot($this->savdb);
     	$result=$localobject->fetch($id);
 
-    	$result=$localobject->delete($id);
+    	$result=$localobject->delete($user);
 		print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);