From f1d68c201b6169bc6f8d19df2e7806e96f003cf2 Mon Sep 17 00:00:00 2001 From: altairis-noe Date: Tue, 20 Apr 2021 16:56:15 +0200 Subject: [PATCH] conflict resolution --- htdocs/langs/en_US/productbatch.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang index 92c224b55f5..aedf85a4fb8 100644 --- a/htdocs/langs/en_US/productbatch.lang +++ b/htdocs/langs/en_US/productbatch.lang @@ -32,3 +32,4 @@ CustomMasks=Adds an option to define mask in the product card LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned +