From 5c576d0ae59156c3952c507332c7359dc1c9183c Mon Sep 17 00:00:00 2001 From: atm-lena Date: Tue, 8 Mar 2022 11:21:04 +0100 Subject: [PATCH] FIX updateselectwarehousebybatch : request sql must take batch, no id + fix delete condition --- htdocs/mrp/ajax/interface.php | 4 ++-- htdocs/mrp/mo_production.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php index 62ee9785a8f..32c8a142a45 100644 --- a/htdocs/mrp/ajax/interface.php +++ b/htdocs/mrp/ajax/interface.php @@ -28,7 +28,7 @@ global $db, $langs; require '../../main.inc.php'; // Load $user and permissions $warehouse_id = GETPOST('warehouse_id', 'int'); -$batch_id = GETPOST('batch_id', 'int'); +$batch = GETPOST('batch', 'alphanohtml'); $fk_product = GETPOST('product_id', 'int'); $action = GETPOST('action', 'alphanohtml'); $permissiontoproduce = GETPOST('permissiontoproduce', 'int'); @@ -61,7 +61,7 @@ if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) { $sql .= " JOIN " . MAIN_DB_PREFIX . "product_stock as ps on ps.rowid = pb.fk_product_stock"; $sql .= " JOIN " . MAIN_DB_PREFIX . "entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (" . getEntity('stock') . ")"; $sql .= " WHERE ps.fk_product = " .((int) $fk_product); - if ($batch_id > 0) $sql.= " AND pb.batch = '" . ((int) $batch_id) . "'"; + if ($batch) $sql.= " AND pb.batch = '" . $batch . "'"; $sql .= " ORDER BY e.ref, pb.batch"; $resql = $db->query($sql); diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php index 777c869b4aa..e018085bcac 100644 --- a/htdocs/mrp/mo_production.php +++ b/htdocs/mrp/mo_production.php @@ -1419,7 +1419,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea data: { action: "updateselectwarehousebybatch", permissiontoproduce: , - batch_id: $(this).val(), + batch: $(this).val(), product_id: $("input[name='" + product_element_name + "']").val() } }).done(function (data) {