From d69f08e48930294c3449b3ec8344cc46390c3d90 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Sep 2020 01:24:05 +0200 Subject: [PATCH] WIP --- htdocs/langs/en_US/stocks.lang | 1 + htdocs/product/inventory/inventory.php | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index a681304acf4..70bd81f45b2 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -238,5 +238,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future CurrentStock=Current stock InventoryRealQtyHelp=Set value to 0 to reset qty
Keep field empty, or remove line, to keep unchanged +UpdateByScaning=Update by scaning UpdateByScaningProductBarcode=Update by scan (product barcode) UpdateByScaningLot=Update by scan (lot|serial barcode) diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php index a93b31dcd46..d3fa04d4e11 100644 --- a/htdocs/product/inventory/inventory.php +++ b/htdocs/product/inventory/inventory.php @@ -341,16 +341,16 @@ if ($object->id > 0) { if ($permissiontoadd) { - //print ''.$langs->trans("AddLine").''; - + /* if ($conf->barcode->enabled) { print ''.$langs->trans("UpdateByScaningProductBarcode").''; } if ($conf->productbatch->enabled) { print ''.$langs->trans('UpdateByScaningLot').''; + }*/ + if ($conf->barcode->enabled || $conf->productbatch->enabled) { + print ''.$langs->trans("UpdateByScaning").''; } - - //print ''.$langs->trans("Save").''."\n"; } else { print ''.$langs->trans('Save').''."\n"; }