From eb73da5abc46401d940438553627a0db4346f771 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Oct 2021 12:04:43 +0200 Subject: [PATCH] Fix set origin. --- htdocs/mrp/class/api_mos.class.php | 4 +++- htdocs/mrp/mo_production.php | 3 ++- htdocs/product/inventory/inventory.php | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php index 59b4cbfa16b..e6068eb3c81 100644 --- a/htdocs/mrp/class/api_mos.class.php +++ b/htdocs/mrp/class/api_mos.class.php @@ -382,7 +382,9 @@ class Mos extends DolibarrApi if (!$error && $value["fk_warehouse"] > 0) { // Record stock movement $id_product_batch = 0; - $stockmove->origin = $this->mo; + + $stockmove->setOrigin($this->mo->element, $this->mo->id); + if ($qtytoprocess >= 0) { $moline = new MoLine($this->db); $moline->fk_mo = $this->mo->id; diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php index 510e7a433f4..533e81f80a2 100644 --- a/htdocs/mrp/mo_production.php +++ b/htdocs/mrp/mo_production.php @@ -211,7 +211,8 @@ if (empty($reshook)) { if (!$error && GETPOST('idwarehouse-'.$line->id.'-'.$i) > 0) { // Record stock movement $id_product_batch = 0; - $stockmove->origin = $object; + $stockmove->setOrigin($object->element, $object->id); + if ($qtytoprocess >= 0) { $idstockmove = $stockmove->livraison($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement); } else { diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php index c0b607cde45..9a4d61209ba 100644 --- a/htdocs/product/inventory/inventory.php +++ b/htdocs/product/inventory/inventory.php @@ -109,7 +109,7 @@ if ($action == 'cancel_record' && $permissiontoadd) { if ($action == 'update' && !empty($user->rights->stock->mouvement->creer)) { $stockmovment = new MouvementStock($db); - $stockmovment->origin = $object; + $stockmovment->setOrigin($object->element, $object->id); $db->begin(); @@ -117,6 +117,7 @@ if ($action == 'update' && !empty($user->rights->stock->mouvement->creer)) { $sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated'; $sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id'; $sql .= ' WHERE id.fk_inventory = '.((int) $object->id); + $resql = $db->query($sql); if ($resql) { $num = $db->num_rows($resql);