From 55298317e389bb7e87796c608d64666b4197203c Mon Sep 17 00:00:00 2001
From: VERDOL Gauthier <gauthier.verdol@atm-consulting.fr>
Date: Mon, 20 Jul 2020 16:22:48 +0200
Subject: [PATCH 1/4] FIX : wrong link to third invoice templates

---
 htdocs/comm/card.php                           | 2 +-
 htdocs/compta/facture/invoicetemplate_list.php | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 9130efabeeb..37c19525afa 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -1065,7 +1065,7 @@ if ($object->id > 0)
 				print '<table class="noborder centpercent lastrecordtable">';
 
 				print '<tr class="liste_titre">';
-				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LatestCustomerTemplateInvoices", ($num<=$MAXLIST?"":$MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'">'.$langs->trans("AllCustomerTemplateInvoices").' <span class="badge">'.$num.'</span></a></td>';
+				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LatestCustomerTemplateInvoices", ($num<=$MAXLIST?"":$MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/compta/facture/invoicetemplate_list.php?socid='.$object->id.'">'.$langs->trans("AllCustomerTemplateInvoices").' <span class="badge">'.$num.'</span></a></td>';
 				print '</tr></table></td>';
 				print '</tr>';
 			}
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 661f9604500..c030d0d5464 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -53,6 +53,8 @@ $cancel     = GETPOST('cancel', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
 $contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'invoicetemplatelist';   // To manage different context of search
 
+$socid = GETPOST('socid', 'int');
+
 // Security check
 $id=(GETPOST('facid', 'int')?GETPOST('facid', 'int'):GETPOST('id', 'int'));
 $lineid=GETPOST('lineid', 'int');
@@ -141,6 +143,11 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 	}
 }
 
+if ($socid > 0) {
+        $tmpthirdparty = new Societe($db);
+        $res = $tmpthirdparty->fetch($socid);
+        if ($res > 0) $search_societe = $tmpthirdparty->name;
+}
 
 /*
  * Actions

From e2592d90490b46ac251b767197a65ed5cc95971f Mon Sep 17 00:00:00 2001
From: Frans Bosman <frans@fbosman.nl>
Date: Wed, 22 Jul 2020 11:44:26 +0200
Subject: [PATCH 2/4] Update card_presend.tpl.php

Add hidden options for specific sender email-adress for Invoices, Shipments and Order-confirmations
---
 htdocs/core/tpl/card_presend.tpl.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index a8594ec1b62..aac72ce774f 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -131,6 +131,21 @@ if ($action == 'presend')
 	{
 		$formmail->fromid = $user->id;
 	}
+	if ($object->element === 'facture' && !empty($conf->global->INVOICE_EMAIL_SENDER)) {
+		$formmail->frommail = $conf->global->INVOICE_EMAIL_SENDER;
+		$formmail->fromname = '';
+		$formmail->fromtype = 'special';
+	}
+	if ($object->element === 'shipping' && !empty($conf->global->SHIPPING_EMAIL_SENDER)) {
+		$formmail->frommail = $conf->global->SHIPPING_EMAIL_SENDER;
+		$formmail->fromname = '';
+		$formmail->fromtype = 'special';
+	}
+	if ($object->element === 'commande' && !empty($conf->global->COMMANDE_EMAIL_SENDER)) {
+		$formmail->frommail = $conf->global->COMMANDE_EMAIL_SENDER;
+		$formmail->fromname = '';
+		$formmail->fromtype = 'special';
+	}
 	$formmail->trackid=$trackid;
 	if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
 	{

From 94498b191bb7c584be3df5a5adb0a827a35f877c Mon Sep 17 00:00:00 2001
From: Frans Bosman <frans@fbosman.nl>
Date: Fri, 24 Jul 2020 10:37:19 +0200
Subject: [PATCH 3/4] Update card_presend.tpl.php

---
 htdocs/core/tpl/card_presend.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index aac72ce774f..67de56e16fa 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -139,7 +139,7 @@ if ($action == 'presend')
 	if ($object->element === 'shipping' && !empty($conf->global->SHIPPING_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->SHIPPING_EMAIL_SENDER;
 		$formmail->fromname = '';
-		$formmail->fromtype = 'special';
+		$formmail->fromtype = 'special'; 
 	}
 	if ($object->element === 'commande' && !empty($conf->global->COMMANDE_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->COMMANDE_EMAIL_SENDER;

From 8273dbcd4948b79baac12f2d5d0f9adc95a8bf33 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 24 Jul 2020 08:39:09 +0000
Subject: [PATCH 4/4] Fixing style errors.

---
 htdocs/core/tpl/card_presend.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 67de56e16fa..aac72ce774f 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -139,7 +139,7 @@ if ($action == 'presend')
 	if ($object->element === 'shipping' && !empty($conf->global->SHIPPING_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->SHIPPING_EMAIL_SENDER;
 		$formmail->fromname = '';
-		$formmail->fromtype = 'special'; 
+		$formmail->fromtype = 'special';
 	}
 	if ($object->element === 'commande' && !empty($conf->global->COMMANDE_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->COMMANDE_EMAIL_SENDER;