From 56fb6dce6199a36a3e6780ce517058bbb1406cdf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 13 Jan 2020 15:32:11 +0100
Subject: [PATCH] FIX #12756

---
 htdocs/core/modules/modExpedition.class.php       | 14 +++++++-------
 htdocs/core/modules/modSupplierProposal.class.php |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 96d3d3f45a5..93cd08c7001 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -65,8 +65,8 @@ class modExpedition extends DolibarrModules
 		                    "/expedition/sending/temp",
 		                    "/expedition/receipt",
 		                    "/expedition/receipt/temp",
-							"/doctemplates/shipment",
-							"/doctemplates/delivery"
+							"/doctemplates/shipments",
+							"/doctemplates/deliveries"
 		                    );
 
 		// Config pages
@@ -98,7 +98,7 @@ class modExpedition extends DolibarrModules
 
 		$this->const[$r][0] = "EXPEDITION_ADDON_PDF_ODT_PATH";
 		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/shipment";
+		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/shipments";
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 		$r++;
@@ -119,7 +119,7 @@ class modExpedition extends DolibarrModules
 
 		$this->const[$r][0] = "LIVRAISON_ADDON_PDF_ODT_PATH";
 		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/delivery";
+		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/deliveries";
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 		$r++;
@@ -127,7 +127,7 @@ class modExpedition extends DolibarrModules
 		$this->const[$r][0] = "MAIN_SUBMODULE_EXPEDITION";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "1";
-		$this->const[$r][3] = "Enable shipments";
+		$this->const[$r][3] = "Enable delivery receipts";
 		$this->const[$r][4] = 0;
 		$r++;
 
@@ -326,8 +326,8 @@ class modExpedition extends DolibarrModules
 		$this->remove($options);
 
 		//ODT template
-		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/shipment/template_shipment.odt';
-		$dirodt = DOL_DATA_ROOT.'/doctemplates/shipment';
+		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/shipments/template_shipment.odt';
+		$dirodt = DOL_DATA_ROOT.'/doctemplates/shipments';
 		$dest = $dirodt.'/template_shipment.odt';
 
 		if (file_exists($src) && !file_exists($dest))
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index c24c3787a9c..e2d071ac730 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -93,7 +93,7 @@ class modSupplierProposal extends DolibarrModules
 
 		$this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH";
 		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/supplier_proposal";
+		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/supplier_proposals";
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 
@@ -215,8 +215,8 @@ class modSupplierProposal extends DolibarrModules
 		$this->remove($options);
 
 		//ODT template
-		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/supplier_proposal/template_supplier_proposal.odt';
-		$dirodt=DOL_DATA_ROOT.'/doctemplates/supplier_proposal';
+		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/supplier_proposals/template_supplier_proposal.odt';
+		$dirodt=DOL_DATA_ROOT.'/doctemplates/supplier_proposals';
 		$dest=$dirodt.'/template_supplier_proposal.odt';
 
 		if (file_exists($src) && ! file_exists($dest))