From 3e491b68799242f74a5f661bf5dfe37018b2a883 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Mon, 16 Nov 2020 18:07:39 +0100
Subject: [PATCH] Revert "Fix supplier barcode should be same in fetch and
 fetch list."

This reverts commit 5af557c9027f96a1e5bfe32a0905f5fe9eee2f52.
---
 .../fourn/class/fournisseur.product.class.php  | 18 ++++--------------
 htdocs/product/fournisseurs.php                | 10 +++++-----
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 4f88e38e947..264e015298d 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -104,16 +104,6 @@ class ProductFournisseur extends Product
 	public $fourn_multicurrency_price;
 	public $fourn_multicurrency_unitprice;
 
-	/**
-	 * @var string $supplier_barcode - Supplier barcode
-	 */
-	public $supplier_barcode;
-
-	/**
-	 * @var string $supplier_fk_barcode_type - Supplier barcode type
-	 */
-	public $supplier_fk_barcode_type;
-
 	/**
 	 *	Constructor
 	 *
@@ -547,8 +537,8 @@ class ProductFournisseur extends Product
 				$this->fourn_multicurrency_id          = $obj->fk_multicurrency;
 				$this->fourn_multicurrency_code        = $obj->multicurrency_code;
 				if ($conf->barcode->enabled) {
-					$this->supplier_barcode = $obj->barcode;
-					$this->supplier_fk_barcode_type = $obj->fk_barcode_type;
+					$this->fourn_barcode = $obj->barcode;
+					$this->fourn_fk_barcode_type = $obj->fk_barcode_type;
 				}
 
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
@@ -661,8 +651,8 @@ class ProductFournisseur extends Product
 				}
 
 				if ($conf->barcode->enabled) {
-					$prodfourn->supplier_barcode = $record["barcode"];
-					$prodfourn->supplier_fk_barcode_type = $record["fk_barcode_type"];
+					$prodfourn->barcode = $record["barcode"];
+					$prodfourn->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 f3ac7afbd58..5cb12b100f1 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->supplier_barcode : '').'"></td>';
+					print '<td><input class="flat" name="barcode"  value="'.($rowid ? $object->fourn_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->supplier_fk_barcode_type : $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE), 'fk_barcode_type', 1);
+					print $formbarcode->selectBarcodeType(($rowid ? $object->fourn_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->supplier_barcode;
+							print $productfourn->barcode;
 							print '</td>';
 						}
 
 						// Barcode type
 						if (!empty($arrayfields['pfp.fk_barcode_type']['checked'])) {
 							print '<td class="center">';
-							$productfourn->barcode_type = !empty($productfourn->supplier_fk_barcode_type) ? $productfourn->supplier_fk_barcode_type : 0;
+							$productfourn->barcode_type = !empty($productfourn->fk_barcode_type) ? $productfourn->fk_barcode_type : 0;
 							$productfourn->fetch_barcode();
-							print $productfourn->barcode_type_label ? $productfourn->barcode_type_label : ($productfourn->supplier_barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
+							print $productfourn->barcode_type_label ? $productfourn->barcode_type_label : ($productfourn->barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
 							print '</td>';
 						}