lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge conflict resolution

Browse Source
This commit is contained in:
altairis-noe 2021-04-29 13:08:24 +02:00
parent f7182d43fd
commit b04afc1753
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/dict.php
View File

@ -1978,10 +1978,10 @@ if ($id) {
$valuetoshow = $obj->state_code; $valuetoshow = $obj->state_code;
} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_product_nature') { } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_product_nature') {
$langs->load("products"); $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') { } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_productbatch_qcstatus') {
$langs->load("productbatch"); $langs->load("productbatch");
$valuetoshow = $langs->trans($obj->{$fieldlist[$field]}); $valuetoshow = $langs->trans($obj->{$value});
} }
$class .= ($class ? ' ' : '').'tddict'; $class .= ($class ? ' ' : '').'tddict';
if ($fieldlist[$field] == 'note' && $id == 10) { if ($fieldlist[$field] == 'note' && $id == 10) {

2
htdocs/langs/en_US/productbatch.lang
View File

@ -35,4 +35,4 @@ QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
#Traceability - qc status #Traceability - qc status
OutOfOrder=Out of order OutOfOrder=Out of order
InWorkingOrder=In working order InWorkingOrder=In working order

2
htdocs/langs/fr_FR/productbatch.lang
View File

@ -34,4 +34,4 @@ SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle s
#Traceability - qc status #Traceability - qc status
OutOfOrder=Hors d'usage OutOfOrder=Hors d'usage
InWorkingOrder=En état de marche InWorkingOrder=En état de marche