From 6ac39b97e4d2b5878c5105bb3b7674acc8e155a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Oct 2016 00:38:28 +0200
Subject: [PATCH] Fix restore list of attached files into action report
---
htdocs/admin/mails.php | 1 +
htdocs/comm/propal/card.php | 3 +++
htdocs/commande/card.php | 1 +
htdocs/compta/facture.php | 1 +
htdocs/expedition/card.php | 1 +
htdocs/fichinter/card.php | 1 +
htdocs/fourn/commande/card.php | 1 +
htdocs/fourn/facture/card.php | 1 +
htdocs/societe/soc.php | 1 +
htdocs/supplier_proposal/card.php | 1 +
10 files changed, 12 insertions(+)
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index a9a588ae4d7..0b56e15a4e3 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -89,6 +89,7 @@ $actiontypecode='';
$trigger_name='';
$paramname='id';
$mode='emailfortest';
+$trackid=(($action == 'testhtml')?"testhtml":"test");
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
if ($action == 'presend' && GETPOST('trackid') == 'test') $action='test';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 2d21c0049a1..da6cfdaf15f 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -26,11 +26,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
/**
* \file htdocs/comm/propal/card.php
* \ingroup propale
* \brief Page of commercial proposals card and list
*/
+
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
@@ -609,6 +611,7 @@ if (empty($reshook))
$trigger_name='PROPAL_SENTBYMAIL';
$paramname='id';
$mode='emailfromproposal';
+ $trackid='pro'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 3f1f440ce31..471b0216ee0 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1256,6 +1256,7 @@ if (empty($reshook))
$trigger_name='ORDER_SENTBYMAIL';
$paramname='id';
$mode='emailfromorder';
+ $trackid='ord'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index b2f1edc15c3..a5204f71522 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1781,6 +1781,7 @@ if (empty($reshook))
$trigger_name='BILL_SENTBYMAIL';
$paramname='id';
$mode='emailfrominvoice';
+ $trackid='inv'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 53bd4f469f0..2a480355214 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -551,6 +551,7 @@ if (empty($reshook))
$trigger_name='SHIPPING_SENTBYMAIL';
$paramname='id';
$mode='emailfromshipment';
+ $trackid='shi'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
}
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index b2c7a779d32..aeeb2959210 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -766,6 +766,7 @@ if (empty($reshook))
$trigger_name='FICHINTER_SENTBYMAIL';
$paramname='id';
$mode='emailfromintervention';
+ $trackid='int'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 41df1e4f311..f56d78075c6 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1159,6 +1159,7 @@ if (empty($reshook))
$trigger_name='ORDER_SUPPLIER_SENTBYMAIL';
$paramname='id';
$mode='emailfromsupplierorder';
+ $trackid='sor'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 2e0ef64f96f..7f3473f83a0 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -965,6 +965,7 @@ if (empty($reshook))
$trigger_name='BILL_SUPPLIER_SENTBYMAIL';
$paramname='id';
$mode='emailfromsupplierinvoice';
+ $trackid='sin'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 3d561275c38..120f9badace 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -712,6 +712,7 @@ if (empty($reshook))
$trigger_name='COMPANY_SENTBYMAIL';
$paramname='socid';
$mode='emailfromthirdparty';
+ $trackid='thi'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
// Actions to build doc
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 3cec12bac7d..ed44522f6b7 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -475,6 +475,7 @@ if (empty($reshook))
$trigger_name='SUPPLIER_PROPOSAL_SENTBYMAIL';
$paramname='id';
$mode='emailfromsupplierproposal';
+ $trackid='spr'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
--
GitLab