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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-08-07 13:13:30 +02:00
commit fac878ca69
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/product/stock/product.php
View File

@ -48,8 +48,6 @@ $fieldid = isset($_GET["ref"])?'ref':'rowid';
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
$result=restrictedArea($user,'produit&stock',$id,'product&product','','',$fieldid); $result=restrictedArea($user,'produit&stock',$id,'product&product','','',$fieldid);
$mesg = '';
/* /*
* Actions * Actions
@ -65,9 +63,7 @@ if ($action == 'setstocklimit')
$product->seuil_stock_alerte=$stocklimit; $product->seuil_stock_alerte=$stocklimit;
$result=$product->update($product->id,$user,1,0,1); $result=$product->update($product->id,$user,1,0,1);
if ($result < 0) if ($result < 0)
{ setEventMessage($product->error, 'errors');
$mesg=join(',',$product->errors);
}
$action=''; $action='';
} }
@ -177,7 +173,7 @@ if ($action == "transfert_stock" && ! $cancel)
} }
else else
{ {
$mesg=$product->error; setEventMessage($product->error, 'errors');
$db->rollback(); $db->rollback();
} }
} }
@ -211,9 +207,6 @@ if ($id > 0 || $ref)
$form = new Form($db); $form = new Form($db);
if ($mesg) print($mesg);
dol_htmloutput_events();
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Ref // Ref