From 704266445c267e0484f46e8e7b923b7ffe8521f7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 1 Jun 2022 19:45:46 +0200 Subject: [PATCH] Debug v16 --- htdocs/langs/en_US/stocks.lang | 4 ++-- htdocs/product/stats/bom.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 5df6510c929..dbd15ec4da2 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -272,8 +272,8 @@ QtyWasAddedToTheScannedBarcode=Success !! The quantity was added to all the requ StockChangeDisabled=Change on stock disabled NoWarehouseDefinedForTerminal=No warehouse defined for terminal ClearQtys=Clear all quantities -ModuleStockTransferName=Stocks Transfer -ModuleStockTransferDesc=Creation of stocks transfer objects, with generation of transfer sheet +ModuleStockTransferName=Advanced Stock Transfer +ModuleStockTransferDesc=Advanced management of Stock Transfer, with generation of transfer sheet StockTransferNew=New stocks transfer StockTransferList=Stocks transfers list ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with reference %s ? diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php index 1937b99b871..a8e76a178bf 100644 --- a/htdocs/product/stats/bom.php +++ b/htdocs/product/stats/bom.php @@ -199,7 +199,7 @@ if ($id > 0 || !empty($ref)) { $sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid"; $sql .= " WHERE b.entity IN (".getEntity('bom').")"; $sql .= " AND bl.fk_product = ".((int) $product->id); - $sql .= " GROUP BY b.rowid, b.ref, b.date_valid, b.status"; + $sql .= " GROUP BY b.rowid, b.ref, b.status, b.date_valid, b.fk_product"; $sql .= $db->order($sortfield, $sortorder); // Count total nb of records