From 22985e7b611733afb6c3689495e71765eba0f21b Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Wed, 18 Nov 2020 14:27:29 +0100
Subject: [PATCH] Revert "use barcode iso supplier_barcode"

This reverts commit 57705e225bce307f13e73063aea8b3cff8b4daee.
---
 .../fourn/class/fournisseur.product.class.php   | 17 +++++++++++------
 htdocs/product/fournisseurs.php                 | 10 +++++-----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 15a99a3f538..4f88e38e947 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -105,9 +105,14 @@ class ProductFournisseur extends Product
 	public $fourn_multicurrency_unitprice;
 
 	/**
-	 * @var string $fk_barcode_type - Supplier barcode type
+	 * @var string $supplier_barcode - Supplier barcode
 	 */
-	public $fk_barcode_type;
+	public $supplier_barcode;
+
+	/**
+	 * @var string $supplier_fk_barcode_type - Supplier barcode type
+	 */
+	public $supplier_fk_barcode_type;
 
 	/**
 	 *	Constructor
@@ -542,8 +547,8 @@ class ProductFournisseur extends Product
 				$this->fourn_multicurrency_id          = $obj->fk_multicurrency;
 				$this->fourn_multicurrency_code        = $obj->multicurrency_code;
 				if ($conf->barcode->enabled) {
-					$this->barcode = $obj->barcode;
-					$this->fk_barcode_type = $obj->fk_barcode_type;
+					$this->supplier_barcode = $obj->barcode;
+					$this->supplier_fk_barcode_type = $obj->fk_barcode_type;
 				}
 
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
@@ -656,8 +661,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 3771c0e7a07..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 '<tr>';
 					print '<td>'.$langs->trans('BarcodeValue').'</td>';
-					print '<td><input class="flat" name="barcode"  value="'.($rowid ? $object->barcode : '').'"></td>';
+					print '<td><input class="flat" name="barcode"  value="'.($rowid ? $object->supplier_barcode : '').'"></td>';
 					print '</tr>';
 					$formbarcode = new FormBarCode($db);
 
@@ -733,7 +733,7 @@ END;
 					print '<tr>';
 					print '<td>'.$langs->trans('BarcodeType').'</td>';
 					print '<td>';
-					print $formbarcode->selectBarcodeType(($rowid ? $object->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 '</td>';
 					print '</tr>';
 				}
@@ -1071,16 +1071,16 @@ END;
 						// Barcode
 						if (!empty($arrayfields['pfp.barcode']['checked'])) {
 							print '<td align="right">';
-							print $productfourn->barcode;
+							print $productfourn->supplier_barcode;
 							print '</td>';
 						}
 
 						// Barcode type
 						if (!empty($arrayfields['pfp.fk_barcode_type']['checked'])) {
 							print '<td class="center">';
-							$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 ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
+							print $productfourn->barcode_type_label ? $productfourn->barcode_type_label : ($productfourn->supplier_barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
 							print '</td>';
 						}