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

Permission and correct merge conflict error

Browse Source
This commit is contained in:
atm-lena 2022-02-07 10:55:33 +01:00
parent dbe31d41ad
commit 19dd137462
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,8 +31,9 @@ $warehouse_id = GETPOST('warehouse_id', 'int');
$batch_id = GETPOST('batch_id', 'int'); $batch_id = GETPOST('batch_id', 'int');
$fk_product = GETPOST('product_id', 'int'); $fk_product = GETPOST('product_id', 'int');
$action = GETPOST('action', 'alphanohtml'); $action = GETPOST('action', 'alphanohtml');
$permissiontoproduce = GETPOST('permissiontoproduce', 'int');
if($action == 'updateselectbatchbywarehouse') { if($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
$TRes = array(); $TRes = array();
@ -53,7 +54,7 @@ if($action == 'updateselectbatchbywarehouse') {
} }
print json_encode($TRes); print json_encode($TRes);
} elseif($action == 'updateselectwarehousebybatch'){ } elseif($action == 'updateselectwarehousebybatch' && $permissiontoproduce){
$res = 0; $res = 0;

2
htdocs/mrp/mo_production.php
View File

@ -1364,6 +1364,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
url: "<?php echo DOL_URL_ROOT . '/mrp/ajax/interface.php'; ?>", url: "<?php echo DOL_URL_ROOT . '/mrp/ajax/interface.php'; ?>",
data: { data: {
action: "updateselectbatchbywarehouse", action: "updateselectbatchbywarehouse",
permissiontoproduce: <?php echo $permissiontoproduce ?>,
warehouse_id: $(this).val(), warehouse_id: $(this).val(),
product_id: $("input[name='" + product_element_name + "']").val() product_id: $("input[name='" + product_element_name + "']").val()
} }
@ -1418,6 +1419,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
url: "<?php echo DOL_URL_ROOT . '/mrp/ajax/interface.php'; ?>", url: "<?php echo DOL_URL_ROOT . '/mrp/ajax/interface.php'; ?>",
data: { data: {
action: "updateselectwarehousebybatch", action: "updateselectwarehousebybatch",
permissiontoproduce: <?php echo $permissiontoproduce ?>,
batch_id: $(this).val(), batch_id: $(this).val(),
product_id: $("input[name='" + product_element_name + "']").val() product_id: $("input[name='" + product_element_name + "']").val()
} }

12
htdocs/product/class/html.formproduct.class.php
View File

@ -655,13 +655,11 @@ class FormProduct
} }
foreach ($productIdArray as $productId) { foreach ($productIdArray as $productId) {
if (array_key_exists($productId, $this->cache_lot)) { foreach ($this->cache_lot[$productId] as $id => $arraytypes) {
foreach ($this->cache_lot[$productId] as $id => $arraytypes) { if (empty($fk_entrepot) || $fk_entrepot == $arraytypes['entrepot_id']) {
if (empty($fk_entrepot) || $fk_entrepot == $arraytypes['entrepot_id']) { $label = $arraytypes['entrepot_label'] . ' - ';
$label = $arraytypes['entrepot_label'] . ' - '; $label .= $arraytypes['batch'];
$label .= $arraytypes['batch']; $out .= '<option value="' . $arraytypes['batch'] . '">(' . $langs->trans('Stock Total') . ': ' . $arraytypes['qty'] . ')</option>';
$out .= '<option>' . $arraytypes['batch'] . '</option>';
}
} }
} }
} }