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

Normalize code

Browse Source
This commit is contained in:
Laurent Destailleur 2016-09-28 18:14:44 +02:00
parent 142a2e34db
commit c3f5962058
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/product/stock/card.php
View File

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

21
htdocs/product/stock/class/entrepot.class.php
View File

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

2
test/phpunit/EntrepotTest.php
View File

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