From 5905fd242591510e175f391e0166a0ac7610e10f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Aug 2023 11:56:50 +0200
Subject: [PATCH] The method get_substitutionarray_shipment_lines() has been
 removed. Use the generic get_substitutionarray_lines() instead.

---
 ChangeLog                                     |  2 +-
 .../core/class/commondocgenerator.class.php   | 57 -------------------
 .../doc/doc_generic_shipment_odt.modules.php  |  2 +-
 3 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 93561e57480..9abe10542a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,7 @@ WARNING:
 
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
 * The property ->brouillon has been removed from all classes. It was not reliable and was a duplicate of ->status == self::STATUS_DRAFT.
-
+* The method get_substitutionarray_shipment_lines() has been removed. Use the generic get_substitutionarray_lines() instead.
 
 
 
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index be92bcbdd7f..1c5fa9c3180 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -853,63 +853,6 @@ abstract class CommonDocGenerator
 	}
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Define array with couple substitution key => substitution value
-	 *  Note that vars into substitutions array are formatted.
-	 *
-	 *	@param  ExpeditionLigne	$line				Object line
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *	@return	array								Substitution array
-	 */
-	public function get_substitutionarray_shipment_lines($line, $outputlangs)
-	{
-		// phpcs:enable
-		dol_include_once('/core/lib/product.lib.php');
-
-		$resarray = array(
-			'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),
-			'line_product_ref'=>$line->product_ref,
-			'line_product_label'=>$line->product_label,
-			'line_desc'=>$line->desc,
-			'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
-			'line_up'=>price($line->subprice),
-			'line_total_up'=>price($line->subprice * $line->qty),
-			'line_qty'=>$line->qty,
-			'line_qty_shipped'=>$line->qty_shipped,
-			'line_qty_asked'=>$line->qty_asked,
-			'line_discount_percent'=>($line->remise_percent ? $line->remise_percent.'%' : ''),
-			'line_price_ht'=>price($line->total_ht),
-			'line_price_ttc'=>price($line->total_ttc),
-			'line_price_vat'=>price($line->total_tva),
-			'line_weight'=>empty($line->weight) ? '' : $line->weight * $line->qty_shipped.' '.measuringUnitString(0, 'weight', $line->weight_units),
-			'line_length'=>empty($line->length) ? '' : $line->length * $line->qty_shipped.' '.measuringUnitString(0, 'size', $line->length_units),
-			'line_surface'=>empty($line->surface) ? '' : $line->surface * $line->qty_shipped.' '.measuringUnitString(0, 'surface', $line->surface_units),
-			'line_volume'=>empty($line->volume) ? '' : $line->volume * $line->qty_shipped.' '.measuringUnitString(0, 'volume', $line->volume_units),
-		);
-
-		// Retrieve extrafields
-		$extrafieldkey = $line->element;
-		$array_key = "line";
-		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-		$extrafields = new ExtraFields($this->db);
-		$extrafields->fetch_name_optionals_label($extrafieldkey, true);
-		$line->fetch_optionals();
-
-		$resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
-
-		// Load product data optional fields to the line -> enables to use "line_product_options_{extrafield}"
-		if (isset($line->fk_product) && $line->fk_product > 0) {
-			$tmpproduct = new Product($this->db);
-			$tmpproduct->fetch($line->fk_product);
-			foreach ($tmpproduct->array_options as $key=>$label)
-				$resarray["line_product_".$key] = $label;
-		}
-
-		return $resarray;
-	}
-
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Define array with couple substitution key => substitution value
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index f990dabe767..d2ed52389d1 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -489,7 +489,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 					}
 					if ($foundtagforlines) {
 						foreach ($object->lines as $line) {
-							$tmparray = $this->get_substitutionarray_shipment_lines($line, $outputlangs);
+							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);