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

Merge branch 'develop_of_consumption_selectbatch' of github.com:atm-lena/dolibarr into develop_of_consumption_selectbatch

Browse Source
This commit is contained in:
atm-lena 2022-02-11 11:37:48 +01:00
commit c5b859759d
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/mrp/ajax/interface.php
View File

@ -33,8 +33,7 @@ $fk_product = GETPOST('product_id', 'int');
$action = GETPOST('action', 'alphanohtml'); $action = GETPOST('action', 'alphanohtml');
$permissiontoproduce = GETPOST('permissiontoproduce', 'int'); $permissiontoproduce = GETPOST('permissiontoproduce', 'int');
if($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) { if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
$TRes = array(); $TRes = array();
$sql = "SELECT pb.batch, pb.rowid, ps.fk_entrepot, pb.qty, e.ref as label, ps.fk_product"; $sql = "SELECT pb.batch, pb.rowid, ps.fk_entrepot, pb.qty, e.ref as label, ps.fk_product";
@ -54,8 +53,7 @@ if($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
} }
print json_encode($TRes); print json_encode($TRes);
} elseif($action == 'updateselectwarehousebybatch' && $permissiontoproduce){ } elseif ($action == 'updateselectwarehousebybatch' && $permissiontoproduce) {
$res = 0; $res = 0;
$sql = "SELECT pb.batch, pb.rowid, ps.fk_entrepot, e.ref, pb.qty"; $sql = "SELECT pb.batch, pb.rowid, ps.fk_entrepot, e.ref, pb.qty";
@ -68,16 +66,12 @@ if($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
$resql = $db->query($sql); $resql = $db->query($sql);
if($resql){ if ($resql) {
if($db->num_rows($resql) == 1){ if ($db->num_rows($resql) == 1) {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$res = $obj->fk_entrepot; $res = $obj->fk_entrepot;
} }
} }
print json_encode($res); print json_encode($res);
} }