From 5af557c9027f96a1e5bfe32a0905f5fe9eee2f52 Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Mon, 16 Nov 2020 17:36:53 +0100 Subject: [PATCH 1/3] Fix supplier barcode should be same in fetch and fetch list. Refactor fourn to supplier for barcode --- .../fourn/class/fournisseur.product.class.php | 18 ++++++++++++++---- htdocs/product/fournisseurs.php | 10 +++++----- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 264e015298d..4f88e38e947 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -104,6 +104,16 @@ 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 * @@ -537,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->fourn_barcode = $obj->barcode; - $this->fourn_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)) { @@ -651,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 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 ''; } From aed6afc3bff0386b343537e46a59cf8978ac455e Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Mon, 16 Nov 2020 17:37:38 +0100 Subject: [PATCH 2/3] doc for delivery_date --- htdocs/commande/class/commande.class.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 6eb61c0f983..6431f9a0487 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -182,10 +182,13 @@ class Commande extends CommonOrder /** * @var int Date expected for delivery - * @deprecated + * @deprecated Use delivery_date instead. */ - public $date_livraison; // deprecated; Use delivery_date instead. + public $date_livraison; + /** + * @var int Date expected for delivery + */ public $delivery_date; // Date expected of shipment (date starting shipment, not the reception that occurs some days after) /** From 3e491b68799242f74a5f661bf5dfe37018b2a883 Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Mon, 16 Nov 2020 18:07:39 +0100 Subject: [PATCH 3/3] 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 ''; 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->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 ''; print ''; } @@ -1071,16 +1071,16 @@ END; // Barcode if (!empty($arrayfields['pfp.barcode']['checked'])) { print ''; - print $productfourn->supplier_barcode; + print $productfourn->barcode; print ''; } // Barcode type if (!empty($arrayfields['pfp.fk_barcode_type']['checked'])) { print ''; - $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 ? '
'.$langs->trans("SetDefaultBarcodeType").'
' : ''); + print $productfourn->barcode_type_label ? $productfourn->barcode_type_label : ($productfourn->barcode ? '
'.$langs->trans("SetDefaultBarcodeType").'
' : ''); print ''; }