Merge pull request #179 from ATM-Consulting/FIX_exped_doc

PULL UP : FIX : DA024733 Can't download sending document
ATM-Consulting · Mar 28, 2024 · 2b055bd · 2b055bd
2 parents 2e09d47 + abef1ce
commit 2b055bd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -12,6 +12,7 @@ TODO : pour les options commencer à voir si possible de crééer des tab par el
 
 # RELEASE 1.43
 
+- FIX : DA024733 Can't download sending document - 1.43.2 - **28/03/2024**
 - FIX : Missing canonical url - 1.43.1 - **12/01/2024**
 - FIX : COMPAT V19 - 1.43.0 - **08/12/2023**
 - FIX : Handle Captcha inside EACCESS_ROOT_URL domain - 1.42.0 - **06/10/2023**

diff --git a/core/modules/modExternalAccess.class.php b/core/modules/modExternalAccess.class.php
@@ -61,7 +61,7 @@ public function __construct($db)
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
 		$this->description = "Ajoute un acces externe pour les clients";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = '1.43.1';
+		$this->version = '1.43.2';
 
 		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);

diff --git a/lib/externalaccess.lib.php b/lib/externalaccess.lib.php
@@ -933,7 +933,8 @@ function load_last_main_doc(&$object) {
 				$last_main_doc = $conf->propal->multidir_output[$object->entity].'/'.$ref.'/'.$ref.'.pdf';
 			}
 			elseif($object->element == 'shipping'){
-				$last_main_doc = $conf->expedition->multidir_output[$object->entity].'/'.$ref.'/'.$ref.'.pdf';
+
+				$last_main_doc = $conf->expedition->multidir_output[$object->entity].'/sending/'.$ref.'/'.$ref.'.pdf';
 			}
             elseif($object->element == 'invoice_supplier'){
                 $last_main_doc = $conf->supplier_invoice->multidir_output[$object->entity].'/'.$ref.'/'.$ref.'.pdf';

diff --git a/www/controllers/expeditions.controller.php b/www/controllers/expeditions.controller.php
@@ -220,7 +220,6 @@ public function print_expeditionTable($socId = 0)
 
 				load_last_main_doc($object);
 				$dowloadUrl = $context->getControllerUrl().'script/interface.php?action=downloadExpedition&id='.$object->id;
-
 				if(!empty($object->last_main_doc) && is_readable(DOL_DATA_ROOT.'/'.$object->last_main_doc) && is_file ( DOL_DATA_ROOT.'/'.$object->last_main_doc )){
 					$viewLink = '<a href="'.$dowloadUrl.'" target="_blank" >'.$object->ref.'</a>';
 					$downloadLink = '<a class="btn btn-xs btn-primary btn-strong" href="'.$dowloadUrl.'&amp;forcedownload=1" target="_blank" ><i class="fa fa-download"></i> '.$langs->trans('Download').'</a>';