MMIEntrepots & MMIProduct : Extrafield categorie fk_entrepot_loc

htdocs/core/lib/pdf.lib.php

@@ -1701,6 +1701,16 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		if ($prodser->barcode)
 			$libelleproduitservice .= '__N__  Barcode: '.$prodser->barcode;
 	}
+	// Show Location
+	if (in_array($objecttype, ['Expedition']) && (true || !empty($conf->global->SHIPPING_PDF_LOCATION))) {
+		if (!empty($prodser->array_options['options_fk_categorie'])) {
+			include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+			$categorie = new Categorie($db);
+			$categorie->fetch($prodser->array_options['options_fk_categorie']);
+			$libelleproduitservice .= '__N__  Localisation: '.$categorie->label;
+			//var_dump($prodser->array_options['options_fk_categorie']); die();
+		}
+	}
 
 	// Now we convert \n into br
 	if (dol_textishtml($libelleproduitservice)) {

htdocs/custom/mmientrepots

@@ -1 +1 @@
-Subproject commit 6a531c5c5c0523e28342ef994868a3f25cbba3a6
+Subproject commit 74356533295810930d8e4a6290ed20a6adc00b2e

htdocs/custom/mmiproduct

@@ -1 +1 @@
-Subproject commit 3a543c71a0e7f05a902717b437ce254f3f0ba12e
+Subproject commit 0d3c581711fde41924ccbed93da28b4b576a2285