From 9936d8c559bc48e574489ea0b4b31534298f6017 Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Mon, 16 Nov 2020 17:54:52 +0100 Subject: [PATCH 1/4] Revert "doc for delivery_date" This reverts commit aed6afc3bff0386b343537e46a59cf8978ac455e. --- htdocs/commande/class/commande.class.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 6431f9a0487..6eb61c0f983 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) /** From 57705e225bce307f13e73063aea8b3cff8b4daee Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Mon, 16 Nov 2020 18:02:54 +0100 Subject: [PATCH 2/4] use barcode iso supplier_barcode --- .../fourn/class/fournisseur.product.class.php | 17 ++++++----------- htdocs/product/fournisseurs.php | 10 +++++----- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 4f88e38e947..15a99a3f538 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -105,14 +105,9 @@ class ProductFournisseur extends Product public $fourn_multicurrency_unitprice; /** - * @var string $supplier_barcode - Supplier barcode + * @var string $fk_barcode_type - Supplier barcode type */ - public $supplier_barcode; - - /** - * @var string $supplier_fk_barcode_type - Supplier barcode type - */ - public $supplier_fk_barcode_type; + public $fk_barcode_type; /** * Constructor @@ -547,8 +542,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->barcode = $obj->barcode; + $this->fk_barcode_type = $obj->fk_barcode_type; } if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) { @@ -661,8 +656,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..3771c0e7a07 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->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 ''; } From 22985e7b611733afb6c3689495e71765eba0f21b Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Wed, 18 Nov 2020 14:27:29 +0100 Subject: [PATCH 3/4] 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 ''; 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->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 aade8e7adbd2e207474adfc8e3d40116939ec16e Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Wed, 18 Nov 2020 14:58:04 +0100 Subject: [PATCH 4/4] Add deprecated fourn_barcode incase already used external. --- htdocs/fourn/class/fournisseur.product.class.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 4f88e38e947..fa0ec312088 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -104,11 +104,23 @@ 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 */ @@ -547,6 +559,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; // deprecated + $this->fourn_fk_barcode_type = $obj->barcode; // deprecated $this->supplier_barcode = $obj->barcode; $this->supplier_fk_barcode_type = $obj->fk_barcode_type; }