Merge branch 'develop_of_consumption_selectbatch' of github.com:atm-lena/dolibarr into develop_of_consumption_selectbatch
This commit is contained in:
commit
c5b859759d
@ -34,7 +34,6 @@ $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";
|
||||||
@ -55,7 +54,6 @@ 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";
|
||||||
@ -76,8 +74,4 @@ if($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
print json_encode($res);
|
print json_encode($res);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user