diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index abd1f3baab9..60d87cc7759 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -559,7 +559,7 @@ class ProductFournisseur extends Product
$this->fourn_multicurrency_code = $obj->multicurrency_code;
if ($conf->barcode->enabled) {
$this->fourn_barcode = $obj->barcode; // deprecated
- $this->fourn_fk_barcode_type = $obj->barcode; // deprecated
+ $this->fourn_fk_barcode_type = $obj->fk_barcode_type; // deprecated
$this->supplier_barcode = $obj->barcode;
$this->supplier_fk_barcode_type = $obj->fk_barcode_type;
}
@@ -674,8 +674,8 @@ class ProductFournisseur extends Product
}
if ($conf->barcode->enabled) {
- $prodfourn->barcode = $record["barcode"];
- $prodfourn->fk_barcode_type = $record["fk_barcode_type"];
+ $prodfourn->supplier_barcode = $record["barcode"];
+ $prodfourn->supplier_fk_barcode_type = $record["fk_barcode_type"];
}
if (!empty($conf->dynamicprices->enabled) && !empty($prodfourn->fk_supplier_price_expression)) {
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 5cb12b100f1..f3ac7afbd58 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -725,7 +725,7 @@ END;
// Option to define a transport cost on supplier price
print '
';
print '| '.$langs->trans('BarcodeValue').' | ';
- print ' | ';
+ print ' | ';
print '
';
$formbarcode = new FormBarCode($db);
@@ -733,7 +733,7 @@ END;
print '';
print '| '.$langs->trans('BarcodeType').' | ';
print '';
- print $formbarcode->selectBarcodeType(($rowid ? $object->fourn_fk_barcode_type : $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE), 'fk_barcode_type', 1);
+ print $formbarcode->selectBarcodeType(($rowid ? $object->supplier_fk_barcode_type : $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE), 'fk_barcode_type', 1);
print ' | ';
print '
';
}
@@ -1071,16 +1071,16 @@ END;
// Barcode
if (!empty($arrayfields['pfp.barcode']['checked'])) {
print '';
- print $productfourn->barcode;
+ print $productfourn->supplier_barcode;
print ' | ';
}
// Barcode type
if (!empty($arrayfields['pfp.fk_barcode_type']['checked'])) {
print '';
- $productfourn->barcode_type = !empty($productfourn->fk_barcode_type) ? $productfourn->fk_barcode_type : 0;
+ $productfourn->barcode_type = !empty($productfourn->supplier_fk_barcode_type) ? $productfourn->supplier_fk_barcode_type : 0;
$productfourn->fetch_barcode();
- print $productfourn->barcode_type_label ? $productfourn->barcode_type_label : ($productfourn->barcode ? ''.$langs->trans("SetDefaultBarcodeType").' ' : '');
+ print $productfourn->barcode_type_label ? $productfourn->barcode_type_label : ($productfourn->supplier_barcode ? ' '.$langs->trans("SetDefaultBarcodeType").' ' : '');
print ' | ';
}