From b04afc17538981a8b259b5cf0d1e397fd645eb4d Mon Sep 17 00:00:00 2001 From: altairis-noe Date: Thu, 29 Apr 2021 13:08:24 +0200 Subject: [PATCH] merge conflict resolution --- htdocs/admin/dict.php | 4 ++-- htdocs/langs/en_US/productbatch.lang | 2 +- htdocs/langs/fr_FR/productbatch.lang | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 2b331c0c175..06aad44d123 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -1978,10 +1978,10 @@ if ($id) { $valuetoshow = $obj->state_code; } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_product_nature') { $langs->load("products"); - $valuetoshow = $langs->trans($obj->{$fieldlist[$field]}); + $valuetoshow = $langs->trans($obj->{$value}); } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_productbatch_qcstatus') { $langs->load("productbatch"); - $valuetoshow = $langs->trans($obj->{$fieldlist[$field]}); + $valuetoshow = $langs->trans($obj->{$value}); } $class .= ($class ? ' ' : '').'tddict'; if ($fieldlist[$field] == 'note' && $id == 10) { diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang index 2a19be96cf6..756eb0a5947 100644 --- a/htdocs/langs/en_US/productbatch.lang +++ b/htdocs/langs/en_US/productbatch.lang @@ -35,4 +35,4 @@ QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned #Traceability - qc status OutOfOrder=Out of order -InWorkingOrder=In working order \ No newline at end of file +InWorkingOrder=In working order diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang index 49a249ce0e5..37ebb65135b 100644 --- a/htdocs/langs/fr_FR/productbatch.lang +++ b/htdocs/langs/fr_FR/productbatch.lang @@ -34,4 +34,4 @@ SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle s #Traceability - qc status OutOfOrder=Hors d'usage -InWorkingOrder=En état de marche \ No newline at end of file +InWorkingOrder=En état de marche