diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index cf3d8bbd82c..3f6c9d956a5 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -182,13 +182,10 @@ class Commande extends CommonOrder
 
 	/**
 	 * @var int	Date expected for delivery
-	 * @deprecated Use delivery_date instead.
+	 * @deprecated
 	 */
-	public $date_livraison;
+	public $date_livraison;	// deprecated; Use delivery_date instead.
 
-	/**
-	 * @var int	Date expected for delivery
-	 */
 	public $delivery_date; // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
 
 	/**
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 264e015298d..1bc3e160e50 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -104,6 +104,29 @@ class ProductFournisseur extends Product
 	public $fourn_multicurrency_price;
 	public $fourn_multicurrency_unitprice;
 
+	/**
+	 * @deprecated
+	 * @see $supplier_barcode
+	 */
+	public $fourn_barcode;
+
+	/**
+	 * @var string $supplier_barcode - Supplier barcode
+	 */
+	public $supplier_barcode;
+
+	/**
+	 * @deprecated
+	 * @see $supplier_fk_barcode_type
+	 */
+	public $fourn_fk_barcode_type;
+
+	/**
+	 * @var string $supplier_fk_barcode_type - Supplier barcode type
+	 */
+	public $supplier_fk_barcode_type;
+
+  
 	/**
 	 *	Constructor
 	 *
@@ -118,8 +141,6 @@ class ProductFournisseur extends Product
 		$this->reputations = array('-1'=>'', 'FAVORITE'=>$langs->trans('Favorite'), 'NOTTHGOOD'=>$langs->trans('NotTheGoodQualitySupplier'), 'DONOTORDER'=>$langs->trans('DoNotOrderThisProductToThisSupplier'));
 	}
 
-
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Remove all prices for this couple supplier-product
@@ -537,8 +558,10 @@ class ProductFournisseur extends Product
 				$this->fourn_multicurrency_id          = $obj->fk_multicurrency;
 				$this->fourn_multicurrency_code        = $obj->multicurrency_code;
 				if ($conf->barcode->enabled) {
-					$this->fourn_barcode = $obj->barcode;
-					$this->fourn_fk_barcode_type = $obj->fk_barcode_type;
+					$this->fourn_barcode = $obj->barcode; // deprecated
+					$this->fourn_fk_barcode_type = $obj->barcode; // deprecated
+					$this->supplier_barcode = $obj->barcode;
+					$this->supplier_fk_barcode_type = $obj->fk_barcode_type;
 				}
 
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 9c4a5320c58..c7cfb2c0899 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -207,7 +207,8 @@ if ($action == 'valid' && $user->rights->facture->creer)
 			dol_htmloutput_errors($langs->trans("InvoiceIsAlreadyValidated", "TakePos"), null, 1);
 		}
 	} elseif (count($invoice->lines) == 0) {
-		dol_syslog("Sale without lines");
+		$error++;
+		dol_syslog('Sale without lines');
 		dol_htmloutput_errors($langs->trans("NoLinesToBill", "TakePos"), null, 1);
 	} elseif (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1") {
 		$savconst = $conf->global->STOCK_CALCULATE_ON_BILL;