From 637e1a8d211a65c0c0cee59868df80e40d44ddb0 Mon Sep 17 00:00:00 2001
From: mikee2 <mikee2@users.noreply.github.com>
Date: Sat, 6 May 2017 10:49:37 +0200
Subject: [PATCH 01/28] Update Segment.php

Add additional needed fields so that you can invoice yearly items. Have number and text descriptions to avoid future changes that may break existing invoices.
---
 htdocs/includes/odtphp/Segment.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
index 81e9dad9f97..4310c716ee7 100644
--- a/htdocs/includes/odtphp/Segment.php
+++ b/htdocs/includes/odtphp/Segment.php
@@ -170,8 +170,16 @@ class Segment implements IteratorAggregate, Countable
     {
         global $langs;
 
-        $patterns=array( '__CURRENTDAY__','__CURRENTDAYTEXT__','__CURRENTMONTHSHORT__','__CURRENTMONTH__','__CURRENTYEAR__' );
-        $values=array( date('j'), $langs->trans(date('l')), $langs->trans(date('M')), $langs->trans(date('F')), date('Y') );
+        $nextMonth = strtotime('+1 month');
+
+        $patterns=array( '/__CURRENTDAY__/u','/__CURRENTDAYTEXT__/u',
+                         '/__CURRENTMONTH__/u','/__CURRENTMONTHSHORT__/u','/__CURRENTMONTHLONG__/u',
+                         '/__NEXTMONTH__/u','/__NEXTMONTHSHORT__/u','/__NEXTMONTHLONG__/u',
+                         '/__CURRENTYEAR__/u','/__NEXTYEAR__/u' );
+        $values=array( date('j'), $langs->trans(date('l')), 
+                       $langs->trans(date('n')), $langs->trans(date('M')), $langs->trans(date('F')), 
+                       $langs->trans(date('n', $nextMonth)), $langs->trans(date('M', $nextMonth)), $langs->trans(date('F', $nextMonth)), 
+                       date('Y'), date('Y', strtotime('+1 year')) );
 
         $text=preg_replace($patterns, $values, $text);
 

From 6a350470200b224261d20817d3a5159095e2f104 Mon Sep 17 00:00:00 2001
From: mikee2 <mikee2@users.noreply.github.com>
Date: Wed, 14 Jun 2017 12:53:29 +0200
Subject: [PATCH 02/28] Updated to use dolibarr timme functions

Redefined macro strings to adapt to dolibarr date functions return values. Keep same macro names when possible to avoid breaking existing code. Some macro holders (not commonly used) have been dropped because non existing values in dolibarr date functions.

Per eldy request changed php date functions with dolibarr's internal date functions to match users time zone. Now dates are those of the user's timezone so check that is is correctly defined in user's profile.
---
 htdocs/includes/odtphp/Segment.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
index 4310c716ee7..d015d6ad263 100644
--- a/htdocs/includes/odtphp/Segment.php
+++ b/htdocs/includes/odtphp/Segment.php
@@ -170,16 +170,17 @@ class Segment implements IteratorAggregate, Countable
     {
         global $langs;
 
-        $nextMonth = strtotime('+1 month');
-
-        $patterns=array( '/__CURRENTDAY__/u','/__CURRENTDAYTEXT__/u',
-                         '/__CURRENTMONTH__/u','/__CURRENTMONTHSHORT__/u','/__CURRENTMONTHLONG__/u',
-                         '/__NEXTMONTH__/u','/__NEXTMONTHSHORT__/u','/__NEXTMONTHLONG__/u',
+        $hoy = dol_getdate(dol_now('tzuser'));
+        $nextMonth = dol_get_next_month($hoy['mon'], $hoy['year'])['month'];
+        
+        $patterns=array( '/__CURRENTDAY__/u','/__CURENTWEEKDAY__/u',
+                         '/__CURRENTMONTH__/u','/__CURRENTMONTHLONG__/u',
+                         '/__NEXTMONTH__/u','/__NEXTMONTHLONG__/u',
                          '/__CURRENTYEAR__/u','/__NEXTYEAR__/u' );
-        $values=array( date('j'), $langs->trans(date('l')), 
-                       $langs->trans(date('n')), $langs->trans(date('M')), $langs->trans(date('F')), 
-                       $langs->trans(date('n', $nextMonth)), $langs->trans(date('M', $nextMonth)), $langs->trans(date('F', $nextMonth)), 
-                       date('Y'), date('Y', strtotime('+1 year')) );
+        $values=array( $hoy['mday'], $langs->trans($hoy['weekday']), 
+                       $hoy['mon'], $langs->trans($hoy['month']), 
+                       $nextMonth, monthArray($langs)[$nextMonth], 
+                       $hoy['year'], $hoy['year']+1 );
 
         $text=preg_replace($patterns, $values, $text);
 

From 5643d4e867557f134daf56f64564f91203496107 Mon Sep 17 00:00:00 2001
From: tysauron <tysauron@gmail.com>
Date: Tue, 19 Sep 2017 17:26:18 +0200
Subject: [PATCH 03/28] Rename "->fk_action"   in  "->type_id"

(is old name)
---
 htdocs/comm/action/class/actioncomm.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index cb6da443404..ec1c84dd652 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -754,7 +754,7 @@ class ActionComm extends CommonObject
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
         $sql.= " SET percent = '".$this->db->escape($this->percentage)."'";
-        if ($this->fk_action > 0) $sql.= ", fk_action = '".$this->db->escape($this->fk_action)."'";
+        if ($this->type_id > 0) $sql.= ", fk_action = '".$this->db->escape($this->type_id)."'";
         $sql.= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'":"null");
         $sql.= ", datep = ".(strval($this->datep)!='' ? "'".$this->db->idate($this->datep)."'" : 'null');
         $sql.= ", datep2 = ".(strval($this->datef)!='' ? "'".$this->db->idate($this->datef)."'" : 'null');

From 8bb3130aab8ba7d0ae6600c2efdec472bf8796b4 Mon Sep 17 00:00:00 2001
From: tysauron <tysauron@gmail.com>
Date: Wed, 20 Sep 2017 00:35:52 +0200
Subject: [PATCH 04/28] For use ajax select company

---
 htdocs/projet/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 97f9ff41d54..1146ba49b80 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -528,7 +528,7 @@ if ($action == 'create' && $user->rights->projet->creer)
         print '</td><td class="maxwidthonsmartphone">';
         $filteronlist='';
         if (! empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist=$conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
-       	$text=$form->select_thirdparty_list(GETPOST('socid','int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), '', 0, 0, 'minwidth300');
+       	$text=$form->select_company(GETPOST('socid','int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300');
         if (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) && empty($conf->dol_use_jmobile))
         {
         	$texthelp=$langs->trans("IfNeedToUseOhterObjectKeepEmpty");
@@ -747,7 +747,7 @@ elseif ($object->id > 0)
             print '</td><td>';
     	    $filteronlist='';
     	    if (! empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist=$conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
-            $text=$form->select_thirdparty_list($object->thirdparty->id, 'socid', $filteronlist, 'None', 1, 0, array(), '', 0, 0, 'minwidth300');
+            $text=$form->select_company($object->thirdparty->id, 'socid', $filteronlist, 'None', 1, 0, array(), 0, 'minwidth300');
 	        if (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) && empty($conf->dol_use_jmobile))
 		    {
 	            $texthelp=$langs->trans("IfNeedToUseOhterObjectKeepEmpty");

From 3220225af3377ec32ecabcce2da9852cedfffdd0 Mon Sep 17 00:00:00 2001
From: tysauron <tysauron@gmail.com>
Date: Wed, 20 Sep 2017 00:53:48 +0200
Subject: [PATCH 05/28] Bug get socid with old object sosciete

---
 htdocs/projet/tasks/contact.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 3d834fe28b6..6cdbc204749 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -397,7 +397,7 @@ if ($id > 0 || ! empty($ref))
 
 				print '<td colspan="1">';
 				$thirdpartyofproject=$projectstatic->getListContactId('thirdparty');
-				$selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$projectstatic->societe->id;
+				$selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$projectstatic->socid;
 				$selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', $thirdpartyofproject, 0, '&withproject='.$withproject);
 				print '</td>';
 

From 1314e00bc642b3085755865b621c7310b0c297d2 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 20 Sep 2017 14:46:51 +0200
Subject: [PATCH 06/28] Fix: check if array and check empty value if required

---
 htdocs/core/class/extrafields.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 12d958b6ebb..53327f67a15 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1708,7 +1708,7 @@ class ExtraFields
 				if (! empty($onlykey) && $key != $onlykey) continue;
 
 				$key_type = $this->attribute_type[$key];
-				if($this->attribute_required[$key] && !GETPOST("options_$key",2))
+				if ($this->attribute_required[$key] && empty($_POST["options_".$key])) // Check if empty without GETPOST, value can be alpha, int, array, etc...
 				{
 					$nofillrequired++;
 					$error_field_required[] = $value;
@@ -1721,7 +1721,7 @@ class ExtraFields
 				}
 				else if (in_array($key_type,array('checkbox','chkbxlst')))
 				{
-					$value_arr=GETPOST("options_".$key);
+					$value_arr=GETPOST("options_".$key, 'array'); // check if an array
 					if (!empty($value_arr)) {
 						$value_key=implode($value_arr,',');
 					}else {
@@ -1740,7 +1740,7 @@ class ExtraFields
 				$object->array_options["options_".$key]=$value_key;
 			}
 
-			if($nofillrequired) {
+			if ($nofillrequired) {
 				$langs->load('errors');
 				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ',$error_field_required), null, 'errors');
 				return -1;

From 1d6213ea7d829767834ebe5486e7ef8422c65546 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 Sep 2017 15:29:47 +0200
Subject: [PATCH 07/28] Add picto for cheque payment

---
 htdocs/public/payment/newpayment.php |   2 +-
 htdocs/theme/common/cheque.png       | Bin 0 -> 2483 bytes
 htdocs/theme/eldy/style.css.php      |  26 +++++++++-----------------
 htdocs/theme/md/style.css.php        |   6 ++++--
 4 files changed, 14 insertions(+), 20 deletions(-)
 create mode 100644 htdocs/theme/common/cheque.png

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 72ad0390cce..62f82bc33d1 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -602,7 +602,7 @@ print $text;
 // Output payment summary form
 print '<tr><td align="center">';
 print '<table with="100%" id="tablepublicpayment">';
-print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
+print '<tr><td align="left" colspan="2" class="opacitymedium">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
 
 $found=false;
 $error=0;
diff --git a/htdocs/theme/common/cheque.png b/htdocs/theme/common/cheque.png
new file mode 100644
index 0000000000000000000000000000000000000000..34b89a1e1d010a5fc6246970393cecced8228904
GIT binary patch
literal 2483
zcmV;k2~75hP)<h;3K|Lk000e1NJLTq0049V003kN1^@s6S4<SV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;RzHC8ZADJ^}_%F02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00|pOL_t(|+U=ct>>O1U$3L^b
z<=2*4i@ZcAEttw1g<ye#pruiRyh%tffG7!2AsUUuN0f*Vj21{B5){*fhw>_v0^yyI
z5RkXLA%zeWLjkomk%uk){r0!lKkl9U&febHojW_TGdp{~$!2HnJa*=M@44sPbI-jC
z0RbtoB@hKM3^zUv`~>(AQ0DVAaBvXK@Zox3y&$q}J_?usE(#(V4$J_au}E}%CV?*o
zaaA8@q#!fa)ZYhjRUdCS2vxuaV4ZcW1<Vd2t2S(Vsep@tJ%P_Tj$a!@HXMY$4J-#{
zTF39TNPQoe8^l&!oD6&e_@v|5w!mW+p;N#~L2T7QWcr(Px_G?{fomLHn7G;fOAuo<
zFbB8~_&4wZu(Ngi+rUdk3snz~ci$k+@^PIYN&#n@^7+O#rs=-K*FGD>nLipCn%fv{
z;2pF5u4i{d883K`KtZ{L{!VOv46HTVE#Q35d(8rl4iuD+2ZgiqBT+uj1QXgGpAUjK
z%f}*ND>qrq@x2~)G`6MR4I(WUvw_zIA?Jx>hi4%4-5}EPaj76~Eif*Qz2!;j1h6!S
zv|P*-q)pN}fPHiZE&X#4Y5Dk-aE|^Y%I5<A@N|w8o5z3y28;#hRFjyHUBt1=Gid46
zL8RrP2|S8>SZskOp>5zJV4EP;a&dwnZauJ_IChsOsZ&gc5(7%aI$=vs73I5R(9)-Z
zILpV0g3vcb`8Ya-)7LpVAc(YFY;A%AF(I-~xh#Wo^l}hs`M5=BscbeQbP(T%)J?$W
zgGkH8d_mg(fc?a=3o~fxWkICn<1V44zqSGm>j|SULx(R2P26A|Tb02%S{6iFE@lC*
z2ts}=j(weMqc9;HSTfEN#I3UkdEJxL7I173Y58aw;#$C0MfsQLoe5}X*{=%XEFYH$
za_$r5TLP~+NNgD==p5iG2dT4yNXx}ert1<DvQq-t3b+|Kj_CpNxeh{a4<b#EG*jls
zfGdH+Os9X!l*LfM8sIchb`Nl*x&LiUPkq=KJyyEPc(LmpzxN!lzqv2yjE22{znT3d
zz#oDCqO%s2cn(ZiTp^m~J1&dNd1Io&G{p7tSY*Bt_eGR7%sG*Deq7!%+f&waO1WY^
zvwV-XI7f+RKN&sauP^U)jip(x&(|DY?UZRw8`k|?TK!w#RfnCOqBD_f8`A=)5&ayR
zM|b4q6x|Gaq~umpenA(_-yS`%-R|KqJ#W?Km7e|Dx_lIH$RG%90~>*TQa0&_0T1Dx
z%#`#ZOT_g{@gJJ23!#g<k=4l29?t}BvdUBfxeI|K1fgkgrPzMR*wj&6HYXYsp~`6J
ztB!!cnZOld{~B~YQsi;(-GPHdSqKdl+~nF#!=wq{#es$o(Npwed?!P*DMw+pK+hTv
zHnboOwKZxC_>6GbKVf;oD-*gc-Eg+po<vV?46Bt5fKZnWh0e)M8-RyB?>8I0AV-X_
zOwND_waML;=|r-4wG>|sJI90(LC;UUJ7{S+gvKOZD)yfTp73;z<^V@o4p)FdGlQ$F
zfWI3Xh83EkOPLI5?ST%|1AGtot7j!V!vrn>{spW+kLDCn0iy)-5hav$>#il4q$r_W
z89(GxUC!;>%Uw(I3Mg6ouP<fr_I4Z*r8|hubuDu7a-$y3PCxkAc)Y$fZ^eiZ+8%@r
z&D#mNBtuiUl+K~KfD)XdBy2Jo=TlL(08R-M=0m6|;91Vka7_sRRkX<ky*k<bp4aS3
zXY{F#hz3DuQO5t;43*^%!6~XHp`ho;_>RIX0KQyfLY0rXYvir+Ilwpa6VaK^RClx3
z_jsrp@C)3Dj{f-IH1x8rqhLb^Ho%={py5`}mSG(D>4-GB?K}uo1J>FV8D9G5HP+I?
zHMD5E`XYKdzt8WC0pA<}4IL^kSK{0ZmF$>Nj}<g?)W~skBG_(5TjJrRIGbE13pd1l
zWk&m*Oed4Qi2lbWpMPUI(%Sz%aJuyy@||46V={}~b&V~THl5k`QnMoKTV~SBYsb)&
zq*wOKely3KG;YZJY#;adp&)e9I7f>-nw?qbto;Yf{(pcS60UcRFS-a$GoI;E0Q-8?
zLw57>Xo91ZLV5;0zXWt9-<~D_;Cirr>}$NpMvU3$6~>gu^*0M!8V!-7G?C!JE;9Z^
zT-go<9`EOe<jm|M2Dp3S0{kZmH>eNfg43m?apsBT==@tB>{Vl@C>nM`H=r}^BM$)_
zSR+E)J~p&U<DuQ~OJhsZlDY#UimC<{Tv+09?)(r~s6L)WPkk6QLYs9ZRH36s@1<xV
zwyF`KQ*|X2^i=!<*?grk8+BS4J1Rn*RmvY;$n<}pML9W7aj;>H*?$K;2!2DC`_FYW
z!CT{w3Mn>^?AY7gu1k_v<k(I+Co=E1aiHyU56l5p(_iQ>2{VDSm>yQU(R|;KveGQ4
z+N+Yy0KR43r<XECgCcYi9Z~wIAp5xtxC0%ZjY<8A(N_DVTh{(t=;<7JwHhi#Q<&zQ
zn4mH7UcJns>X*>80@#S2Dp-_Vj?nQ=iL=mC3s140(@tUe1)b{x4a$l0v40bJbX%G!
z1)282S|vCPrvm>3ejrGD((zn_ezwY@=-Fp^5jzhZB7CG~UalRSUpy!qT6Q0GEqWo2
zy1~mSY7kI$c-j6y=<sQ1E~70)PWTPTQR%Yg<%U&928XF4Y-rHX>S$=+frYwi=<(?I
zt`b22nR1%6qDj(zQoPn)WLaJ#_a8y8F4LEWHb=PTuddkh{08`03S}Y>LhEQVuOc~T
z7fXYZ%6pC2bX&Vgo;!wK5v}iTOWIg&9c|{hL-L%tr=SFnwpxUSNYN;Hxmmj{0Ylv6
z+BdDMO|2>>ite_|Ku=csK>UE57MP^rip{4FMkG(`vtK}^Xg%ycp=+vNWc59ho|T0A
z+POfzDz`10ZYy>wM;~<mBDyUS+oD&ZRuyidq8#o~1yiGp0!dl7iwG=)KbR{IeK)xg
zI&UX9M%6$w5ASs`us1rhPkA<NwteW8&x&PRUG~dm;~HI>Upszk$7{RUI6J>KX{By?
xUmUhJ>D^s_#^>@kVw<{}9P)Pq0s_jw{{h9JxNccM6oLQ%002ovPDHLkV1ffXjZy#r

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a83d2ed9dd8..1c991f9ccd7 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -344,48 +344,40 @@ input.buttongen {
 	vertical-align: middle;
 }
 input.buttonpayment {
-	width: 300px;
+	min-width: 280px;
 	margin-bottom: 15px;
 	background-image: none;
 	line-height: 24px;
 	padding: 8px;
+	background: none;
+	border: 2px solid #666666;
 }
 input.buttonpaymentcb {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png',1) ?>);
 	background-size: 26px;
 	background-repeat: no-repeat;
-	background-position: 5px 5px;
+	background-position: 2px 11px;
 }
 input.buttonpaymentcheque {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/common/cheque.png',1) ?>);
-	background-repeat: no-repeat;
-	background-position: 8px 7px;
-}
-input.buttonpaymentcb {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png',1) ?>);
 	background-size: 24px;
 	background-repeat: no-repeat;
-	background-position: 5px 4px;
-}
-input.buttonpaymentcheque {
-	background-image: url(<?php echo dol_buildpath($path.'/paypal/img/object_paypal.png',1) ?>);
-	background-repeat: no-repeat;
-	background-position: 5px 4px;
+	background-position: 2px 8px;
 }
 input.buttonpaymentpaypal {
 	background-image: url(<?php echo dol_buildpath($path.'/paypal/img/object_paypal.png',1) ?>);
 	background-repeat: no-repeat;
-	background-position: 8px 7px;
+	background-position: 8px 11px;
 }
 input.buttonpaymentpaybox {
 	background-image: url(<?php echo dol_buildpath($path.'/paybox/img/object_paybox.png',1) ?>);
 	background-repeat: no-repeat;
-	background-position: 8px 7px;
+	background-position: 8px 11px;
 }
 input.buttonpaymentstripe {
 	background-image: url(<?php echo dol_buildpath($path.'/stripe/img/object_stripe.png',1) ?>);
 	background-repeat: no-repeat;
-	background-position: 8px 7px;
+	background-position: 8px 11px;
 }
 /* Used by timesheets */
 span.timesheetalreadyrecorded input {
@@ -3147,7 +3139,7 @@ div.titre {
 	/* text-shadow: 1px 1px 2px #FFFFFF; */
 }
 
-#dolpaymenttable { width: 600px; font-size: 13px; }
+#dolpaymenttable { max-width: 600px; font-size: 16px; }
 #tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; }
 #tablepublicpayment .CTableRow1  { background-color: #F0F0F0 !important; }
 #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 0f3711bf45b..1ed9b433be7 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -341,11 +341,13 @@ input.buttongen {
 	vertical-align: middle;
 }
 input.buttonpayment {
-	width: 300px;
+	min-width: 280px;
 	margin-bottom: 15px;
 	background-image: none;
 	line-height: 24px;
 	padding: 8px;
+	background: none;
+	border: 2px solid #666666;
 }
 input.buttonpaymentcb {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png',1) ?>);
@@ -3237,7 +3239,7 @@ div.titre {
 	<?php print (empty($conf->dol_optimize_smallscreen)?'':'margin-top: 4px;'); ?>
 }
 
-#dolpaymenttable { width: 600px; font-size: 13px; }
+#dolpaymenttable { max-width: 600px; font-size: 16px; }
 #tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; }
 #tablepublicpayment .CTableRow1  { background-color: #F0F0F0 !important; }
 #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }

From 577c64cc3735d6db8f75ee7efbe1767b606b7dfa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 Sep 2017 17:23:36 +0200
Subject: [PATCH 08/28] WIP work on param download on payment page

---
 htdocs/compta/facture/class/facture.class.php | 17 +++++++++++++++++
 htdocs/public/payment/newpayment.php          | 16 ++++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 76b41f3ce86..41cc8042144 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1051,6 +1051,23 @@ class Facture extends CommonInvoice
 		else return -1;
 	}
 
+	/**
+	 * Return link to download file from a direct external access
+	 *
+	 * @param	int				$withpicto			Add download picto into link
+	 * @return	string			HTML link to file
+	 */
+	function getDirectExternalLink($withpicto=0)
+	{
+		// Define $urlwithroot
+		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+		$url='eee';
+		return '<a href="'.$urlwithroot.'/document.php?modulepart=invoice&" target="_download" rel="noindex, nofollow">'.$this->ref.'</a>';
+	}
+
 	/**
 	 *      Return clicable link of object (with eventually picto)
 	 *
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 62f82bc33d1..0c8fbbc733d 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -808,7 +808,7 @@ if ($source == 'invoice')
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '<input type="hidden" name="creditor" value="'.dol_escape_htmltag($creditor).'">';
     print '</td></tr>'."\n";
 
 	// Debitor
@@ -821,8 +821,8 @@ if ($source == 'invoice')
 	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
-	print '<input type="hidden" name="ref" value="'.$invoice->ref.'">';
+	print '<input type="hidden" name="source" value="'.dol_escape_htmltag(GETPOST("source",'alpha')).'">';
+	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($invoice->ref).'">';
 	print '</td></tr>'."\n";
 
 	// Amount
@@ -846,13 +846,21 @@ if ($source == 'invoice')
 	print '</td></tr>'."\n";
 
 	// Tag
-
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
 
+	// Add download link
+	if (GETPOST('download','int') > 0)
+	{
+		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Document");
+		print '</td><td class="CTableRow'.($var?'1':'2').'">';
+		print $invoice->getDirectExternalLink(1);
+		print '</td></tr>'."\n";
+	}
+
     // Shipping address
     $shipToName=$invoice->thirdparty->name;
     $shipToStreet=$invoice->thirdparty->address;

From 2f317c583400dfeb326364acd530ba9d1a98b117 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 Sep 2017 19:34:14 +0200
Subject: [PATCH 09/28] Debug online payment using unique form

---
 htdocs/public/payment/newpayment.php | 55 ++++++++++++++--------------
 htdocs/public/payment/paymentko.php  |  2 +-
 htdocs/public/payment/paymentok.php  |  5 +--
 htdocs/theme/eldy/style.css.php      |  4 +-
 htdocs/theme/md/style.css.php        |  5 ++-
 5 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 0c8fbbc733d..faf40e17067 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -66,21 +66,21 @@ $suffix=GETPOST("suffix",'aZ09');
 $amount=price2num(GETPOST("amount",'alpha'));
 if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
 else $currency=GETPOST("currency",'alpha');
-$source = GETPOST("source",'alpha');
+$source = GETPOST("s",'alpha')?GETPOST("s",'alpha'):GETPOST("source",'alpha');
 
 if (! $action)
 {
-    if (! GETPOST("amount",'alpha') && ! GETPOST("source",'alpha'))
+    if (! GETPOST("amount",'alpha') && ! $source)
     {
     	print $langs->trans('ErrorBadParameters')." - amount or source";
     	exit;
     }
-    if (is_numeric($amount) && ! GETPOST("tag",'alpha') && ! GETPOST("source",'alpha'))
+    if (is_numeric($amount) && ! GETPOST("tag",'alpha') && ! $source)
     {
     	print $langs->trans('ErrorBadParameters')." - tag or source";
     	exit;
     }
-    if (GETPOST("source",'alpha') && ! GETPOST("ref",'alpha'))
+    if ($source && ! GETPOST("ref",'alpha'))
     {
     	print $langs->trans('ErrorBadParameters')." - ref";
     	exit;
@@ -111,7 +111,6 @@ $urlok=$urlwithroot.'/public/payment/paymentok.php?';
 $urlko=$urlwithroot.'/public/payment/paymentko.php?';
 
 // Complete urls for post treatment
-$SOURCE=GETPOST("source",'alpha');
 $ref=$REF=GETPOST('ref','alpha');
 $TAG=GETPOST("tag",'alpha');
 $FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
@@ -123,10 +122,10 @@ if (! empty($suffix))
 	$urlok.='suffix='.urlencode($suffix).'&';
 	$urlko.='suffix='.urlencode($suffix).'&';
 }
-if (! empty($SOURCE))
+if ($source)
 {
-    $urlok.='source='.urlencode($SOURCE).'&';
-    $urlko.='source='.urlencode($SOURCE).'&';
+    $urlok.='s='.urlencode($source).'&';
+    $urlko.='s='.urlencode($source).'&';
 }
 if (! empty($REF))
 {
@@ -143,15 +142,16 @@ if (! empty($FULLTAG))
     $urlok.='fulltag='.urlencode($FULLTAG).'&';
     $urlko.='fulltag='.urlencode($FULLTAG).'&';
 }
+/* This make url too long. Seems not required into the back url
 if (! empty($SECUREKEY))
 {
     $urlok.='securekey='.urlencode($SECUREKEY).'&';
     $urlko.='securekey='.urlencode($SECUREKEY).'&';
-}
+}*/
 if (! empty($entity))
 {
-	$urlok.='entity='.urlencode($entity).'&';
-	$urlko.='entity='.urlencode($entity).'&';
+	$urlok.='e='.urlencode($entity).'&';
+	$urlko.='e='.urlencode($entity).'&';
 }
 $urlok=preg_replace('/&$/','',$urlok);  // Remove last &
 $urlko=preg_replace('/&$/','',$urlko);  // Remove last &
@@ -223,7 +223,7 @@ if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 {
     if (! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
     {
-        if ($SOURCE && $REF) $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $SOURCE . $REF, 2);    // Use the source in the hash to avoid duplicates if the references are identical
+        if ($source && $REF) $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $source . $REF, 2);    // Use the source in the hash to avoid duplicates if the references are identical
         else $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
     }
     else
@@ -340,13 +340,14 @@ if ($action == 'dopayment')
 		elseif (empty($email))            $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
 		elseif (! isValidEMail($email))   $mesg=$langs->trans("ErrorBadEMail",$email);
 		elseif (! $origfulltag)           $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
-		elseif (dol_strlen($urlok) > 150) $mesg='Error urlok too long '.$urlok;
-		elseif (dol_strlen($urlko) > 150) $mesg='Error urlko too long '.$urlko;
+		elseif (dol_strlen($urlok) > 150) $mesg='Error urlok too long '.$urlok.'( Paybox requires 150, found '.strlen($urlok).')';
+		elseif (dol_strlen($urlko) > 150) $mesg='Error urlko too long '.$urlko.'( Paybox requires 150, found '.strlen($urlok).')';
 
 		if (empty($mesg))
 		{
 			dol_syslog("newpayment.php call paybox api and do redirect", LOG_DEBUG);
 
+			include_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
 			print_paybox_redirect($PRICE, $conf->currency, $email, $urlok, $urlko, $FULLTAG);
 
 			session_destroy();
@@ -499,10 +500,10 @@ $conf->dol_hide_leftmenu=1;
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 // Check link validity
-if (! empty($SOURCE) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
+if ($source && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
 {
     $langs->load("errors");
-    dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $SOURCE, $ref));
+    dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
     llxFooter();
     $db->close();
     exit;
@@ -528,7 +529,7 @@ print '<input type="hidden" name="action" value="dopayment">'."\n";
 print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
 print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
 print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
-print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print '<input type="hidden" name="e" value="'.$entity.'" />';
 print "\n";
 print '<!-- Form to send a payment -->'."\n";
 print '<!-- creditor = '.$creditor.' -->'."\n";
@@ -709,8 +710,8 @@ if ($source == 'order')
 	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
-	print '<input type="hidden" name="ref" value="'.$order->ref.'">';
+	print '<input type="hidden" name="s" value="'.dol_escape_htmltag($source).'">';
+	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($order->ref).'">';
 	print '</td></tr>'."\n";
 
 	// Amount
@@ -821,7 +822,7 @@ if ($source == 'invoice')
 	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.dol_escape_htmltag(GETPOST("source",'alpha')).'">';
+	print '<input type="hidden" name="s" value="'.dol_escape_htmltag($source).'">';
 	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($invoice->ref).'">';
 	print '</td></tr>'."\n";
 
@@ -1004,8 +1005,8 @@ if ($source == 'contractline')
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
-	print '<input type="hidden" name="ref" value="'.$contractline->ref.'">';
+	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
+	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($contractline->ref).'">';
 	print '</td></tr>'."\n";
 
 	// Quantity
@@ -1146,8 +1147,8 @@ if ($source == 'membersubscription')
 	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
-	print '<input type="hidden" name="ref" value="'.$member->ref.'">';
+	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
+	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($member->ref).'">';
 	print '</td></tr>'."\n";
 
 	if ($member->last_subscription_date || $member->last_subscription_amount)
@@ -1272,7 +1273,7 @@ if ($action != 'dopayment')
         if (! empty($conf->stripe->enabled))
         {
         	// If STRIPE_PICTO_FOR_PAYMENT is 'cb' we show a picto of a crdit card instead of stripe
-        	print '<br><input class="button buttonpayment buttonpayment'.(empty($conf->global->STRIPE_PICTO_FOR_PAYMENT)?'stripe':$conf->global->STRIPE_PICTO_FOR_PAYMENT).'" type="submit" name="dopayment__stripe" value="'.$langs->trans("StripeDoPayment").'">';
+        	print '<br><input class="button buttonpayment buttonpayment'.(empty($conf->global->STRIPE_PICTO_FOR_PAYMENT)?'stripe':$conf->global->STRIPE_PICTO_FOR_PAYMENT).'" type="submit" name="dopayment_stripe" value="'.$langs->trans("StripeDoPayment").'">';
         }
 
     	if (! empty($conf->paypal->enabled))
@@ -1365,12 +1366,12 @@ if (preg_match('/^dopayment/',$action))
 		print '<input type="hidden" name="dopayment_stripe" value="1">'."\n";
 		print '<input type="hidden" name="action" value="charge">'."\n";
 		print '<input type="hidden" name="tag" value="'.$TAG.'">'."\n";
-		print '<input type="hidden" name="source" value="'.$SOURCE.'">'."\n";
+		print '<input type="hidden" name="s" value="'.$source.'">'."\n";
 		print '<input type="hidden" name="ref" value="'.$REF.'">'."\n";
 		print '<input type="hidden" name="fulltag" value="'.$FULLTAG.'">'."\n";
 		print '<input type="hidden" name="suffix" value="'.$suffix.'">'."\n";
 		print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
-		print '<input type="hidden" name="entity" value="'.$entity.'" />';
+		print '<input type="hidden" name="e" value="'.$entity.'" />';
 		print '<input type="hidden" name="amount" value="'.$amount.'">'."\n";
 		print '<input type="hidden" name="currency" value="'.$currency.'">'."\n";
 
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index cbea7db650f..bdc301a0dce 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -31,7 +31,7 @@ define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 // TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+$entity=(! empty($_GET['e']) ? (int) $_GET['e'] : (! empty($_POST['e']) ? (int) $_POST['e'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 29d2b78d142..7ccd95abcdf 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -31,7 +31,7 @@ define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 // TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+$entity=(! empty($_GET['e']) ? (int) $_GET['e'] : (! empty($_POST['e']) ? (int) $_POST['e'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
@@ -76,7 +76,7 @@ if (! empty($conf->paypal->enabled))
 
 $FULLTAG=GETPOST('FULLTAG');
 if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
-$source=GETPOST('source');
+$source=GETPOST('s','alpha')?GETPOST('s','alpha'):GETPOST('source','alpha');
 $ref=GETPOST('ref');
 
 $suffix=GETPOST("suffix",'aZ09');
@@ -145,7 +145,6 @@ $conf->dol_hide_leftmenu=1;
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 
-
 // Show message
 print '<span id="dolpaymentspan"></span>'."\n";
 print '<div id="dolpaymentdiv" align="center">'."\n";
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 1c991f9ccd7..e6bf4d8233a 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1084,7 +1084,7 @@ div.fiche {
 	<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
 }
 body.onlinepaymentbody div.fiche {	/* For online payment page */
-	margin: 40px !important;
+	margin: 20px !important;
 }
 div.fiche>table:first-child {
 	margin-bottom: 15px !important;
@@ -3139,7 +3139,7 @@ div.titre {
 	/* text-shadow: 1px 1px 2px #FFFFFF; */
 }
 
-#dolpaymenttable { max-width: 600px; font-size: 16px; }
+#dolpaymenttable { min-width: 310px; font-size: 16px; }	/* Width must have min to make stripe input area visible */
 #tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; }
 #tablepublicpayment .CTableRow1  { background-color: #F0F0F0 !important; }
 #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 1ed9b433be7..64210218799 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1120,6 +1120,9 @@ div.fiche {
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
 	margin-bottom: 15px;
 }
+body.onlinepaymentbody div.fiche {	/* For online payment page */
+	margin: 20px !important;
+}
 div.fichecenter {
 	width: 100%;
 	clear: both;	/* This is to have div fichecenter that are true rectangles */
@@ -3239,7 +3242,7 @@ div.titre {
 	<?php print (empty($conf->dol_optimize_smallscreen)?'':'margin-top: 4px;'); ?>
 }
 
-#dolpaymenttable { max-width: 600px; font-size: 16px; }
+#dolpaymenttable { min-width: 320px; font-size: 16px; }	/* Width must have min to make stripe input area visible */
 #tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; }
 #tablepublicpayment .CTableRow1  { background-color: #F0F0F0 !important; }
 #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }

From 0eb416d4afd3a4aeee16bfae41dea2223e3e5dd1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 Sep 2017 20:41:40 +0200
Subject: [PATCH 10/28] Fix removal of a file

---
 htdocs/ecm/docfile.php               | 26 +++++++++++----------
 htdocs/ecm/index.php                 | 34 +++++++++++++---------------
 htdocs/langs/en_US/ecm.lang          |  3 ++-
 htdocs/public/payment/newpayment.php |  3 ++-
 4 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php
index 192240b4943..29f1b21a321 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/docfile.php
@@ -19,12 +19,12 @@
  *	\file      	htdocs/ecm/docfile.php
  *	\ingroup   	ecm
  *	\brief     	Card of a file for ECM module
- *	\author		Laurent Destailleur
  */
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
+require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
 
@@ -103,11 +103,9 @@ if (! empty($_GET["fileid"]))
 
 
 
-/*******************************************************************
- * ACTIONS
- *
- * Put here all code to do according to value of "action" parameter
- ********************************************************************/
+/*
+ * Actions
+ */
 
 if ($action == 'cancel')
 {
@@ -166,11 +164,9 @@ if ($action == 'update')
 
 
 
-/*******************************************************************
- * PAGE
- *
- * Put here all code to do according to value of "action" parameter
- ********************************************************************/
+/*
+ * View
+ */
 
 llxHeader();
 
@@ -253,6 +249,13 @@ print dol_print_size($totalsize);
 print '</td></tr>';
 */
 
+$filepath=$relativepath.$file->label;
+
+print '<tr><td>'.$langs->trans("HashSaved").'</td><td>';
+$ecmfile = new EcmFiles($db);
+print $filepath;
+print '</td></tr>';
+
 // Define $urlwithroot
 $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
 $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
@@ -264,7 +267,6 @@ $forcedownload=1;
 $rellink='/document.php?modulepart='.$modulepart;
 if ($forcedownload) $rellink.='&attachment=1';
 if (! empty($object->entity)) $rellink.='&entity='.$object->entity;
-$filepath=$relativepath.$file->label;
 $rellink.='&file='.urlencode($filepath);
 $fulllink=$urlwithroot.$rellink;
 print img_picto('','object_globe.png').' ';
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 94b1781ab81..77fb16f5afd 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -143,26 +143,24 @@ if ($action == 'confirm_deletefile')
 {
     if (GETPOST('confirm') == 'yes')
     {
+    	// GETPOST('urlfile','alpha') is full relative URL from ecm root dir. Contains path of all sections.
+		//var_dump(GETPOST('urlfile'));exit;
     	$langs->load("other");
-    	if ($section)
-    	{
-	    	$result=$ecmdir->fetch($section);
-	    	if (! ($result > 0))
-	    	{
-	    		dol_print_error($db,$ecmdir->error);
-	    		exit;
-	    	}
-	    	$relativepath=$ecmdir->getRelativePath();
-    	}
-    	else $relativepath='';
+
     	$upload_dir = $conf->ecm->dir_output.($relativepath?'/'.$relativepath:'');
-    	$file = $upload_dir . "/" . GETPOST('urlfile');	// Do not use urldecode here ($_GET and $_POST are already decoded by PHP).
+    	$file = $upload_dir . "/" . GETPOST('urlfile','alpha');	// Do not use urldecode here ($_GET and $_POST are already decoded by PHP).
+		//var_dump($file);exit;
 
-    	$ret=dol_delete_file($file);
-    	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-    	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-
-    	$result=$ecmdir->changeNbOfFiles('-');
+    	$ret=dol_delete_file($file);	// This include also the delete from file index in database.
+    	if ($ret)
+    	{
+    		setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile','alpha')), null, 'mesgs');
+    		$result=$ecmdir->changeNbOfFiles('-');
+    	}
+    	else
+    	{
+    		setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile','alpha')), null, 'errors');
+    	}
 
     	clearstatcache();
     }
@@ -375,7 +373,7 @@ else
     print '</a>';
 }
 $url=((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))?'#':($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module?'&amp;module='.$module:'').($section?'&amp;section='.$section:'')));
-print '<a href="'.$url.'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('Refresh')).'">';
+print '<a href="'.$url.'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
 print '<img id="refreshbutton" class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/view-refresh.png">';
 print '</a>';
 
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index 5f651413301..a238a8cd384 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -41,4 +41,5 @@ ECMDirectoryForFiles=Relative directory for files
 CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
 ECMFileManager=File manager
 ECMSelectASection=Select a directory on left tree...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory.
+DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
+ReSyncListOfDir=Resync list of directories
\ No newline at end of file
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index faf40e17067..52aa5950a92 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -67,6 +67,7 @@ $amount=price2num(GETPOST("amount",'alpha'));
 if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
 else $currency=GETPOST("currency",'alpha');
 $source = GETPOST("s",'alpha')?GETPOST("s",'alpha'):GETPOST("source",'alpha');
+$download = GETPOST('d','int')?GETPOST('d','int'):GETPOST('download','int');
 
 if (! $action)
 {
@@ -854,7 +855,7 @@ if ($source == 'invoice')
 	print '</td></tr>'."\n";
 
 	// Add download link
-	if (GETPOST('download','int') > 0)
+	if ($download > 0)
 	{
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Document");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">';

From beac7a7439e9aa638c568b658550de4a55063ece Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 Sep 2017 21:29:27 +0200
Subject: [PATCH 11/28] Work on direct download links

---
 htdocs/core/lib/files.lib.php       |  2 +-
 htdocs/ecm/class/ecmfiles.class.php |  2 +-
 htdocs/ecm/docfile.php              | 36 +++++++++++++++++++++++++----
 htdocs/langs/en_US/ecm.lang         |  4 +++-
 htdocs/langs/en_US/main.lang        |  3 ++-
 5 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 238728068c9..83259aa41d2 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1537,7 +1537,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
     					    $ecmfile=new EcmFiles($db);
     					    $ecmfile->filepath = $rel_dir;
     					    $ecmfile->filename = $filename;
-    					    $ecmfile->label = md5_file(dol_osencode($destfull));
+    					    $ecmfile->label = md5_file(dol_osencode($destfull));	// MD5 of file content
     					    $ecmfile->fullpath_orig = $TFile['name'][$i];
     					    $ecmfile->gen_or_uploaded = 'uploaded';
     					    $ecmfile->description = '';    // indexed content
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index f1090757dad..abe5c403462 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -46,7 +46,7 @@ class EcmFiles //extends CommonObject
 
 	/**
 	 */
-	public $label;
+	public $label;					// hash of file md5_file(dol_osencode($destfull)), so MD5 of file content
 	public $entity;
 	public $filename;
 	public $filepath;
diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php
index 29f1b21a321..045c3ebda8b 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/docfile.php
@@ -249,11 +249,23 @@ print dol_print_size($totalsize);
 print '</td></tr>';
 */
 
+$relativetodocument = 'ecm/'.$relativepath;		// $relativepath is relative to ECM dir, we need relative to document
 $filepath=$relativepath.$file->label;
+$filepathtodocument=$relativetodocument.$file->label;
 
 print '<tr><td>'.$langs->trans("HashSaved").'</td><td>';
 $ecmfile = new EcmFiles($db);
-print $filepath;
+//$filenametosearch=basename($filepath);
+//$filedirtosearch=basedir($filepath);
+$ecmfile->fetch(0, '', $filepathtodocument);
+if (! empty($ecmfile->label))
+{
+	print $ecmfile->label;
+}
+else
+{
+	print img_warning().' '.$langs->trans("FileNotYetIndexedInDatabase");
+}
 print '</td></tr>';
 
 // Define $urlwithroot
@@ -261,6 +273,19 @@ $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($
 $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
+print '<tr><td>'.$langs->trans("DirectDownloadInternalLink").'</td><td>';
+$modulepart='ecm';
+$forcedownload=1;
+$rellink='/document.php?modulepart='.$modulepart;
+if ($forcedownload) $rellink.='&attachment=1';
+if (! empty($object->entity)) $rellink.='&entity='.$object->entity;
+$rellink.='&file='.urlencode($filepath);
+$fulllink=$urlwithroot.$rellink;
+print img_picto('','object_globe.png').' ';
+print '<input type="text" class="quatrevingtpercent" id="downloadinternallink" name="downloadinternellink" value="'.dol_escape_htmltag($fulllink).'">';
+print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';
+print '</td></tr>';
+
 print '<tr><td>'.$langs->trans("DirectDownloadLink").'</td><td>';
 $modulepart='ecm';
 $forcedownload=1;
@@ -269,12 +294,15 @@ if ($forcedownload) $rellink.='&attachment=1';
 if (! empty($object->entity)) $rellink.='&entity='.$object->entity;
 $rellink.='&file='.urlencode($filepath);
 $fulllink=$urlwithroot.$rellink;
-print img_picto('','object_globe.png').' ';
-print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadlink" value="'.dol_escape_htmltag($fulllink).'">';
-print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';
+// TODO
+//print img_picto('','object_globe.png').' ';
+//print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
+//print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';
 print '</td></tr>';
+
 print '</table>';
 
+print ajax_autoselect('downloadinternallink');
 print ajax_autoselect('downloadlink');
 
 dol_fiche_end();
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index a238a8cd384..f7c0f0ab737 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -42,4 +42,6 @@ CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some
 ECMFileManager=File manager
 ECMSelectASection=Select a directory on left tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
-ReSyncListOfDir=Resync list of directories
\ No newline at end of file
+ReSyncListOfDir=Resync list of directories
+HashSaved=Hash of file
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
\ No newline at end of file
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 1b92d87e9ba..dfe38b7fe65 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -792,7 +792,8 @@ GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>. 
-DirectDownloadLink=Direct download link
+DirectDownloadLink=Direct download link (public/external)
+DirectDownloadInternalLink=Direct download link (need to be logged and permissions)
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year

From e56840b9ec668e95647b707c186b2cc1f073de82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 Sep 2017 11:35:18 +0200
Subject: [PATCH 12/28] Clean deprecated code

---
 htdocs/comm/action/card.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 7b1c81af59c..b491c9007cb 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -397,7 +397,7 @@ if ($action == 'update')
 		$datep=dol_mktime($fulldayevent?'00':$aphour, $fulldayevent?'00':$apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
 		$datef=dol_mktime($fulldayevent?'23':$p2hour, $fulldayevent?'59':$p2min, $fulldayevent?'59':'0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
 
-		$object->fk_action   = dol_getIdFromCode($db, GETPOST("actioncode"), 'c_actioncomm');
+		$object->type_id     = dol_getIdFromCode($db, GETPOST("actioncode"), 'c_actioncomm');
 		$object->label       = GETPOST("label");
 		$object->datep       = $datep;
 		$object->datef       = $datef;
@@ -407,8 +407,6 @@ if ($action == 'update')
 		$object->location    = GETPOST('location');
 		$object->socid       = GETPOST("socid");
 		$object->contactid   = GETPOST("contactid",'int');
-		//$object->societe->id = $_POST["socid"];			// deprecated
-		//$object->contact->id = $_POST["contactid"];		// deprecated
 		$object->fk_project  = GETPOST("projectid",'int');
 		$object->note        = GETPOST("note");
 		$object->pnote       = GETPOST("note");
@@ -869,7 +867,7 @@ if ($id > 0)
 		$datep=dol_mktime($fulldayevent?'00':$aphour, $fulldayevent?'00':$apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
 		$datef=dol_mktime($fulldayevent?'23':$p2hour, $fulldayevent?'59':$p2min, $fulldayevent?'59':'0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
 
-		$object->fk_action   = dol_getIdFromCode($db, GETPOST("actioncode"), 'c_actioncomm');
+		$object->type_id     = dol_getIdFromCode($db, GETPOST("actioncode"), 'c_actioncomm');
 		$object->label       = GETPOST("label");
 		$object->datep       = $datep;
 		$object->datef       = $datef;
@@ -879,8 +877,6 @@ if ($id > 0)
 		$object->location    = GETPOST('location');
 		$object->socid       = GETPOST("socid");
 		$object->contactid   = GETPOST("contactid",'int');
-		//$object->societe->id = $_POST["socid"];			// deprecated
-		//$object->contact->id = $_POST["contactid"];		// deprecated
 		$object->fk_project  = GETPOST("projectid",'int');
 
 		$object->note = GETPOST("note");

From 8a06a1f43372a925e18d6c854395f84212b85254 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 Sep 2017 11:50:36 +0200
Subject: [PATCH 13/28] Code comment

---
 htdocs/projet/document.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 8777d83e419..fbf9574bd75 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -20,7 +20,7 @@
 /**
  *	\file       htdocs/projet/document.php
  *	\ingroup    project
- *	\brief      Page de gestion des documents attachees a un projet
+ *	\brief      Page to managed related documents linked to a project
  */
 
 require '../main.inc.php';
@@ -106,11 +106,11 @@ if ($object->id > 0)
 		$totalsize+=$file['size'];
 	}
 
-	
+
 	// Project card
-	
+
 	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-	
+
 	$morehtmlref='<div class="refidno">';
 	// Title
 	$morehtmlref.=$object->title;
@@ -120,19 +120,19 @@ if ($object->id > 0)
 	    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref.='</div>';
-	
+
 	// Define a complementary filter for search of next/prev ref.
 	if (! $user->rights->projet->all->lire)
 	{
 	    $objectsListId = $object->getProjectsAuthorizedForUser($user,0,0);
 	    $object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
 	}
-	
+
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-	
-	
+
+
 	print '<div class="fichecenter">';
-	print '<div class="underbanner clearboth"></div>';	
+	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border" width="100%">';
 
@@ -141,10 +141,10 @@ if ($object->id > 0)
 	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
 
 	print "</table>\n";
-	
+
 	print '</div>';
 
-	
+
 	dol_fiche_end();
 
 	$modulepart = 'project';

From 23604a2b54dd2905885e35099252239d022488dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 Sep 2017 11:54:37 +0200
Subject: [PATCH 14/28] NEW Add hidden option
 PROJECT_DISABLE_UNLINK_FROM_OVERVIEW

---
 htdocs/projet/element.php | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 1e4d4132944..f76b6f9f0cc 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -643,33 +643,6 @@ foreach ($listofreferent as $key => $value)
 				$total_ttc = -$total_ttc;
 			}
 
-			/*switch ($classname) {
-				case 'FactureFournisseur':
-					$newclassname = 'SupplierInvoice';
-					break;
-				case 'Facture':
-					$newclassname = 'Bill';
-					break;
-				case 'Propal':
-					$newclassname = 'CommercialProposal';
-					break;
-				case 'Commande':
-					$newclassname = 'Order';
-					break;
-				case 'Expedition':
-					$newclassname = 'Sending';
-					break;
-				case 'Contrat':
-					$newclassname = 'Contract';
-					break;
-				case 'MouvementStock':
-					$newclassname = 'StockMovement';
-					break;
-				default:
-					$newclassname = $classname;
-			}*/
-
-			$var = ! $var;
 			print '<tr class="oddeven">';
 			// Module
 			print '<td align="left">'.$name.'</td>';
@@ -693,7 +666,6 @@ print '</tr>';
 print "</table>";
 
 
-
 print '<br><br>';
 print '<br>';
 
@@ -771,7 +743,7 @@ foreach ($listofreferent as $key => $value)
 		print '<table class="noborder" width="100%">';
 
 		print '<tr class="liste_titre">';
-		// Remove link
+		// Remove link column
 		print '<td style="width: 24px"></td>';
 		// Ref
 		print '<td'.(($tablename != 'actioncomm' && $tablename != 'projet_task') ? ' style="width: 200px"':'').'>'.$langs->trans("Ref").'</td>';
@@ -862,11 +834,15 @@ foreach ($listofreferent as $key => $value)
 				}
 
 				print '<tr class="oddeven">';
+
 				// Remove link
 				print '<td style="width: 24px">';
 				if ($tablename != 'projet_task' && $tablename != 'stock_mouvement')
 				{
-					print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $projectid . '&action=unlink&tablename=' . $tablename . '&elementselect=' . $element->id . '">' . img_picto($langs->trans('Unlink'), 'editdelete') . '</a>';
+					if (empty($conf->global->PROJECT_DISABLE_UNLINK_FROM_OVERVIEW) || $user->admin)		// PROJECT_DISABLE_UNLINK_FROM_OVERVIEW is empty by defaut, so this test true
+					{
+						print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $projectid . '&action=unlink&tablename=' . $tablename . '&elementselect=' . $element->id . '">' . img_picto($langs->trans('Unlink'), 'editdelete') . '</a>';
+					}
 				}
 				print "</td>\n";
 

From 296e678c1be26500c87a56bc46fbe0db84573b7b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 Sep 2017 12:02:46 +0200
Subject: [PATCH 15/28] Solve url too long with paybox

---
 htdocs/public/payment/newpayment.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 52aa5950a92..1862a5b8a47 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -143,12 +143,11 @@ if (! empty($FULLTAG))
     $urlok.='fulltag='.urlencode($FULLTAG).'&';
     $urlko.='fulltag='.urlencode($FULLTAG).'&';
 }
-/* This make url too long. Seems not required into the back url
 if (! empty($SECUREKEY))
 {
     $urlok.='securekey='.urlencode($SECUREKEY).'&';
     $urlko.='securekey='.urlencode($SECUREKEY).'&';
-}*/
+}
 if (! empty($entity))
 {
 	$urlok.='e='.urlencode($entity).'&';
@@ -336,6 +335,10 @@ if ($action == 'dopayment')
 
 		$origfulltag=GETPOST("fulltag",'alpha');
 
+		// Securekey into back url useless for back url and we need an url lower than 150.
+		$urlok = preg_replace('/securekey=[^&]+/', '', $urlok);
+		$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
+
 		$mesg='';
 		if (empty($PRICE) || ! is_numeric($PRICE)) $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
 		elseif (empty($email))            $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));

From 96efe43e3cbcc8c8f7a94b5187be927cbc679068 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 Sep 2017 12:48:07 +0200
Subject: [PATCH 16/28] NEW Provide a way to download a file from a public URL.

---
 htdocs/document.php                 | 37 ++++++++++++++++++++++++++---
 htdocs/ecm/class/ecmfiles.class.php | 15 +++++++++---
 htdocs/ecm/docfile.php              | 30 ++++++++++++++---------
 3 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/htdocs/document.php b/htdocs/document.php
index d35021005e6..c09441ea0ed 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -59,24 +59,28 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $encoding = '';
 $action=GETPOST('action','alpha');
-$original_file=GETPOST('file','alpha');	// Do not use urldecode here ($_GET are already decoded by PHP).
+$original_file=GETPOST('file','alpha');		// Do not use urldecode here ($_GET are already decoded by PHP).
+$hashn=GETPOST('hashn','aZ09');
+$hashc=GETPOST('hashc','aZ09');
 $modulepart=GETPOST('modulepart','alpha');
 $urlsource=GETPOST('urlsource','alpha');
 $entity=GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity;
 
 // Security check
-if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
+if (empty($modulepart)) accessforbidden('Bad link. Bad value for parameter modulepart',0,0,1);
+if (empty($original_file) && empty($hashn) && empty($hashc)) accessforbidden('Bad link. Missing identification to find file (original_file, hasn or hashc)',0,0,1);
 if ($modulepart == 'fckeditor') $modulepart='medias';   // For backward compatibility
 
 $socid=0;
 if ($user->societe_id > 0) $socid = $user->societe_id;
 
 // For some module part, dir may be privates
-if (in_array($modulepart,array('facture_paiement','unpaid')))
+if (in_array($modulepart, array('facture_paiement','unpaid')))
 {
 	if (! $user->rights->societe->client->voir || $socid) $original_file='private/'.$user->id.'/'.$original_file;	// If user has no permission to see all, output dir is specific to user
 }
 
+
 /*
  * Action
  */
@@ -99,6 +103,33 @@ if (preg_match('/\.(html|htm)$/i',$original_file)) $attachment = false;
 if (isset($_GET["attachment"])) $attachment = GETPOST("attachment",'alpha')?true:false;
 if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
 
+// If we have a hash (hashc or hashn), we guess the original_file. Note: using hashn is not reliable.
+if (! empty($hashn) || ! empty($hashc))
+{
+	include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+	$ecmfile=new EcmFiles($db);
+	$result = $ecmfile->fetch(0, $hashn, '', $hashc);
+	if ($result > 0)
+	{
+		$tmp = explode('/', $ecmfile->filepath, 2);		// $ecmfile->filepatch is relative to document directory
+		$moduleparttocheck = $tmp[0];
+		if ($moduleparttocheck == $modulepart)
+		{
+			$original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);		// this is relative to module dir
+			//var_dump($original_file); exit;
+		}
+		else
+		{
+			accessforbidden('Bad link. File owns to another module part.',0,0,1);
+		}
+	}
+	else
+	{
+		accessforbidden('Bad link. File was not found or removed recently.',0,0,1);
+	}
+}
+
+
 // Security: Delete string ../ into $original_file
 $original_file = str_replace("../","/", $original_file);
 
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index abe5c403462..77fa294aeed 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -157,6 +157,7 @@ class EcmFiles //extends CommonObject
 
 		// Insert request
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+		$sql.= 'ref,';
 		$sql.= 'label,';
 		$sql.= 'entity,';
 		$sql.= 'filename,';
@@ -174,6 +175,7 @@ class EcmFiles //extends CommonObject
 		$sql.= 'fk_user_m,';
 		$sql.= 'acl';
 		$sql .= ') VALUES (';
+		$sql .= " '".dol_hash($this->filepath.'/'.$this->filename, 3)."', ";
 		$sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
 		$sql .= ' '.(! isset($this->entity)?$conf->entity:$this->entity).',';
 		$sql .= ' '.(! isset($this->filename)?'NULL':"'".$this->db->escape($this->filename)."'").',';
@@ -232,11 +234,12 @@ class EcmFiles //extends CommonObject
 	 * Load object in memory from the database
 	 *
 	 * @param  int    $id          	   Id object
-	 * @param  string $ref         	   Not used yet. Will contains a hash id from filename+filepath
+	 * @param  string $ref         	   Hash of file name (filename+filepath). Not always defined on some version.
 	 * @param  string $relativepath    Relative path of file from document directory. Example: path/path2/file
+	 * @param  string $hashoffile      Hash of file content. Take the first one found if same file is at different places. This hash will also change if file content is changed.
 	 * @return int                 	   <0 if KO, 0 if not found, >0 if OK
 	 */
-	public function fetch($id, $ref = null, $relativepath = '')
+	public function fetch($id, $ref = '', $relativepath = '', $hashoffile='')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -268,11 +271,16 @@ class EcmFiles //extends CommonObject
 		if ($relativepath) {
 			$sql .= " AND t.filepath = '" . $this->db->escape(dirname($relativepath)) . "' AND t.filename = '".$this->db->escape(basename($relativepath))."'";
 		}
-		elseif (null !== $ref) {
+		elseif (! empty($ref)) {
 			$sql .= " AND t.ref = '".$this->db->escape($ref)."'";
+		}
+		elseif (! empty($hashoffile)) {
+			$sql .= " AND t.label = '".$this->db->escape($hashoffile)."'";
 		} else {
 			$sql .= ' AND t.rowid = ' . $id;
 		}
+		$this->db->plimit(1);
+		$this->db->order('t.rowid', 'ASC');		// When we search on hash of content, we take the first one.
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -484,6 +492,7 @@ class EcmFiles //extends CommonObject
 
 		// Update request
 		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+		$sql .= ' ref = '.dol_hash($this->filepath.'/'.$this->filename, 3);
 		$sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
 		$sql .= ' entity = '.(isset($this->entity)?$this->entity:$conf->entity).',';
 		$sql .= ' filename = '.(isset($this->filename)?"'".$this->db->escape($this->filename)."'":"null").',';
diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php
index 045c3ebda8b..aa708a85f24 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/docfile.php
@@ -287,17 +287,25 @@ print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';
 print '</td></tr>';
 
 print '<tr><td>'.$langs->trans("DirectDownloadLink").'</td><td>';
-$modulepart='ecm';
-$forcedownload=1;
-$rellink='/document.php?modulepart='.$modulepart;
-if ($forcedownload) $rellink.='&attachment=1';
-if (! empty($object->entity)) $rellink.='&entity='.$object->entity;
-$rellink.='&file='.urlencode($filepath);
-$fulllink=$urlwithroot.$rellink;
-// TODO
-//print img_picto('','object_globe.png').' ';
-//print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
-//print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';
+if (! empty($ecmfile->ref) || ! empty($ecmfile->label))
+{
+	$modulepart='ecm';
+	$forcedownload=1;
+	$rellink='/document.php?modulepart='.$modulepart;
+	if ($forcedownload) $rellink.='&attachment=1';
+	if (! empty($object->entity)) $rellink.='&entity='.$object->entity;
+	//$rellink.='&file='.urlencode($filepath);		// No need of name of file for public link, we will use the hash
+	$fulllink=$urlwithroot.$rellink;
+	if (! empty($ecmfile->ref))       $fulllink.='&hashn='.$ecmfile->ref;	// Hash of file path
+	elseif (! empty($ecmfile->label)) $fulllink.='&hashc='.$ecmfile->label;	// Hash of file content
+	print img_picto('','object_globe.png').' ';
+	print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
+	print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';
+}
+else
+{
+	print img_warning().' '.$langs->trans("FileNotYetIndexedInDatabase");
+}
 print '</td></tr>';
 
 print '</table>';

From 57358f0ce5d5a626f38ae87385c493b5fde641fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 Sep 2017 14:02:42 +0200
Subject: [PATCH 17/28] NEW Provide a way to download a file from a public URL
 for files in ECM

---
 htdocs/document.php                           |  11 +-
 htdocs/ecm/class/ecmfiles.class.php           |  43 ++++-
 htdocs/ecm/docfile.php                        | 162 +++++++++++-------
 .../install/mysql/migration/6.0.0-7.0.0.sql   |   5 +
 htdocs/install/mysql/tables/llx_ecm_files.sql |   5 +-
 htdocs/langs/en_US/ecm.lang                   |   5 +-
 htdocs/langs/en_US/main.lang                  |   3 +-
 htdocs/langs/en_US/website.lang               |   2 +-
 8 files changed, 158 insertions(+), 78 deletions(-)

diff --git a/htdocs/document.php b/htdocs/document.php
index c09441ea0ed..590d47d2c13 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -60,15 +60,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 $encoding = '';
 $action=GETPOST('action','alpha');
 $original_file=GETPOST('file','alpha');		// Do not use urldecode here ($_GET are already decoded by PHP).
-$hashn=GETPOST('hashn','aZ09');
-$hashc=GETPOST('hashc','aZ09');
+$hashp=GETPOST('hashp','aZ09');
 $modulepart=GETPOST('modulepart','alpha');
 $urlsource=GETPOST('urlsource','alpha');
 $entity=GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity;
 
 // Security check
 if (empty($modulepart)) accessforbidden('Bad link. Bad value for parameter modulepart',0,0,1);
-if (empty($original_file) && empty($hashn) && empty($hashc)) accessforbidden('Bad link. Missing identification to find file (original_file, hasn or hashc)',0,0,1);
+if (empty($original_file) && empty($hashp)) accessforbidden('Bad link. Missing identification to find file (original_file or hashp)',0,0,1);
 if ($modulepart == 'fckeditor') $modulepart='medias';   // For backward compatibility
 
 $socid=0;
@@ -103,12 +102,12 @@ if (preg_match('/\.(html|htm)$/i',$original_file)) $attachment = false;
 if (isset($_GET["attachment"])) $attachment = GETPOST("attachment",'alpha')?true:false;
 if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
 
-// If we have a hash (hashc or hashn), we guess the original_file. Note: using hashn is not reliable.
-if (! empty($hashn) || ! empty($hashc))
+// If we have a hash public (hashp), we guess the original_file.
+if (! empty($hashp))
 {
 	include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 	$ecmfile=new EcmFiles($db);
-	$result = $ecmfile->fetch(0, $hashn, '', $hashc);
+	$result = $ecmfile->fetch(0, '', '', '', $hashp);
 	if ($result > 0)
 	{
 		$tmp = explode('/', $ecmfile->filepath, 2);		// $ecmfile->filepatch is relative to document directory
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 77fa294aeed..0035b18d3c7 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -46,7 +46,9 @@ class EcmFiles //extends CommonObject
 
 	/**
 	 */
-	public $label;					// hash of file md5_file(dol_osencode($destfull)), so MD5 of file content
+	public $ref;					// hash of file path
+	public $label;					// hash of file content (md5_file(dol_osencode($destfull))
+	public $share;					// hash for file sharing. empty by default
 	public $entity;
 	public $filename;
 	public $filepath;
@@ -94,10 +96,15 @@ class EcmFiles //extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-
+		if (isset($this->ref)) {
+			 $this->ref = trim($this->ref);
+		}
 		if (isset($this->label)) {
 			 $this->label = trim($this->label);
 		}
+		if (isset($this->share)) {
+			 $this->share = trim($this->share);
+		}
 		if (isset($this->entity)) {
 			 $this->entity = trim($this->entity);
 		}
@@ -136,6 +143,10 @@ class EcmFiles //extends CommonObject
 		}
         if (empty($this->date_c)) $this->date_c = dol_now();
 
+        // If ref not defined
+        if (empty($ref)) $ref = dol_hash($this->filepath.'/'.$this->filename, 3);
+
+
         $maxposition=0;
 		if (empty($this->position))   // Get max used
 		{
@@ -159,6 +170,7 @@ class EcmFiles //extends CommonObject
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
 		$sql.= 'ref,';
 		$sql.= 'label,';
+		$sql.= 'share,';
 		$sql.= 'entity,';
 		$sql.= 'filename,';
 		$sql.= 'filepath,';
@@ -175,8 +187,9 @@ class EcmFiles //extends CommonObject
 		$sql.= 'fk_user_m,';
 		$sql.= 'acl';
 		$sql .= ') VALUES (';
-		$sql .= " '".dol_hash($this->filepath.'/'.$this->filename, 3)."', ";
+		$sql .= " '".$ref."', ";
 		$sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
+		$sql .= ' '.(! isset($this->share)?'NULL':"'".$this->db->escape($this->share)."'").',';
 		$sql .= ' '.(! isset($this->entity)?$conf->entity:$this->entity).',';
 		$sql .= ' '.(! isset($this->filename)?'NULL':"'".$this->db->escape($this->filename)."'").',';
 		$sql .= ' '.(! isset($this->filepath)?'NULL':"'".$this->db->escape($this->filepath)."'").',';
@@ -237,9 +250,10 @@ class EcmFiles //extends CommonObject
 	 * @param  string $ref         	   Hash of file name (filename+filepath). Not always defined on some version.
 	 * @param  string $relativepath    Relative path of file from document directory. Example: path/path2/file
 	 * @param  string $hashoffile      Hash of file content. Take the first one found if same file is at different places. This hash will also change if file content is changed.
+	 * @param  string $hashforshare    Hash of file sharing.
 	 * @return int                 	   <0 if KO, 0 if not found, >0 if OK
 	 */
-	public function fetch($id, $ref = '', $relativepath = '', $hashoffile='')
+	public function fetch($id, $ref = '', $relativepath = '', $hashoffile='', $hashforshare='')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -247,6 +261,7 @@ class EcmFiles //extends CommonObject
 		$sql .= ' t.rowid,';
 		$sql .= " t.ref,";
 		$sql .= " t.label,";
+		$sql .= " t.share,";
 		$sql .= " t.entity,";
 		$sql .= " t.filename,";
 		$sql .= " t.filepath,";
@@ -276,11 +291,15 @@ class EcmFiles //extends CommonObject
 		}
 		elseif (! empty($hashoffile)) {
 			$sql .= " AND t.label = '".$this->db->escape($hashoffile)."'";
+		}
+		elseif (! empty($hashforshare)) {
+			$sql .= " AND t.share = '".$this->db->escape($hashforshare)."'";
 		} else {
 			$sql .= ' AND t.rowid = ' . $id;
 		}
+		// When we search on hash of content, we take the first one. Solve also hash conflict.
 		$this->db->plimit(1);
-		$this->db->order('t.rowid', 'ASC');		// When we search on hash of content, we take the first one.
+		$this->db->order('t.rowid', 'ASC');
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -291,6 +310,7 @@ class EcmFiles //extends CommonObject
 				$this->id = $obj->rowid;
 				$this->ref = $obj->ref;
 				$this->label = $obj->label;
+				$this->share = $obj->share;
 				$this->entity = $obj->entity;
 				$this->filename = $obj->filename;
 				$this->filepath = $obj->filepath;
@@ -352,6 +372,7 @@ class EcmFiles //extends CommonObject
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
 		$sql .= " t.label,";
+		$sql .= " t.share,";
 		$sql .= " t.entity,";
 		$sql .= " t.filename,";
 		$sql .= " t.filepath,";
@@ -401,8 +422,9 @@ class EcmFiles //extends CommonObject
 				$line = new EcmfilesLine();
 
 				$line->id = $obj->rowid;
-
+				$line->ref = $obj->ref;
 				$line->label = $obj->label;
+				$line->share = $obj->share;
 				$line->entity = $obj->entity;
 				$line->filename = $obj->filename;
 				$line->filepath = $obj->filepath;
@@ -446,9 +468,15 @@ class EcmFiles //extends CommonObject
 
 		// Clean parameters
 
+		if (isset($this->ref)) {
+			 $this->ref = trim($this->ref);
+		}
 		if (isset($this->label)) {
 			 $this->label = trim($this->label);
 		}
+		if (isset($this->share)) {
+			 $this->share = trim($this->share);
+		}
 		if (isset($this->entity)) {
 			 $this->entity = trim($this->entity);
 		}
@@ -492,8 +520,9 @@ class EcmFiles //extends CommonObject
 
 		// Update request
 		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
-		$sql .= ' ref = '.dol_hash($this->filepath.'/'.$this->filename, 3);
+		$sql .= " ref = '".dol_hash($this->filepath.'/'.$this->filename, 3)."',";
 		$sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
+		$sql .= ' share = '.(! empty($this->share)?"'".$this->db->escape($this->share)."'":"null").',';
 		$sql .= ' entity = '.(isset($this->entity)?$this->entity:$conf->entity).',';
 		$sql .= ' filename = '.(isset($this->filename)?"'".$this->db->escape($this->filename)."'":"null").',';
 		$sql .= ' filepath = '.(isset($this->filepath)?"'".$this->db->escape($this->filepath)."'":"null").',';
diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php
index aa708a85f24..a856ab22c36 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/docfile.php
@@ -39,6 +39,9 @@ $langs->load("bills");
 $langs->load("contracts");
 $langs->load("categories");
 
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
 if (!$user->rights->ecm->setup) accessforbidden();
 
 // Get parameters
@@ -61,8 +64,6 @@ $pagenext = $page + 1;
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="label";
 
-$cancel=GETPOST('cancel','alpha');
-$action=GETPOST('action','aZ09');
 $section=GETPOST("section");
 if (! $section)
 {
@@ -87,19 +88,25 @@ if (! $result > 0)
 $relativepath=$ecmdir->getRelativePath();
 $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
 
+$fullpath=$conf->ecm->dir_output.'/'.$relativepath.$urlfile;
 
-/*
-$ecmfile = new ECMFile($db);
-if (! empty($_GET["fileid"]))
+$file = new stdClass();
+$file->section_id=$ecmdir->id;
+$file->label=$urlfile;
+
+$relativetodocument = 'ecm/'.$relativepath;		// $relativepath is relative to ECM dir, we need relative to document
+$filepath=$relativepath.$file->label;
+$filepathtodocument=$relativetodocument.$file->label;
+
+// Try to load object from index
+$object = new ECMFiles($db);
+$result=$object->fetch(0, '', $filepathtodocument);
+if (! ($result >= 0))
 {
-	$result=$ecmfile->fetch($_GET["fileid"]);
-	if (! $result > 0)
-	{
-		dol_print_error($db,$ecmfile->error);
-		exit;
-	}
+	dol_print_error($db, $object->error, $object->errors);
+	exit;
 }
-*/
+
 
 
 
@@ -107,7 +114,7 @@ if (! empty($_GET["fileid"]))
  * Actions
  */
 
-if ($action == 'cancel')
+if ($cancel)
 {
     $action ='';
     if ($backtourl)
@@ -117,7 +124,7 @@ if ($action == 'cancel')
     }
     else
     {
-        header("Location: ".DOL_URL_ROOT.'/ecm/index.php?action=file_manager&section='.$section);
+        header("Location: ".DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.$urlfile.'&section='.$section);
         exit;
     }
 }
@@ -127,8 +134,9 @@ if ($action == 'update')
 {
     $error=0;
 
-    $oldlabel=GETPOST('urlfile');
-    $newlabel=GETPOST('label');
+    $oldlabel=GETPOST('urlfile', 'alpha');
+    $newlabel=GETPOST('label', 'alpha');
+	$shareenabled = GETPOST('shareenabled', 'alpha');
 
     //$db->begin();
 
@@ -142,7 +150,7 @@ if ($action == 'update')
     //print $oldfile.' - '.$newfile;
     if ($newlabel != $oldlabel)
     {
-        $result=dol_move($oldfile, $newfile);
+        $result=dol_move($oldfile, $newfile);		// This include update of database
         if (! $result)
         {
             $langs->load('errors');
@@ -151,14 +159,39 @@ if ($action == 'update')
         }
     }
 
+    // Now we update index of file
+    $db->begin();
+
     if (! $error)
     {
-        //$db->commit();
+		if (is_object($object))
+		{
+			if ($shareenabled)
+			{
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+				$object->share = getRandomPassword(true);
+			}
+			else
+			{
+				$object->share = '';
+			}
+			$result = $object->update($user);
+			if ($result < 0)
+			{
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+    }
+
+    if (!$error)
+    {
+        $db->commit();
         $urlfile=$newlabel;
     }
     else
     {
-        //$db->rollback();
+        $db->rollback();
     }
 }
 
@@ -168,25 +201,20 @@ if ($action == 'update')
  * View
  */
 
-llxHeader();
-
 $form=new Form($db);
 
-$fullpath=$conf->ecm->dir_output.'/'.$relativepath.$urlfile;
-
-$file = new stdClass();
-$file->section_id=$ecmdir->id;
-$file->label=$urlfile;
+llxHeader();
 
 $head = ecm_file_prepare_head($file);
 
-if ($_GET["action"] == 'edit')
+if ($action == 'edit')
 {
 	print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="section" value="'.$section.'">';
     print '<input type="hidden" name="urlfile" value="'.$urlfile.'">';
 	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
 }
 
 dol_fiche_head($head, 'card', $langs->trans("File"), 0, 'generic');
@@ -217,11 +245,11 @@ while ($tmpecmdir && $result > 0)
 print img_picto('','object_dir').' <a href="'.DOL_URL_ROOT.'/ecm/index.php">'.$langs->trans("ECMRoot").'</a> -> ';
 print $s;
 print ' -> ';
-if (GETPOST('action','aZ09') == 'edit') print '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfile.'">';
+if ($action == 'edit') print '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfile.'">';
 else print $urlfile;
 print '</td></tr>';
 /*print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
-if ($_GET["action"] == 'edit')
+if ($action == 'edit')
 {
 	print '<textarea class="flat" name="description" cols="80">';
 	print $ecmdir->description;
@@ -249,18 +277,14 @@ print dol_print_size($totalsize);
 print '</td></tr>';
 */
 
-$relativetodocument = 'ecm/'.$relativepath;		// $relativepath is relative to ECM dir, we need relative to document
-$filepath=$relativepath.$file->label;
-$filepathtodocument=$relativetodocument.$file->label;
-
-print '<tr><td>'.$langs->trans("HashSaved").'</td><td>';
-$ecmfile = new EcmFiles($db);
+print '<tr><td>'.$langs->trans("HashOfFileContent").'</td><td>';
+$object = new EcmFiles($db);
 //$filenametosearch=basename($filepath);
 //$filedirtosearch=basedir($filepath);
-$ecmfile->fetch(0, '', $filepathtodocument);
-if (! empty($ecmfile->label))
+$object->fetch(0, '', $filepathtodocument);
+if (! empty($object->label))
 {
-	print $ecmfile->label;
+	print $object->label;
 }
 else
 {
@@ -282,29 +306,49 @@ if (! empty($object->entity)) $rellink.='&entity='.$object->entity;
 $rellink.='&file='.urlencode($filepath);
 $fulllink=$urlwithroot.$rellink;
 print img_picto('','object_globe.png').' ';
-print '<input type="text" class="quatrevingtpercent" id="downloadinternallink" name="downloadinternellink" value="'.dol_escape_htmltag($fulllink).'">';
-print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';
+if ($action != 'edit') print '<input type="text" class="quatrevingtpercent" id="downloadinternallink" name="downloadinternellink" value="'.dol_escape_htmltag($fulllink).'">';
+else print $fulllink;
+if ($action != 'edit') print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';
 print '</td></tr>';
 
-print '<tr><td>'.$langs->trans("DirectDownloadLink").'</td><td>';
-if (! empty($ecmfile->ref) || ! empty($ecmfile->label))
+print '<tr><td>';
+if ($action != 'edit') print $langs->trans("DirectDownloadLink");
+else print $langs->trans("FileSharedViaALink");
+print '</td><td>';
+if (! empty($object->share))
 {
-	$modulepart='ecm';
-	$forcedownload=1;
-	$rellink='/document.php?modulepart='.$modulepart;
-	if ($forcedownload) $rellink.='&attachment=1';
-	if (! empty($object->entity)) $rellink.='&entity='.$object->entity;
-	//$rellink.='&file='.urlencode($filepath);		// No need of name of file for public link, we will use the hash
-	$fulllink=$urlwithroot.$rellink;
-	if (! empty($ecmfile->ref))       $fulllink.='&hashn='.$ecmfile->ref;	// Hash of file path
-	elseif (! empty($ecmfile->label)) $fulllink.='&hashc='.$ecmfile->label;	// Hash of file content
-	print img_picto('','object_globe.png').' ';
-	print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
-	print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';
+	if ($action != 'edit')
+	{
+		$modulepart='ecm';
+		$forcedownload=1;
+		$rellink='/document.php?modulepart='.$modulepart;
+		if ($forcedownload) $rellink.='&attachment=1';
+		if (! empty($object->entity)) $rellink.='&entity='.$object->entity;
+		//$rellink.='&file='.urlencode($filepath);		// No need of name of file for public link, we will use the hash
+		$fulllink=$urlwithroot.$rellink;
+		//if (! empty($object->ref))       $fulllink.='&hashn='.$object->ref;			// Hash of file path
+		//elseif (! empty($object->label)) $fulllink.='&hashc='.$object->label;		// Hash of file content
+		if (! empty($object->share))  $fulllink.='&hashp='.$object->share;			// Hash for public share
+		print img_picto('','object_globe.png').' ';
+		if ($action != 'edit') print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
+		else print $fulllink;
+		if ($action != 'edit') print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';
+	}
+	else
+	{
+		print '<input type="checkbox" name="shareenabled"'.($object->share?' checked="checked"':'').' /> ';
+	}
 }
 else
 {
-	print img_warning().' '.$langs->trans("FileNotYetIndexedInDatabase");
+	if ($action != 'edit')
+	{
+		print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
+	}
+	else
+	{
+		print '<input type="checkbox" name="shareenabled"'.($object->share?' checked="checked"':'').' /> ';
+	}
 }
 print '</td></tr>';
 
@@ -315,7 +359,7 @@ print ajax_autoselect('downloadlink');
 
 dol_fiche_end();
 
-if ($_GET["action"] == 'edit')
+if ($action == 'edit')
 {
     print '<div class="center">';
     print '<input type="submit" class="button" name="submit" value="'.$langs->trans("Save").'">';
@@ -328,13 +372,13 @@ if ($_GET["action"] == 'edit')
 
 
 // Confirmation de la suppression d'une ligne categorie
-if ($_GET['action'] == 'delete_file')
+if ($action == 'delete_file')
 {
     print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($_GET["section"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile',$urlfile), 'confirm_deletefile', '', 1, 1);
 
 }
 
-if ($_GET["action"] != 'edit')
+if ($action != 'edit')
 {
 	// Actions buttons
 	print '<div class="tabsAction">';
@@ -343,7 +387,7 @@ if ($_GET["action"] != 'edit')
     {
         print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&section='.$section.'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Edit').'</a>';
 
-        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=cancel&section='.$section.'&urlfile='.urlencode($urlfile).'&backtourl='.urlencode($backtourl).'">'.$langs->trans('Cancel').'</a>';
+        //print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=cancel&section='.$section.'&urlfile='.urlencode($urlfile).'&backtourl='.urlencode($backtourl).'">'.$langs->trans('Cancel').'</a>';
     }
 /*
 	if ($user->rights->ecm->setup)
diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index 3394a1db3e9..c3df19fee06 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -41,6 +41,11 @@ ALTER TABLE llx_website_page ADD COLUMN fk_user_modif integer;
 
 -- For 7.0
 
+
+ALTER TABLE llx_ecm_files MODIFY label varchar(128) NOT NULL;
+ALTER TABLE llx_ecm_files ADD COLUMN share varchar(128) NULL after label;
+
+
 ALTER TABLE llx_c_paiement        ADD COLUMN position        integer NOT NULL DEFAULT 0;
 ALTER TABLE llx_c_payment_term    ADD COLUMN position        integer NOT NULL DEFAULT 0;
 
diff --git a/htdocs/install/mysql/tables/llx_ecm_files.sql b/htdocs/install/mysql/tables/llx_ecm_files.sql
index dcc9dd40b9d..5360660a7bc 100644
--- a/htdocs/install/mysql/tables/llx_ecm_files.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_files.sql
@@ -19,8 +19,9 @@
 CREATE TABLE llx_ecm_files
 (
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
-  ref				varchar(128),					-- Not used yet. Will contains a hash id from filename+filepath
-  label				varchar(64) NOT NULL,			-- label contains a md5
+  ref				varchar(128),					-- contains a hash id from filename+filepath
+  label				varchar(128) NOT NULL,			-- contains hash of file content
+  share				varchar(128) NULL,				-- contains a hash for file sharing
   entity			integer DEFAULT 1 NOT NULL,		-- multi company id
   filepath    		varchar(255) NOT NULL,   	    -- relative to dolibarr document dir. Example module/def
   filename          varchar(255) NOT NULL,			-- file name only without any directory
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index f7c0f0ab737..0b199c15de1 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -43,5 +43,6 @@ ECMFileManager=File manager
 ECMSelectASection=Select a directory on left tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
-HashSaved=Hash of file
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
\ No newline at end of file
+HashOfFileContent=Hash of file content
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+FileSharedViaALink=File shared via a link
\ No newline at end of file
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index dfe38b7fe65..7475d1194eb 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -793,7 +793,7 @@ ViewFlatList=View flat list
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>. 
 DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and permissions)
+DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
@@ -810,6 +810,7 @@ ImportId=Import id
 Websites=Web sites
 Events=Events
 EMailTemplates=Emails templates
+FileNotShared=File not shared to exernal public
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index af9fdebe2c9..e42504f4706 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -37,7 +37,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. 
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax: <strong>&lt;?php dolIncludeHtmlContent($websitekey.'/contentaliastoinclude.php'); ?&gt;</strong><br><br>To include a link to download a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=reldir/filename.ext"&gt;</strong>.<br>for a file into documents/media (open access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=reldir/filename.ext"&gt;</strong>.<br><br>To include an image stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=filename.ext"&gt;</strong>.
+YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax: <strong>&lt;?php dolIncludeHtmlContent($websitekey.'/contentaliastoinclude.php'); ?&gt;</strong><br><br>To include a link to download a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=reldir/filename.ext"&gt;</strong>.<br>for a file into documents/media (open public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias[&hashp=publicsharekey if modulepart != medias]"&gt;</strong>.<br><br>To include an image stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=filename.ext"&gt;</strong>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.

From a3347e83b32c29dcd7bef899d065861506fd9d1b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 Sep 2017 14:04:25 +0200
Subject: [PATCH 18/28] Better error message

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

diff --git a/htdocs/document.php b/htdocs/document.php
index 590d47d2c13..11017f52cc2 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -124,7 +124,7 @@ if (! empty($hashp))
 	}
 	else
 	{
-		accessforbidden('Bad link. File was not found or removed recently.',0,0,1);
+		accessforbidden('Bad link. File was not found or sharing attribute removed recently.',0,0,1);
 	}
 }
 

From 9875d20eaf85fcbc37e95478dffae5c4bef8388b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 Sep 2017 18:35:47 +0200
Subject: [PATCH 19/28] Add more columns in list of invoices templates

---
 htdocs/compta/facture/fiche-rec.php           | 122 ++++++++++++---
 htdocs/langs/en_US/bills.lang                 |   3 +-
 .../modulebuilder/template/myobject_list.php  | 142 +++++++++---------
 3 files changed, 173 insertions(+), 94 deletions(-)

diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 2e7a46f3067..23356fcf811 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -76,7 +76,9 @@ $month=GETPOST('month');
 $day_date_when=GETPOST('day_date_when');
 $year_date_when=GETPOST('year_date_when');
 $month_date_when=GETPOST('month_date_when');
-$search_frequency=GETPOST('search_frequency');
+$search_recurring=GETPOST('search_recurring','int');
+$search_frequency=GETPOST('search_frequency','alpha');
+$search_unit_frequency=GETPOST('search_unit_frequency','alpha');
 
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
@@ -117,8 +119,10 @@ $arrayfields=array(
     'f.total'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
     'f.tva'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>1),
     'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>1),
-    'f.frequency'=>array('label'=>$langs->trans("RecurringInvoiceTemplate"), 'checked'=>1),
-    'f.nb_gen_done'=>array('label'=>$langs->trans("NbOfGenerationDone"), 'checked'=>1),
+    'recurring'=>array('label'=>$langs->trans("RecurringInvoiceTemplate"), 'checked'=>1),
+    'f.frequency'=>array('label'=>$langs->trans("Frequency"), 'checked'=>1),
+	'f.unit_frequency'=>array('label'=>$langs->trans("FrequencyUnit"), 'checked'=>1),
+	'f.nb_gen_done'=>array('label'=>$langs->trans("NbOfGenerationDone"), 'checked'=>1),
     'f.date_last_gen'=>array('label'=>$langs->trans("DateLastGeneration"), 'checked'=>1),
     'f.date_when'=>array('label'=>$langs->trans("NextDateToExecution"), 'checked'=>1),
     'status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>100),
@@ -174,7 +178,9 @@ if (empty($reshook))
         $day_date_when='';
         $year_date_when='';
         $month_date_when='';
+        $search_recurring='';
         $search_frequency='';
+        $search_unit_frequency='';
         $search_array_options=array();
     }
 
@@ -1077,7 +1083,7 @@ if ($action == 'create')
 
 		print '<table class="border" width="100%">';
 
-		// Frequency
+		// Frequency + unit
 		print '<tr><td class="titlefieldcreate">'.$form->textwithpicto($langs->trans("Frequency"), $langs->transnoentitiesnoconv('toolTipFrequency'))."</td><td>";
 		print "<input type='text' name='frequency' value='".GETPOST('frequency', 'int')."' size='4' />&nbsp;".$form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), (GETPOST('unit_frequency')?GETPOST('unit_frequency'):'m'));
 		print "</td></tr>";
@@ -1549,8 +1555,6 @@ else
 		{
 		    if ($action != 'editline')
 		    {
-    		    $var = true;
-
     		    // Add free products/services
     		    $object->formAddObjectLine(0, $mysoc, $object->thirdparty);                          // No date selector for template invoice
 
@@ -1637,14 +1641,15 @@ else
 		if (! $user->rights->societe->client->voir && ! $socid) {
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
-		if ($search_ref) $sql .= natural_search('f.titre', $search_ref);
-		if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
-		if ($search_montant_ht != '') $sql.= natural_search('f.total', $search_montant_ht, 1);
-		if ($search_montant_vat != '') $sql.= natural_search('f.tva', $search_montant_vat, 1);
-		if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
-		if ($search_frequency > 0)    $sql.= natural_search('f.frequency', $search_frequency);
-		if ($search_frequency == '1') $sql.= ' AND f.frequency > 0';
-		if ($search_frequency == '0') $sql.= ' AND (f.frequency IS NULL or f.frequency = 0)';
+		if ($search_ref)                  $sql .= natural_search('f.titre', $search_ref);
+		if ($search_societe)              $sql .= natural_search('s.nom', $search_societe);
+		if ($search_montant_ht != '')     $sql.= natural_search('f.total', $search_montant_ht, 1);
+		if ($search_montant_vat != '')    $sql.= natural_search('f.tva', $search_montant_vat, 1);
+		if ($search_montant_ttc != '')    $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
+		if ($search_recurring == '1')     $sql.= ' AND f.frequency > 0';
+		if ($search_recurring == '0')     $sql.= ' AND (f.frequency IS NULL or f.frequency = 0)';
+		if ($search_frequency != '')      $sql.= natural_search('f.frequency', $search_frequency, 1);
+		if ($search_unit_frequency != '') $sql.= natural_search('f.unit_frequency', $search_unit_frequency);
 
 		if ($month > 0)
 		{
@@ -1700,10 +1705,12 @@ else
 			if ($year_date_when)     $param.='&year_date_when=' .$year_date_when;
 			if ($search_ref)         $param.='&search_ref=' .$search_ref;
 			if ($search_societe)     $param.='&search_societe=' .$search_societe;
-			if ($search_montant_ht != '')  $param.='&search_montant_ht='.$search_montant_ht;
-			if ($search_montant_vat != '') $param.='&search_montant_vat='.$search_montant_vat;
-			if ($search_montant_ttc != '') $param.='&search_montant_ttc='.$search_montant_ttc;
-			if ($search_frequency > 0)     $param.='&search_frequency='  .$search_frequency;
+			if ($search_montant_ht != '')   $param.='&search_montant_ht=' .$search_montant_ht;
+			if ($search_montant_vat != '')  $param.='&search_montant_vat='.$search_montant_vat;
+			if ($search_montant_ttc != '')  $param.='&search_montant_ttc='.$search_montant_ttc;
+			if ($search_recurring != '' && $search_recurrning != '-1')    $param.='&search_recurring='  .$search_recurring;
+			if ($search_frequency > 0)      $param.='&search_frequency='  .$search_frequency;
+			if ($search_unit_frequency > 0) $param.='&search_unit_frequency='.$search_unit_frequency;
 			if ($option)             $param.="&option=".$option;
 			if ($optioncss != '')    $param.='&optioncss='.$optioncss;
 			// Add $param from extra fields
@@ -1775,11 +1782,25 @@ else
 			    print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
 			    print '</td>';
 			}
+			if (! empty($arrayfields['recurring']['checked']))
+			{
+			    // Recurring or not
+			    print '<td class="liste_titre" align="center">';
+			    print $form->selectyesno('search_recurring', $search_recurring, 1, false, 1);
+			    print '</td>';
+			}
 			if (! empty($arrayfields['f.frequency']['checked']))
 			{
 			    // Recurring or not
 			    print '<td class="liste_titre" align="center">';
-			    print $form->selectyesno('search_frequency', $search_frequency, 1, false, 1);
+			    print '<input class="flat" type="text" size="1" name="search_frequency" value="'.dol_escape_htmltag($search_frequency).'">';
+			    print '</td>';
+			}
+			if (! empty($arrayfields['f.unit_frequency']['checked']))
+			{
+			    // Frequency unit
+			    print '<td class="liste_titre" align="center">';
+			    print '<input class="flat" type="text" size="1" name="search_unit_frequency" value="'.dol_escape_htmltag($search_unit_frequency).'">';
 			    print '</td>';
 			}
 			if (! empty($arrayfields['f.nb_gen_done']['checked']))
@@ -1865,7 +1886,9 @@ else
 			if (! empty($arrayfields['f.total']['checked']))         print_liste_field_titre($arrayfields['f.total']['label'],$_SERVER['PHP_SELF'],"f.total","",$param,'align="right"',$sortfield,$sortorder);
 			if (! empty($arrayfields['f.tva']['checked']))           print_liste_field_titre($arrayfields['f.tva']['label'],$_SERVER['PHP_SELF'],"f.tva","",$param,'align="right"',$sortfield,$sortorder);
 			if (! empty($arrayfields['f.total_ttc']['checked']))     print_liste_field_titre($arrayfields['f.total_ttc']['label'],$_SERVER['PHP_SELF'],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
+			if (! empty($arrayfields['recurring']['checked']))       print_liste_field_titre($arrayfields['recurring']['label'],$_SERVER['PHP_SELF'],"recurring","",$param,'align="center"',$sortfield,$sortorder);
 			if (! empty($arrayfields['f.frequency']['checked']))     print_liste_field_titre($arrayfields['f.frequency']['label'],$_SERVER['PHP_SELF'],"f.frequency","",$param,'align="center"',$sortfield,$sortorder);
+			if (! empty($arrayfields['f.unit_frequency']['checked'])) print_liste_field_titre($arrayfields['f.unit_frequency']['label'],$_SERVER['PHP_SELF'],"f.unit_frequency","",$param,'align="center"',$sortfield,$sortorder);
 			if (! empty($arrayfields['f.nb_gen_done']['checked']))   print_liste_field_titre($arrayfields['f.nb_gen_done']['label'],$_SERVER['PHP_SELF'],"f.nb_gen_done","",$param,'align="center"',$sortfield,$sortorder);
 			if (! empty($arrayfields['f.date_last_gen']['checked'])) print_liste_field_titre($arrayfields['f.date_last_gen']['label'],$_SERVER['PHP_SELF'],"f.date_last_gen","",$param,'align="center"',$sortfield,$sortorder);
 			if (! empty($arrayfields['f.date_when']['checked']))     print_liste_field_titre($arrayfields['f.date_when']['label'],$_SERVER['PHP_SELF'],"f.date_when","",$param,'align="center"',$sortfield,$sortorder);
@@ -1875,13 +1898,14 @@ else
 			print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ')."\n";
 			print "</tr>\n";
 
-
 			if ($num > 0)
 			{
-				$var=true;
+				$i=0;
+				$totalarray=array();
 				while ($i < min($num,$limit))
 				{
 					$objp = $db->fetch_object($resql);
+					if (empty($objp)) break;
 
 					$companystatic->id=$objp->socid;
 					$companystatic->name=$objp->name;
@@ -1897,62 +1921,90 @@ else
 					{
 					   print '<td><a href="'.$_SERVER['PHP_SELF'].'?id='.$objp->facid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$objp->titre;
 					   print "</a></td>\n";
+					   if (! $i) $totalarray['nbfield']++;
 					}
 					if (! empty($arrayfields['s.nom']['checked']))
 					{
 					   print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1,'customer').'</td>';
+					   if (! $i) $totalarray['nbfield']++;
 					}
 					if (! empty($arrayfields['f.total']['checked']))
 					{
 					   print '<td align="right">'.price($objp->total).'</td>'."\n";
+					   if (! $i) $totalarray['nbfield']++;
+					   if (! $i) $totalarray['pos'][$totalarray['nbfield']-1]='f.total';
+					   $totalarray['val']['f.total'] += $objp->total;
 					}
 					if (! empty($arrayfields['f.tva']['checked']))
 					{
 					   print '<td align="right">'.price($objp->total_vat).'</td>'."\n";
+					   if (! $i) $totalarray['nbfield']++;
+					   if (! $i) $totalarray['pos'][$totalarray['nbfield']-1]='f.tva';
+					   $totalarray['val']['f.tva'] += $objp->total_vat;
 					}
 					if (! empty($arrayfields['f.total_ttc']['checked']))
 					{
 					   print '<td align="right">'.price($objp->total_ttc).'</td>'."\n";
+					   if (! $i) $totalarray['nbfield']++;
+					   if (! $i) $totalarray['pos'][$totalarray['nbfield']-1]='f.total_ttc';
+					   $totalarray['val']['f.total_ttc'] += $objp->total_ttc;
+					}
+					if (! empty($arrayfields['recurring']['checked']))
+					{
+					   print '<td align="center">'.yn($objp->frequency?1:0).'</td>';
+					   if (! $i) $totalarray['nbfield']++;
 					}
 					if (! empty($arrayfields['f.frequency']['checked']))
 					{
-					   print '<td align="center">'.yn($objp->frequency?1:0).'</td>';
+					   print '<td align="center">'.($objp->frequency > 0 ? $objp->frequency : '').'</td>';
+					   if (! $i) $totalarray['nbfield']++;
+					}
+					if (! empty($arrayfields['f.unit_frequency']['checked']))
+					{
+					   print '<td align="center">'.($objp->frequency > 0 ? $objp->unit_frequency : '').'</td>';
+					   if (! $i) $totalarray['nbfield']++;
 					}
 					if (! empty($arrayfields['f.nb_gen_done']['checked']))
 					{
 					    print '<td align="center">';
 					    print ($objp->frequency ? $objp->nb_gen_done.($objp->nb_gen_max>0?' / '. $objp->nb_gen_max:'') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
 					    print '</td>';
+					    if (! $i) $totalarray['nbfield']++;
 					}
 					if (! empty($arrayfields['f.date_last_gen']['checked']))
 					{
 					   print '<td align="center">';
 					   print ($objp->frequency ? dol_print_date($db->jdate($objp->date_last_gen),'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
 					   print '</td>';
+					   if (! $i) $totalarray['nbfield']++;
 					}
 					if (! empty($arrayfields['f.date_when']['checked']))
 					{
 					   print '<td align="center">';
 					   print ($objp->frequency ? dol_print_date($db->jdate($objp->date_when),'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
 					   print '</td>';
+					   if (! $i) $totalarray['nbfield']++;
 					}
 					if (! empty($arrayfields['f.datec']['checked']))
 					{
 					   print '<td align="center">';
 					   print dol_print_date($db->jdate($objp->datec),'dayhour');
 					   print '</td>';
+					   if (! $i) $totalarray['nbfield']++;
 					}
 					if (! empty($arrayfields['f.tms']['checked']))
 					{
 					   print '<td align="center">';
 					   print dol_print_date($db->jdate($objp->tms),'dayhour');
 					   print '</td>';
+					   if (! $i) $totalarray['nbfield']++;
 					}
 					if (! empty($arrayfields['status']['checked']))
 					{
 					   print '<td align="center">';
 					   print $invoicerectmp->getLibStatut(3,0);
 					   print '</td>';
+					   if (! $i) $totalarray['nbfield']++;
 					}
 					// Action column
 					print '<td align="center">';
@@ -1972,8 +2024,11 @@ else
 					{
 					    print "&nbsp;";
 					}
+					if (! $i) $totalarray['nbfield']++;
 					print "</td>";
+
 					print "</tr>\n";
+
 					$i++;
 				}
 			}
@@ -1984,6 +2039,29 @@ else
 			    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 			}
 
+			//var_dump($totalarray);
+			// Show total line
+			if (isset($totalarray['pos']))
+			{
+				print '<tr class="liste_total">';
+				$i=0;
+				while ($i < $totalarray['nbfield'])
+				{
+					$i++;
+					if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+					else
+					{
+						if ($i == 1)
+						{
+							if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+							else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+						}
+						print '<td></td>';
+					}
+				}
+				print '</tr>';
+			}
+
 			print "</table>";
 			print "</div>";
 			print "</form>";
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 634f1fddd40..f093726ed4b 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -149,7 +149,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Template/Recurring invoice
+RecurringInvoiceTemplate=Template / Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -331,6 +331,7 @@ ListOfNextSituationInvoices=List of next situation invoices
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
+FrequencyUnit=Frequency unit
 toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of latest generation
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index f591fa7db80..5eac282830f 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -491,19 +491,19 @@ $totalarray=array();
 while ($i < min($num, $limit))
 {
     $obj = $db->fetch_object($resql);
-    if ($obj)
-    {
-    	// Store properties in $object
-    	$object->id = $obj->rowid;
-    	foreach($object->fields as $key => $val)
-    	{
-    		if (isset($obj->$key)) $object->$key = $obj->$key;
-    	}
+    if (empty($obj)) break;		// Should not happen
 
-        // Show here line of result
-        print '<tr class="oddeven">';
-        foreach($object->fields as $key => $val)
-        {
+    // Store properties in $object
+   	$object->id = $obj->rowid;
+   	foreach($object->fields as $key => $val)
+   	{
+   		if (isset($obj->$key)) $object->$key = $obj->$key;
+   	}
+
+    // Show here line of result
+    print '<tr class="oddeven">';
+    foreach($object->fields as $key => $val)
+    {
             if (in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
             $align='';
             if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
@@ -524,70 +524,70 @@ while ($i < min($num, $limit))
                 	$totalarray['val']['t.'.$key] += $obj->$key;
                 }
             }
-        }
-    	// Extra fields
-		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-		{
-		   foreach($extrafields->attribute_label as $key => $val)
-		   {
-				if (! empty($arrayfields["ef.".$key]['checked']))
-				{
-					print '<td';
-					$align=$extrafields->getAlignFlag($key);
-					if ($align) print ' align="'.$align.'"';
-					print '>';
-					$tmpkey='options_'.$key;
-					print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
-					print '</td>';
-		            if (! $i) $totalarray['nbfield']++;
-		            if (! empty($val['isameasure']))
-		            {
-		            	if (! $i) $totalarray['pos'][$totalarray['nbfield']]='ef.'.$tmpkey;
-		            	$totalarray['val']['ef.'.$tmpkey] += $obj->$tmpkey;
-		            }
-				}
-		   }
-		}
-        // Fields from hook
-	    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-		$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        // Rest of fields
-        foreach($object->fields as $key => $val)
+    }
+    // Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	   foreach($extrafields->attribute_label as $key => $val)
+	   {
+			if (! empty($arrayfields["ef.".$key]['checked']))
+			{
+				print '<td';
+				$align=$extrafields->getAlignFlag($key);
+				if ($align) print ' align="'.$align.'"';
+				print '>';
+				$tmpkey='options_'.$key;
+				print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
+				print '</td>';
+	            if (! $i) $totalarray['nbfield']++;
+	            if (! empty($val['isameasure']))
+	            {
+	            	if (! $i) $totalarray['pos'][$totalarray['nbfield']]='ef.'.$tmpkey;
+	            	$totalarray['val']['ef.'.$tmpkey] += $obj->$tmpkey;
+	            }
+			}
+	   }
+	}
+    // Fields from hook
+	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    // Rest of fields
+    foreach($object->fields as $key => $val)
+    {
+        if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
+        $align='';
+        if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
+        if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
+        if ($key == 'status') $align.=($align?' ':'').'center';
+        if (! empty($arrayfields['t.'.$key]['checked']))
         {
-            if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
-            $align='';
-            if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
-            if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
-            if ($key == 'status') $align.=($align?' ':'').'center';
-            if (! empty($arrayfields['t.'.$key]['checked']))
+            print '<td'.($align?' class="'.$align.'"':'').'>';
+            if (in_array($val['type'], array('date','datetime','timestamp'))) print dol_print_date($db->jdate($obj->$key), 'dayhour');
+            elseif ($key == 'status') print $object->getLibStatut(3);
+            else print $obj->$key;
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+            if (! empty($val['isameasure']))
             {
-                print '<td'.($align?' class="'.$align.'"':'').'>';
-                if (in_array($val['type'], array('date','datetime','timestamp'))) print dol_print_date($db->jdate($obj->$key), 'dayhour');
-                elseif ($key == 'status') print $object->getLibStatut(3);
-                else print $obj->$key;
-                print '</td>';
-                if (! $i) $totalarray['nbfield']++;
-                if (! empty($val['isameasure']))
-                {
-	                if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
-	               	$totalarray['val']['t.'.$key] += $obj->$key;
-                }
+	            if (! $i) $totalarray['pos'][$totalarray['nbfield']-1]='t.'.$key;
+	           	$totalarray['val']['t.'.$key] += $obj->$key;
             }
         }
-        // Action column
-        print '<td class="nowrap" align="center">';
-	    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-        {
-	        $selected=0;
-			if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
-        }
-	    print '</td>';
-        if (! $i) $totalarray['nbfield']++;
-
-        print '</tr>';
     }
+    // Action column
+    print '<td class="nowrap" align="center">';
+	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+    {
+	    $selected=0;
+		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+    }
+	print '</td>';
+    if (! $i) $totalarray['nbfield']++;
+
+    print '</tr>';
+
     $i++;
 }
 

From 292095f0c6cb6db39076077e24404dae48f67daa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 22 Sep 2017 09:56:07 +0200
Subject: [PATCH 20/28] NEW Can filter on type of email template

---
 htdocs/admin/ihm.php             | 8 ++++----
 htdocs/admin/mails_templates.php | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 56efe2b5d7d..7a336e6d4e7 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -82,8 +82,8 @@ if ($action == 'removebackgroundlogin' && ! empty($conf->global->MAIN_LOGIN_BACK
 
 if ($action == 'update')
 {
-	dolibarr_set_const($db, "MAIN_LANG_DEFAULT",				$_POST["main_lang_default"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MULTILANGS",					$_POST["main_multilangs"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_LANG_DEFAULT",				$_POST["MAIN_LANG_DEFAULT"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MULTILANGS",					$_POST["MAIN_MULTILANGS"],'chaine',0,'',$conf->entity);
 
 	dolibarr_set_const($db, "MAIN_THEME",						$_POST["main_theme"],'chaine',0,'',$conf->entity);
 
@@ -231,14 +231,14 @@ if ($action == 'edit')	// Edit
 
     // Default language
     print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultLanguage").'</td><td>';
-    print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'main_lang_default', 1, 0, 0, 0, 0, 'minwidth300');
+    print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'MAIN_LANG_DEFAULT', 1, 0, 0, 0, 0, 'minwidth300');
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// Multilingual GUI
     print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableMultilangInterface").'</td><td>';
-    print $form->selectyesno('main_multilangs',$conf->global->MAIN_MULTILANGS,1);
+    print $form->selectyesno('MAIN_MULTILANGS',$conf->global->MAIN_MULTILANGS,1);
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index c9b8120bd0f..9efe954787c 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -520,7 +520,7 @@ foreach ($fieldlist as $field => $value)
         $valuetoshow=$langs->trans($valuetoshow);   // try to translate
         $align="left";
         if ($fieldlist[$field]=='fk_user')         { $valuetoshow=$langs->trans("Owner");}
-        if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
+        if ($fieldlist[$field]=='lang')            { $valuetoshow=(empty($conf->global->MAIN_MULTILANGS) ? '&nbsp;' : $langs->trans("Language")); }
         if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
         if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
         if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
@@ -573,7 +573,7 @@ $errors = $hookmanager->errors;
 
 if (empty($reshook))
 {
-	if ($tabname[$id] == MAIN_DB_PREFIX . 'c_email_templates' && $action == 'edit') {
+	if ($action == 'edit') {
 		fieldList($fieldlist, $obj, $tabname[$id], 'hide');
 	} else {
 		fieldList($fieldlist, $obj, $tabname[$id], 'add');
@@ -681,6 +681,10 @@ if ($resql)
         	print '</td>';
         }
         elseif ($value == 'topic') print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
+        elseif ($value == 'type_template')
+        {
+        	print '<td class="liste_titre">'.$form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100onsmartphone').'</td>';
+        }
         elseif (! in_array($value, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
     }
     if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) print '<td class="liste_titre"></td>';

From bd45ea5a038d7a5dedfbdc488ee5fbd234bd8c58 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 22 Sep 2017 11:28:53 +0200
Subject: [PATCH 21/28] Split page for invoice template into card + list. Add
 more filters.

---
 .../facture/class/facture-rec.class.php       |   6 +-
 htdocs/compta/facture/fiche-rec.php           | 499 +------------
 .../compta/facture/invoicetemplate_list.php   | 700 ++++++++++++++++++
 htdocs/core/class/html.form.class.php         |  18 +-
 htdocs/core/class/html.formmail.class.php     |  11 +-
 htdocs/core/lib/files.lib.php                 |   4 +-
 htdocs/core/lib/functions.lib.php             |  10 +-
 htdocs/core/menus/init_menu_auguria.sql       |   2 +-
 htdocs/core/menus/standard/eldy.lib.php       |   2 +-
 htdocs/langs/en_US/mails.lang                 |   2 +-
 .../modulebuilder/template/myobject_list.php  |   4 +-
 htdocs/societe/list.php                       |   2 +-
 12 files changed, 748 insertions(+), 512 deletions(-)
 create mode 100644 htdocs/compta/facture/invoicetemplate_list.php

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index b3a8a68611d..7c6e0567c24 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -152,8 +152,8 @@ class FactureRec extends CommonInvoice
 			$sql.= ", '".$this->db->escape($user->id)."'";
 			$sql.= ", ".(! empty($facsrc->fk_project)?"'".$facsrc->fk_project."'":"null");
 			$sql.= ", ".(! empty($facsrc->fk_account)?"'".$facsrc->fk_account."'":"null");
-			$sql.= ", '".$this->db->escape($facsrc->cond_reglement_id)."'";
-			$sql.= ", '".$this->db->escape($facsrc->mode_reglement_id)."'";
+			$sql.= ", ".($facsrc->cond_reglement_id > 0 ? $this->db->escape($facsrc->cond_reglement_id) : "null");
+			$sql.= ", ".($facsrc->mode_reglement_id > 0 ? $this->db->escape($facsrc->mode_reglement_id) : "null");
 			$sql.= ", ".$this->usenewprice;
 			$sql.= ", ".$this->frequency;
 			$sql.= ", '".$this->db->escape($this->unit_frequency)."'";
@@ -329,7 +329,6 @@ class FactureRec extends CommonInvoice
 
 				if ($this->statut == self::STATUS_DRAFT)	$this->brouillon = 1;
 
-
 				// Retreive all extrafield for thirdparty
 				// fetch optionals attributes and labels
 				require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
@@ -447,7 +446,6 @@ class FactureRec extends CommonInvoice
 				$line->price            = $objp->price;
 				$line->remise           = $objp->remise;
 
-
 				// Retreive all extrafield for thirdparty
 				// fetch optionals attributes and labels
 				require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 23356fcf811..58fed19d103 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -70,6 +70,8 @@ $search_societe=GETPOST('search_societe');
 $search_montant_ht=GETPOST('search_montant_ht');
 $search_montant_vat=GETPOST('search_montant_vat');
 $search_montant_ttc=GETPOST('search_montant_ttc');
+$search_payment_mode=GETPOST('search_payment_mode');
+$search_payment_term=GETPOST('search_payment_term');
 $day=GETPOST('day');
 $year=GETPOST('year');
 $month=GETPOST('month');
@@ -113,31 +115,6 @@ $permissionnote = $user->rights->facture->creer; // Used by the include of actio
 $permissiondellink=$user->rights->facture->creer;	// Used by the include of actions_dellink.inc.php
 $permissiontoedit = $user->rights->facture->creer; // Used by the include of actions_lineupdonw.inc.php
 
-$arrayfields=array(
-    'f.titre'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-    's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
-    'f.total'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
-    'f.tva'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>1),
-    'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>1),
-    'recurring'=>array('label'=>$langs->trans("RecurringInvoiceTemplate"), 'checked'=>1),
-    'f.frequency'=>array('label'=>$langs->trans("Frequency"), 'checked'=>1),
-	'f.unit_frequency'=>array('label'=>$langs->trans("FrequencyUnit"), 'checked'=>1),
-	'f.nb_gen_done'=>array('label'=>$langs->trans("NbOfGenerationDone"), 'checked'=>1),
-    'f.date_last_gen'=>array('label'=>$langs->trans("DateLastGeneration"), 'checked'=>1),
-    'f.date_when'=>array('label'=>$langs->trans("NextDateToExecution"), 'checked'=>1),
-    'status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>100),
-	'f.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-    'f.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-    foreach($extrafields->attribute_label as $key => $val)
-    {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
-    }
-}
-
 
 /*
  * Actions
@@ -172,6 +149,8 @@ if (empty($reshook))
         $search_montant_ht='';
         $search_montant_vat='';
         $search_montant_ttc='';
+        $search_montant_mode='';
+        $search_montant_term='';
         $day='';
         $year='';
         $month='';
@@ -991,9 +970,12 @@ if ($action == 'create')
 
 		// Help of substitution key
 		$substitutionarray=array(
-		    '__TOTAL_HT__' => $langs->trans("AmountHT").' ('.$langs->trans("Example").': '.price($object->total_ht).')',
-		    '__TOTAL_TTC__' =>  $langs->trans("AmountTTC").' ('.$langs->trans("Example").': '.price($object->total_ttc).')',
-		    '__INVOICE_PREVIOUS_MONTH__' => $langs->trans("PreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, -1, 'm'),'%m').')',
+		    //'__TOTAL_HT__' => $langs->trans("AmountHT").' ('.$langs->trans("Example").': '.price($object->total_ht).')',
+		    //'__TOTAL_TTC__' =>  $langs->trans("AmountTTC").' ('.$langs->trans("Example").': '.price($object->total_ttc).')',
+		    '__AMOUNT_EXCL_TAX__' => $langs->trans("AmountHT").' ('.$langs->trans("Example").': '.price($object->total_ht).')',
+		    '__AMOUNT_VAT__' => $langs->trans("AmountVAT").' ('.$langs->trans("Example").': '.price($object->total_tva).')',
+			'__AMOUNT__' =>  $langs->trans("AmountTTC").' ('.$langs->trans("Example").': '.price($object->total_ttc).')',
+			'__INVOICE_PREVIOUS_MONTH__' => $langs->trans("PreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, -1, 'm'),'%m').')',
 		    '__INVOICE_MONTH__' =>  $langs->trans("MonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date,'%m').')',
 		    '__INVOICE_NEXT_MONTH__' => $langs->trans("NextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, 1, 'm'),'%m').')',
 		    '__INVOICE_PREVIOUS_MONTH_TEXT__' => $langs->trans("TextPreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, -1, 'm'),'%B').')',
@@ -1048,7 +1030,7 @@ if ($action == 'create')
 
 		// Payment mode
 		print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
-		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none', '', 1);
 		print "</td></tr>";
 
 		// Project
@@ -1187,7 +1169,7 @@ else
 
 		// Recurring invoice content
 
-		$linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/fiche-rec.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+		$linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/invoicetemplate_list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 		$morehtmlref='';
 		if ($action != 'editref') $morehtmlref.=$form->editfieldkey($object->ref, 'ref', $object->ref, $object, $user->rights->facture->creer, '', '', 0, 2);
@@ -1313,8 +1295,11 @@ else
 		$dateexample=dol_now();
 		if (! empty($object->frequency) && ! empty($object->date_when)) $dateexample=$object->date_when;
 		$substitutionarray=array(
-		    '__TOTAL_HT__' => $langs->trans("AmountHT").' ('.$langs->trans("Example").': '.price($object->total_ht).')',
-		    '__TOTAL_TTC__' =>  $langs->trans("AmountTTC").' ('.$langs->trans("Example").': '.price($object->total_ttc).')',
+		    //'__TOTAL_HT__' => $langs->trans("AmountHT").' ('.$langs->trans("Example").': '.price($object->total_ht).')',
+		    //'__TOTAL_TTC__' =>  $langs->trans("AmountTTC").' ('.$langs->trans("Example").': '.price($object->total_ttc).')',
+			'__AMOUNT_EXCL_TAX__' => $langs->trans("AmountHT").' ('.$langs->trans("Example").': '.price($object->total_ht).')',
+			'__AMOUNT_VAT__' => $langs->trans("AmountVAT").' ('.$langs->trans("Example").': '.price($object->total_tva).')',
+			'__AMOUNT__' =>  $langs->trans("AmountTTC").' ('.$langs->trans("Example").': '.price($object->total_ttc).')',
 		    '__INVOICE_PREVIOUS_MONTH__' => $langs->trans("PreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'),'%m').')',
 		    '__INVOICE_MONTH__' =>  $langs->trans("MonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample,'%m').')',
 		    '__INVOICE_NEXT_MONTH__' => $langs->trans("NextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'),'%m').')',
@@ -1624,456 +1609,6 @@ else
         print '</div></div>';
 
 	}
-	else
-	{
-		/*
-		 *  List mode
-		 */
-		$sql = "SELECT s.nom as name, s.rowid as socid, f.rowid as facid, f.titre, f.total, f.tva as total_vat, f.total_ttc, f.frequency, f.unit_frequency,";
-		$sql.= " f.nb_gen_done, f.nb_gen_max, f.date_last_gen, f.date_when,";
-		$sql.= " f.datec, f.tms";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f";
-		if (! $user->rights->societe->client->voir && ! $socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		}
-		$sql.= " WHERE f.fk_soc = s.rowid";
-		$sql.= ' AND f.entity IN ('.getEntity('facture').')';
-		if (! $user->rights->societe->client->voir && ! $socid) {
-			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-		}
-		if ($search_ref)                  $sql .= natural_search('f.titre', $search_ref);
-		if ($search_societe)              $sql .= natural_search('s.nom', $search_societe);
-		if ($search_montant_ht != '')     $sql.= natural_search('f.total', $search_montant_ht, 1);
-		if ($search_montant_vat != '')    $sql.= natural_search('f.tva', $search_montant_vat, 1);
-		if ($search_montant_ttc != '')    $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
-		if ($search_recurring == '1')     $sql.= ' AND f.frequency > 0';
-		if ($search_recurring == '0')     $sql.= ' AND (f.frequency IS NULL or f.frequency = 0)';
-		if ($search_frequency != '')      $sql.= natural_search('f.frequency', $search_frequency, 1);
-		if ($search_unit_frequency != '') $sql.= natural_search('f.unit_frequency', $search_unit_frequency);
-
-		if ($month > 0)
-		{
-		    if ($year > 0 && empty($day))
-		        $sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
-		        else if ($year > 0 && ! empty($day))
-		            $sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
-		            else
-		                $sql.= " AND date_format(f.date_last_gen, '%m') = '".$month."'";
-		}
-		else if ($year > 0)
-		{
-		    $sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
-		}
-		if ($month_date_when > 0)
-		{
-		    if ($year_date_when > 0 && empty($day_date_when))
-		        $sql.= " AND f.date_when BETWEEN '".$db->idate(dol_get_first_day($year_date_when,$month_date_when,false))."' AND '".$db->idate(dol_get_last_day($year_date_when,$month_date_when,false))."'";
-		        else if ($year_date_when > 0 && ! empty($day_date_when))
-		            $sql.= " AND f.date_date_when_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date_when, $day_date_when, $year_date_when))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date_when, $day_date_when, $year_date_when))."'";
-			else
-			$sql.= " AND date_format(f.date_when, '%m') = '".$month_date_when."'";
-		}
-		else if ($year_date_when > 0)
-		{
-		    $sql.= " AND f.date_when BETWEEN '".$db->idate(dol_get_first_day($year_date_when,1,false))."' AND '".$db->idate(dol_get_last_day($year_date_when,12,false))."'";
-		}
-
-		$nbtotalofrecords = '';
-    	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-    	{
-    		$result = $db->query($sql);
-    		$nbtotalofrecords = $db->num_rows($result);
-    	}
-
-    	$sql.= $db->order($sortfield, $sortorder);
-    	$sql.= $db->plimit($limit+1,$offset);
-
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$num = $db->num_rows($resql);
-
-			$param='';
-            if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-			if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-			if ($socid)              $param.='&socid='.$socid;
-			if ($day)                $param.='&day='.$day;
-			if ($month)              $param.='&month='.$month;
-			if ($year)               $param.='&year=' .$year;
-			if ($day_date_when)      $param.='&day_date_when='.$day_date_when;
-			if ($month_date_when)    $param.='&month_date_when='.$month_date_when;
-			if ($year_date_when)     $param.='&year_date_when=' .$year_date_when;
-			if ($search_ref)         $param.='&search_ref=' .$search_ref;
-			if ($search_societe)     $param.='&search_societe=' .$search_societe;
-			if ($search_montant_ht != '')   $param.='&search_montant_ht=' .$search_montant_ht;
-			if ($search_montant_vat != '')  $param.='&search_montant_vat='.$search_montant_vat;
-			if ($search_montant_ttc != '')  $param.='&search_montant_ttc='.$search_montant_ttc;
-			if ($search_recurring != '' && $search_recurrning != '-1')    $param.='&search_recurring='  .$search_recurring;
-			if ($search_frequency > 0)      $param.='&search_frequency='  .$search_frequency;
-			if ($search_unit_frequency > 0) $param.='&search_unit_frequency='.$search_unit_frequency;
-			if ($option)             $param.="&option=".$option;
-			if ($optioncss != '')    $param.='&optioncss='.$optioncss;
-			// Add $param from extra fields
-			foreach ($search_array_options as $key => $val)
-			{
-			    $crit=$val;
-			    $tmpkey=preg_replace('/search_options_/','',$key);
-			    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-			}
-
-			$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
-
-            $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-			$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-			//$selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-
-            print '<form method="POST" id="searchFormList" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-            if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-        	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-        	print '<input type="hidden" name="action" value="list">';
-        	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-        	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-            print '<input type="hidden" name="page" value="'.$page.'">';
-            print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-            print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
-
-	        print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy.png',0,'','', $limit);
-
-			print $langs->trans("ToCreateAPredefinedInvoice", $langs->transnoentitiesnoconv("ChangeIntoRepeatableInvoice")).'<br><br>';
-
-			$i = 0;
-
-			print '<div class="div-table-responsive">';
-            print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-
-			// Filters lines
-			print '<tr class="liste_titre_filter">';
-			// Ref
-			if (! empty($arrayfields['f.titre']['checked']))
-			{
-			    print '<td class="liste_titre" align="left">';
-			    print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-			    print '</td>';
-			}
-			// Thirpdarty
-			if (! empty($arrayfields['s.nom']['checked']))
-			{
-			    print '<td class="liste_titre" align="left"><input class="flat" type="text" size="8" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
-			}
-			if (! empty($arrayfields['f.total']['checked']))
-			{
-			    // Amount
-			    print '<td class="liste_titre" align="right">';
-			    print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
-			    print '</td>';
-			}
-			if (! empty($arrayfields['f.tva']['checked']))
-			{
-			    // Amount
-			    print '<td class="liste_titre" align="right">';
-			    print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
-			    print '</td>';
-			}
-			if (! empty($arrayfields['f.total_ttc']['checked']))
-			{
-			    // Amount
-			    print '<td class="liste_titre" align="right">';
-			    print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
-			    print '</td>';
-			}
-			if (! empty($arrayfields['recurring']['checked']))
-			{
-			    // Recurring or not
-			    print '<td class="liste_titre" align="center">';
-			    print $form->selectyesno('search_recurring', $search_recurring, 1, false, 1);
-			    print '</td>';
-			}
-			if (! empty($arrayfields['f.frequency']['checked']))
-			{
-			    // Recurring or not
-			    print '<td class="liste_titre" align="center">';
-			    print '<input class="flat" type="text" size="1" name="search_frequency" value="'.dol_escape_htmltag($search_frequency).'">';
-			    print '</td>';
-			}
-			if (! empty($arrayfields['f.unit_frequency']['checked']))
-			{
-			    // Frequency unit
-			    print '<td class="liste_titre" align="center">';
-			    print '<input class="flat" type="text" size="1" name="search_unit_frequency" value="'.dol_escape_htmltag($search_unit_frequency).'">';
-			    print '</td>';
-			}
-			if (! empty($arrayfields['f.nb_gen_done']['checked']))
-			{
-			    // Nb generation
-			    print '<td class="liste_titre" align="center">';
-			    print '</td>';
-			}
-			// Date invoice
-			if (! empty($arrayfields['f.date_last_gen']['checked']))
-			{
-			    print '<td class="liste_titre" align="center">';
-			    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
-			    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-			    $formother->select_year($year?$year:-1,'year',1, 20, 5);
-			    print '</td>';
-			}
-			// Date due
-			if (! empty($arrayfields['f.date_when']['checked']))
-			{
-			    print '<td class="liste_titre" align="center">';
-			    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_date_when" value="'.$day_date_when.'">';
-			    print '<input class="flat" type="text" size="1" maxlength="2" name="month_date_when" value="'.$month_date_when.'">';
-			    $formother->select_year($year_date_when?$year_date_when:-1,'year_date_when',1, 20, 5);
-			    print '</td>';
-			}
-			// Extra fields
-			if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-			{
-			    foreach($extrafields->attribute_label as $key => $val)
-			    {
-			        if (! empty($arrayfields["ef.".$key]['checked']))
-			        {
-			            $align=$extrafields->getAlignFlag($key);
-			            $typeofextrafield=$extrafields->attribute_type[$key];
-			            print '<td class="liste_titre'.($align?' '.$align:'').'">';
-			            if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
-			            {
-			                $crit=$val;
-			                $tmpkey=preg_replace('/search_options_/','',$key);
-			                $searchclass='';
-			                if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-			                if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
-			                print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
-			            }
-			            print '</td>';
-			        }
-			    }
-			}
-			// Fields from hook
-			$parameters=array('arrayfields'=>$arrayfields);
-			$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
-			print $hookmanager->resPrint;
-			// Date creation
-			if (! empty($arrayfields['f.datec']['checked']))
-			{
-			    print '<td class="liste_titre">';
-			    print '</td>';
-			}
-			// Date modification
-			if (! empty($arrayfields['f.tms']['checked']))
-			{
-			    print '<td class="liste_titre">';
-			    print '</td>';
-			}
-			// Status
-			if (! empty($arrayfields['status']['checked']))
-			{
-			    print '<td class="liste_titre" align="center">';
-			    print '</td>';
-			}
-			// Action column
-			print '<td class="liste_titre" align="middle">';
-			$searchpicto=$form->showFilterAndCheckAddButtons(0, 'checkforselect', 1);
-			print $searchpicto;
-			print '</td>';
-			print "</tr>\n";
-
-
-			print '<tr class="liste_titre">';
-			if (! empty($arrayfields['f.titre']['checked']))         print_liste_field_titre($arrayfields['f.titre']['label'],$_SERVER['PHP_SELF'],"f.titre","",$param,"",$sortfield,$sortorder);
-			if (! empty($arrayfields['s.nom']['checked']))           print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER['PHP_SELF'],"s.nom","",$param,"",$sortfield,$sortorder);
-			if (! empty($arrayfields['f.total']['checked']))         print_liste_field_titre($arrayfields['f.total']['label'],$_SERVER['PHP_SELF'],"f.total","",$param,'align="right"',$sortfield,$sortorder);
-			if (! empty($arrayfields['f.tva']['checked']))           print_liste_field_titre($arrayfields['f.tva']['label'],$_SERVER['PHP_SELF'],"f.tva","",$param,'align="right"',$sortfield,$sortorder);
-			if (! empty($arrayfields['f.total_ttc']['checked']))     print_liste_field_titre($arrayfields['f.total_ttc']['label'],$_SERVER['PHP_SELF'],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
-			if (! empty($arrayfields['recurring']['checked']))       print_liste_field_titre($arrayfields['recurring']['label'],$_SERVER['PHP_SELF'],"recurring","",$param,'align="center"',$sortfield,$sortorder);
-			if (! empty($arrayfields['f.frequency']['checked']))     print_liste_field_titre($arrayfields['f.frequency']['label'],$_SERVER['PHP_SELF'],"f.frequency","",$param,'align="center"',$sortfield,$sortorder);
-			if (! empty($arrayfields['f.unit_frequency']['checked'])) print_liste_field_titre($arrayfields['f.unit_frequency']['label'],$_SERVER['PHP_SELF'],"f.unit_frequency","",$param,'align="center"',$sortfield,$sortorder);
-			if (! empty($arrayfields['f.nb_gen_done']['checked']))   print_liste_field_titre($arrayfields['f.nb_gen_done']['label'],$_SERVER['PHP_SELF'],"f.nb_gen_done","",$param,'align="center"',$sortfield,$sortorder);
-			if (! empty($arrayfields['f.date_last_gen']['checked'])) print_liste_field_titre($arrayfields['f.date_last_gen']['label'],$_SERVER['PHP_SELF'],"f.date_last_gen","",$param,'align="center"',$sortfield,$sortorder);
-			if (! empty($arrayfields['f.date_when']['checked']))     print_liste_field_titre($arrayfields['f.date_when']['label'],$_SERVER['PHP_SELF'],"f.date_when","",$param,'align="center"',$sortfield,$sortorder);
-			if (! empty($arrayfields['f.datec']['checked']))         print_liste_field_titre($arrayfields['f.datec']['label'],$_SERVER['PHP_SELF'],"f.datec","",$param,'align="center"',$sortfield,$sortorder);
-			if (! empty($arrayfields['f.tms']['checked']))           print_liste_field_titre($arrayfields['f.tms']['label'],$_SERVER['PHP_SELF'],"f.tms","",$param,'align="center"',$sortfield,$sortorder);
-			if (! empty($arrayfields['status']['checked']))          print_liste_field_titre($arrayfields['status']['label'],$_SERVER['PHP_SELF'],"","",$param,'align="center"',$sortfield,$sortorder);
-			print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ')."\n";
-			print "</tr>\n";
-
-			if ($num > 0)
-			{
-				$i=0;
-				$totalarray=array();
-				while ($i < min($num,$limit))
-				{
-					$objp = $db->fetch_object($resql);
-					if (empty($objp)) break;
-
-					$companystatic->id=$objp->socid;
-					$companystatic->name=$objp->name;
-
-					$invoicerectmp->id=$objp->id;
-					$invoicerectmp->frequency=$objp->frequency;
-					$invoicerectmp->suspend=$objp->suspend;
-					$invoicerectmp->unit_frequency=$objp->unit_frequency;
-
-					print '<tr class="oddeven">';
-
-					if (! empty($arrayfields['f.titre']['checked']))
-					{
-					   print '<td><a href="'.$_SERVER['PHP_SELF'].'?id='.$objp->facid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$objp->titre;
-					   print "</a></td>\n";
-					   if (! $i) $totalarray['nbfield']++;
-					}
-					if (! empty($arrayfields['s.nom']['checked']))
-					{
-					   print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1,'customer').'</td>';
-					   if (! $i) $totalarray['nbfield']++;
-					}
-					if (! empty($arrayfields['f.total']['checked']))
-					{
-					   print '<td align="right">'.price($objp->total).'</td>'."\n";
-					   if (! $i) $totalarray['nbfield']++;
-					   if (! $i) $totalarray['pos'][$totalarray['nbfield']-1]='f.total';
-					   $totalarray['val']['f.total'] += $objp->total;
-					}
-					if (! empty($arrayfields['f.tva']['checked']))
-					{
-					   print '<td align="right">'.price($objp->total_vat).'</td>'."\n";
-					   if (! $i) $totalarray['nbfield']++;
-					   if (! $i) $totalarray['pos'][$totalarray['nbfield']-1]='f.tva';
-					   $totalarray['val']['f.tva'] += $objp->total_vat;
-					}
-					if (! empty($arrayfields['f.total_ttc']['checked']))
-					{
-					   print '<td align="right">'.price($objp->total_ttc).'</td>'."\n";
-					   if (! $i) $totalarray['nbfield']++;
-					   if (! $i) $totalarray['pos'][$totalarray['nbfield']-1]='f.total_ttc';
-					   $totalarray['val']['f.total_ttc'] += $objp->total_ttc;
-					}
-					if (! empty($arrayfields['recurring']['checked']))
-					{
-					   print '<td align="center">'.yn($objp->frequency?1:0).'</td>';
-					   if (! $i) $totalarray['nbfield']++;
-					}
-					if (! empty($arrayfields['f.frequency']['checked']))
-					{
-					   print '<td align="center">'.($objp->frequency > 0 ? $objp->frequency : '').'</td>';
-					   if (! $i) $totalarray['nbfield']++;
-					}
-					if (! empty($arrayfields['f.unit_frequency']['checked']))
-					{
-					   print '<td align="center">'.($objp->frequency > 0 ? $objp->unit_frequency : '').'</td>';
-					   if (! $i) $totalarray['nbfield']++;
-					}
-					if (! empty($arrayfields['f.nb_gen_done']['checked']))
-					{
-					    print '<td align="center">';
-					    print ($objp->frequency ? $objp->nb_gen_done.($objp->nb_gen_max>0?' / '. $objp->nb_gen_max:'') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
-					    print '</td>';
-					    if (! $i) $totalarray['nbfield']++;
-					}
-					if (! empty($arrayfields['f.date_last_gen']['checked']))
-					{
-					   print '<td align="center">';
-					   print ($objp->frequency ? dol_print_date($db->jdate($objp->date_last_gen),'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
-					   print '</td>';
-					   if (! $i) $totalarray['nbfield']++;
-					}
-					if (! empty($arrayfields['f.date_when']['checked']))
-					{
-					   print '<td align="center">';
-					   print ($objp->frequency ? dol_print_date($db->jdate($objp->date_when),'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
-					   print '</td>';
-					   if (! $i) $totalarray['nbfield']++;
-					}
-					if (! empty($arrayfields['f.datec']['checked']))
-					{
-					   print '<td align="center">';
-					   print dol_print_date($db->jdate($objp->datec),'dayhour');
-					   print '</td>';
-					   if (! $i) $totalarray['nbfield']++;
-					}
-					if (! empty($arrayfields['f.tms']['checked']))
-					{
-					   print '<td align="center">';
-					   print dol_print_date($db->jdate($objp->tms),'dayhour');
-					   print '</td>';
-					   if (! $i) $totalarray['nbfield']++;
-					}
-					if (! empty($arrayfields['status']['checked']))
-					{
-					   print '<td align="center">';
-					   print $invoicerectmp->getLibStatut(3,0);
-					   print '</td>';
-					   if (! $i) $totalarray['nbfield']++;
-					}
-					// Action column
-					print '<td align="center">';
-					if ($user->rights->facture->creer)
-					{
-				        if (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
-				        {
-                            print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
-                            print $langs->trans("CreateBill").'</a>';
-				        }
-				        else
-				        {
-				            print $langs->trans("DateIsNotEnough");
-				        }
-					}
-					else
-					{
-					    print "&nbsp;";
-					}
-					if (! $i) $totalarray['nbfield']++;
-					print "</td>";
-
-					print "</tr>\n";
-
-					$i++;
-				}
-			}
-			else
-			{
-			    $colspan=1;
-			    foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
-			    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
-			}
-
-			//var_dump($totalarray);
-			// Show total line
-			if (isset($totalarray['pos']))
-			{
-				print '<tr class="liste_total">';
-				$i=0;
-				while ($i < $totalarray['nbfield'])
-				{
-					$i++;
-					if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
-					else
-					{
-						if ($i == 1)
-						{
-							if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
-							else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
-						}
-						print '<td></td>';
-					}
-				}
-				print '</tr>';
-			}
-
-			print "</table>";
-			print "</div>";
-			print "</form>";
-
-			$db->free($resql);
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
-
 }
 
 llxFooter();
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
new file mode 100644
index 00000000000..e911f6eab74
--- /dev/null
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -0,0 +1,700 @@
+<?php
+/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013      Florian Henry	    <florian.henry@open-concept.pro>
+ * Copyright (C) 2013      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2015      Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2016      Meziane Sof		<virtualsof@yahoo.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/compta/facture/invoicetemplate_list.php
+ *	\ingroup    facture
+ *	\brief      Page to show list of template/recurring invoices
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+if (! empty($conf->projet->enabled)) {
+    require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    //require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+}
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/invoice.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+
+$langs->load('bills');
+$langs->load('compta');
+$langs->load('admin');
+$langs->load('other');
+
+$action     = GETPOST('action','alpha');
+$massaction = GETPOST('massaction','alpha');
+$show_files = GETPOST('show_files','int');
+$confirm    = GETPOST('confirm','alpha');
+$cancel     = GETPOST('cancel', 'alpha');
+$toselect   = GETPOST('toselect', 'array');
+$contextpage= GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'invoicetemplatelist';   // To manage different context of search
+
+// Security check
+$id=(GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int'));
+$lineid=GETPOST('lineid','int');
+$ref=GETPOST('ref','alpha');
+if ($user->societe_id) $socid=$user->societe_id;
+$objecttype = 'facture_rec';
+if ($action == "create" || $action == "add") $objecttype = '';
+$result = restrictedArea($user, 'facture', $id, $objecttype);
+$projectid = GETPOST('projectid','int');
+
+$search_ref=GETPOST('search_ref');
+$search_societe=GETPOST('search_societe');
+$search_montant_ht=GETPOST('search_montant_ht');
+$search_montant_vat=GETPOST('search_montant_vat');
+$search_montant_ttc=GETPOST('search_montant_ttc');
+$search_payment_mode=GETPOST('search_payment_mode');
+$search_payment_term=GETPOST('search_payment_term');
+$day=GETPOST('day');
+$year=GETPOST('year');
+$month=GETPOST('month');
+$day_date_when=GETPOST('day_date_when');
+$year_date_when=GETPOST('year_date_when');
+$month_date_when=GETPOST('month_date_when');
+$search_recurring=GETPOST('search_recurring','int');
+$search_frequency=GETPOST('search_frequency','alpha');
+$search_unit_frequency=GETPOST('search_unit_frequency','alpha');
+
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+if (! $sortorder) $sortorder='DESC';
+if (! $sortfield) $sortfield='f.titre';
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+$object = new FactureRec($db);
+if (($id > 0 || $ref) && $action != 'create' && $action != 'add')
+{
+	$ret = $object->fetch($id, $ref);
+	if (!$ret)
+	{
+		setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors');
+	}
+}
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('invoicereccard','globalcard'));
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('facture_rec');
+$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
+
+$permissionnote = $user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php
+$permissiondellink=$user->rights->facture->creer;	// Used by the include of actions_dellink.inc.php
+$permissiontoedit = $user->rights->facture->creer; // Used by the include of actions_lineupdonw.inc.php
+
+$arrayfields=array(
+    'f.titre'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+    's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
+    'f.total'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
+    'f.tva'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>1),
+    'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>1),
+    'f.fk_mode_reglement'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>0),
+    'f.fk_cond_reglement'=>array('label'=>$langs->trans("PaymentTerm"), 'checked'=>0),
+	'recurring'=>array('label'=>$langs->trans("RecurringInvoiceTemplate"), 'checked'=>1),
+    'f.frequency'=>array('label'=>$langs->trans("Frequency"), 'checked'=>1),
+	'f.unit_frequency'=>array('label'=>$langs->trans("FrequencyUnit"), 'checked'=>1),
+	'f.nb_gen_done'=>array('label'=>$langs->trans("NbOfGenerationDone"), 'checked'=>1),
+    'f.date_last_gen'=>array('label'=>$langs->trans("DateLastGeneration"), 'checked'=>1),
+    'f.date_when'=>array('label'=>$langs->trans("NextDateToExecution"), 'checked'=>1),
+    'status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>100),
+	'f.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+    'f.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+    }
+}
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+    if (GETPOST('cancel','alpha')) $action='';
+
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Do we click on purge search criteria ?
+    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers
+    {
+        $search_ref='';
+        $search_societe='';
+        $search_montant_ht='';
+        $search_montant_vat='';
+        $search_montant_ttc='';
+        $search_payment_mode='';
+        $search_payment_term='';
+        $day='';
+        $year='';
+        $month='';
+        $day_date_when='';
+        $year_date_when='';
+        $month_date_when='';
+        $search_recurring='';
+        $search_frequency='';
+        $search_unit_frequency='';
+        $search_array_options=array();
+    }
+
+    // Mass actions
+    /*$objectclass='MyObject';
+    $objectlabel='MyObject';
+    $permtoread = $user->rights->mymodule->read;
+    $permtodelete = $user->rights->mymodule->delete;
+    $uploaddir = $conf->mymodule->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';*/
+
+}
+
+
+/*
+ *	View
+ */
+
+llxHeader('',$langs->trans("RepeatableInvoices"),'ch-facture.html#s-fac-facture-rec');
+
+$form = new Form($db);
+$formother = new FormOther($db);
+if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+$companystatic = new Societe($db);
+$invoicerectmp = new FactureRec($db);
+
+$now = dol_now();
+$tmparray=dol_getdate($now);
+$today = dol_mktime(23,59,59,$tmparray['mon'],$tmparray['mday'],$tmparray['year']);   // Today is last second of current day
+
+
+/*
+ *  List mode
+ */
+$sql = "SELECT s.nom as name, s.rowid as socid, f.rowid as facid, f.titre, f.total, f.tva as total_vat, f.total_ttc, f.frequency, f.unit_frequency,";
+$sql.= " f.nb_gen_done, f.nb_gen_max, f.date_last_gen, f.date_when,";
+$sql.= " f.datec, f.tms,";
+$sql.= " f.fk_cond_reglement, f.fk_mode_reglement";
+$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f";
+if (! $user->rights->societe->client->voir && ! $socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
+$sql.= " WHERE f.fk_soc = s.rowid";
+$sql.= ' AND f.entity IN ('.getEntity('facture').')';
+if (! $user->rights->societe->client->voir && ! $socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
+if ($search_ref)                  $sql .= natural_search('f.titre', $search_ref);
+if ($search_societe)              $sql .= natural_search('s.nom', $search_societe);
+if ($search_montant_ht != '')     $sql .= natural_search('f.total', $search_montant_ht, 1);
+if ($search_montant_vat != '')    $sql .= natural_search('f.tva', $search_montant_vat, 1);
+if ($search_montant_ttc != '')    $sql .= natural_search('f.total_ttc', $search_montant_ttc, 1);
+if (! empty($search_payment_mode) && $search_payment_mode != '-1')   $sql .= natural_search('f.fk_mode_reglement', $search_payment_mode, 1);
+if (! empty($search_payment_term) && $search_payment_term != '-1')   $sql .= natural_search('f.fk_cond_reglement', $search_payment_term, 1);
+if ($search_recurring == '1')     $sql .= ' AND f.frequency > 0';
+if ($search_recurring == '0')     $sql .= ' AND (f.frequency IS NULL or f.frequency = 0)';
+if ($search_frequency != '')      $sql .= natural_search('f.frequency', $search_frequency, 1);
+if ($search_unit_frequency != '') $sql .= natural_search('f.unit_frequency', $search_unit_frequency);
+
+if ($month > 0)
+{
+    if ($year > 0 && empty($day))
+        $sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
+    else if ($year > 0 && ! empty($day))
+        $sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+    else
+        $sql.= " AND date_format(f.date_last_gen, '%m') = '".$month."'";
+}
+else if ($year > 0)
+{
+    $sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+}
+if ($month_date_when > 0)
+{
+    if ($year_date_when > 0 && empty($day_date_when))
+        $sql.= " AND f.date_when BETWEEN '".$db->idate(dol_get_first_day($year_date_when,$month_date_when,false))."' AND '".$db->idate(dol_get_last_day($year_date_when,$month_date_when,false))."'";
+    else if ($year_date_when > 0 && ! empty($day_date_when))
+        $sql.= " AND f.date_date_when_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date_when, $day_date_when, $year_date_when))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date_when, $day_date_when, $year_date_when))."'";
+	else
+		$sql.= " AND date_format(f.date_when, '%m') = '".$month_date_when."'";
+}
+else if ($year_date_when > 0)
+{
+    $sql.= " AND f.date_when BETWEEN '".$db->idate(dol_get_first_day($year_date_when,1,false))."' AND '".$db->idate(dol_get_last_day($year_date_when,12,false))."'";
+}
+
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+}
+
+$sql.= $db->order($sortfield, $sortorder);
+$sql.= $db->plimit($limit+1,$offset);
+
+$resql = $db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+
+	$param='';
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+	if ($socid)              $param.='&socid='.urlencode($socid);
+	if ($day)                $param.='&day='.urlencode($day);
+	if ($month)              $param.='&month='.urlencode($month);
+	if ($year)               $param.='&year=' .urlencode($year);
+	if ($day_date_when)      $param.='&day_date_when='.urlencode($day_date_when);
+	if ($month_date_when)    $param.='&month_date_when='.urlencode($month_date_when);
+	if ($year_date_when)     $param.='&year_date_when=' .urlencode($year_date_when);
+	if ($search_ref)         $param.='&search_ref=' .urlencode($search_ref);
+	if ($search_societe)     $param.='&search_societe=' .urlencode($search_societe);
+	if ($search_montant_ht != '')   $param.='&search_montant_ht=' .urlencode($search_montant_ht);
+	if ($search_montant_vat != '')  $param.='&search_montant_vat='.urlencode($search_montant_vat);
+	if ($search_montant_ttc != '')  $param.='&search_montant_ttc='.urlencode($search_montant_ttc);
+	if ($search_payment_mode != '') $param.='&search_payment_mode='.urlencode($search_payment_mode);
+	if ($search_payment_type != '') $param.='&search_payment_type='.urlencode($search_payment_type);
+	if ($search_recurring != '' && $search_recurrning != '-1')    $param.='&search_recurring='  .urlencode($search_recurring);
+	if ($search_frequency > 0)      $param.='&search_frequency='  .urlencode($search_frequency);
+	if ($search_unit_frequency > 0) $param.='&search_unit_frequency='.urlencode($search_unit_frequency);
+	if ($option)             $param.="&option=".urlencode($option);
+	if ($optioncss != '')    $param.='&optioncss='.urlencode($optioncss);
+	// Add $param from extra fields
+	foreach ($search_array_options as $key => $val)
+	{
+	    $crit=$val;
+	    $tmpkey=preg_replace('/search_options_/','',$key);
+	    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+	}
+
+	$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
+
+	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+	//$selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
+
+	print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy.png',0,'','', $limit);
+
+	print $langs->trans("ToCreateAPredefinedInvoice", $langs->transnoentitiesnoconv("ChangeIntoRepeatableInvoice")).'<br><br>';
+
+	$i = 0;
+
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
+	// Filters lines
+	print '<tr class="liste_titre_filter">';
+	// Ref
+	if (! empty($arrayfields['f.titre']['checked']))
+	{
+	    print '<td class="liste_titre" align="left">';
+	    print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	    print '</td>';
+	}
+	// Thirpdarty
+	if (! empty($arrayfields['s.nom']['checked']))
+	{
+	    print '<td class="liste_titre" align="left"><input class="flat" type="text" size="8" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
+	}
+	if (! empty($arrayfields['f.total']['checked']))
+	{
+	    // Amount net
+	    print '<td class="liste_titre" align="right">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
+	    print '</td>';
+	}
+	if (! empty($arrayfields['f.tva']['checked']))
+	{
+	    // Amount Vat
+	    print '<td class="liste_titre" align="right">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
+	    print '</td>';
+	}
+	if (! empty($arrayfields['f.total_ttc']['checked']))
+	{
+	    // Amount
+	    print '<td class="liste_titre" align="right">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
+	    print '</td>';
+	}
+	if (! empty($arrayfields['f.fk_cond_reglement']['checked']))
+	{
+	    // Payment term
+	    print '<td class="liste_titre" align="right">';
+	    print $form->select_conditions_paiements($search_payment_term, 'search_payment_term', -1, 1, 1, 'maxwidth100');
+	    print "</td>";
+	}
+	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
+	{
+	    // Payment mode
+	    print '<td class="liste_titre" align="right">';
+	    print $form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100');
+	    print '</td>';
+	}
+	if (! empty($arrayfields['recurring']['checked']))
+	{
+	    // Recurring or not
+	    print '<td class="liste_titre" align="center">';
+	    print $form->selectyesno('search_recurring', $search_recurring, 1, false, 1);
+	    print '</td>';
+	}
+	if (! empty($arrayfields['f.frequency']['checked']))
+	{
+	    // Recurring or not
+	    print '<td class="liste_titre" align="center">';
+	    print '<input class="flat" type="text" size="1" name="search_frequency" value="'.dol_escape_htmltag($search_frequency).'">';
+	    print '</td>';
+	}
+	if (! empty($arrayfields['f.unit_frequency']['checked']))
+	{
+	    // Frequency unit
+	    print '<td class="liste_titre" align="center">';
+	    print '<input class="flat" type="text" size="1" name="search_unit_frequency" value="'.dol_escape_htmltag($search_unit_frequency).'">';
+	    print '</td>';
+	}
+	if (! empty($arrayfields['f.nb_gen_done']['checked']))
+	{
+	    // Nb generation
+	    print '<td class="liste_titre" align="center">';
+	    print '</td>';
+	}
+	// Date invoice
+	if (! empty($arrayfields['f.date_last_gen']['checked']))
+	{
+	    print '<td class="liste_titre" align="center">';
+	    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
+	    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+	    $formother->select_year($year?$year:-1,'year',1, 20, 5);
+	    print '</td>';
+	}
+	// Date due
+	if (! empty($arrayfields['f.date_when']['checked']))
+	{
+	    print '<td class="liste_titre" align="center">';
+	    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_date_when" value="'.$day_date_when.'">';
+	    print '<input class="flat" type="text" size="1" maxlength="2" name="month_date_when" value="'.$month_date_when.'">';
+	    $formother->select_year($year_date_when?$year_date_when:-1,'year_date_when',1, 20, 5);
+	    print '</td>';
+	}
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	    foreach($extrafields->attribute_label as $key => $val)
+	    {
+	        if (! empty($arrayfields["ef.".$key]['checked']))
+	        {
+	            $align=$extrafields->getAlignFlag($key);
+	            $typeofextrafield=$extrafields->attribute_type[$key];
+	            print '<td class="liste_titre'.($align?' '.$align:'').'">';
+	            if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+	            {
+	                $crit=$val;
+	                $tmpkey=preg_replace('/search_options_/','',$key);
+	                $searchclass='';
+	                if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+	                if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+	                print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+	            }
+	            print '</td>';
+	        }
+	    }
+	}
+	// Fields from hook
+	$parameters=array('arrayfields'=>$arrayfields);
+	$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Date creation
+	if (! empty($arrayfields['f.datec']['checked']))
+	{
+	    print '<td class="liste_titre">';
+	    print '</td>';
+	}
+	// Date modification
+	if (! empty($arrayfields['f.tms']['checked']))
+	{
+	    print '<td class="liste_titre">';
+	    print '</td>';
+	}
+	// Status
+	if (! empty($arrayfields['status']['checked']))
+	{
+	    print '<td class="liste_titre" align="center">';
+	    print '</td>';
+	}
+	// Action column
+	print '<td class="liste_titre" align="middle">';
+	$searchpicto=$form->showFilterAndCheckAddButtons(0, 'checkforselect', 1);
+	print $searchpicto;
+	print '</td>';
+	print "</tr>\n";
+
+
+	print '<tr class="liste_titre">';
+	if (! empty($arrayfields['f.titre']['checked']))         print_liste_field_titre($arrayfields['f.titre']['label'],$_SERVER['PHP_SELF'],"f.titre","",$param,"",$sortfield,$sortorder);
+	if (! empty($arrayfields['s.nom']['checked']))           print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER['PHP_SELF'],"s.nom","",$param,"",$sortfield,$sortorder);
+	if (! empty($arrayfields['f.total']['checked']))         print_liste_field_titre($arrayfields['f.total']['label'],$_SERVER['PHP_SELF'],"f.total","",$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.tva']['checked']))           print_liste_field_titre($arrayfields['f.tva']['label'],$_SERVER['PHP_SELF'],"f.tva","",$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.total_ttc']['checked']))     print_liste_field_titre($arrayfields['f.total_ttc']['label'],$_SERVER['PHP_SELF'],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.fk_cond_reglement']['checked']))     print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'],$_SERVER['PHP_SELF'],"f.fk_cond_reglement","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))     print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'],$_SERVER['PHP_SELF'],"f.fk_mode_reglement","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['recurring']['checked']))       print_liste_field_titre($arrayfields['recurring']['label'],$_SERVER['PHP_SELF'],"recurring","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.frequency']['checked']))     print_liste_field_titre($arrayfields['f.frequency']['label'],$_SERVER['PHP_SELF'],"f.frequency","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.unit_frequency']['checked'])) print_liste_field_titre($arrayfields['f.unit_frequency']['label'],$_SERVER['PHP_SELF'],"f.unit_frequency","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.nb_gen_done']['checked']))   print_liste_field_titre($arrayfields['f.nb_gen_done']['label'],$_SERVER['PHP_SELF'],"f.nb_gen_done","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.date_last_gen']['checked'])) print_liste_field_titre($arrayfields['f.date_last_gen']['label'],$_SERVER['PHP_SELF'],"f.date_last_gen","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.date_when']['checked']))     print_liste_field_titre($arrayfields['f.date_when']['label'],$_SERVER['PHP_SELF'],"f.date_when","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.datec']['checked']))         print_liste_field_titre($arrayfields['f.datec']['label'],$_SERVER['PHP_SELF'],"f.datec","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.tms']['checked']))           print_liste_field_titre($arrayfields['f.tms']['label'],$_SERVER['PHP_SELF'],"f.tms","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['status']['checked']))          print_liste_field_titre($arrayfields['status']['label'],$_SERVER['PHP_SELF'],"","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'nomaxwidthsearch ')."\n";
+	print "</tr>\n";
+
+	if ($num > 0)
+	{
+		$i=0;
+		$totalarray=array();
+		while ($i < min($num,$limit))
+		{
+			$objp = $db->fetch_object($resql);
+			if (empty($objp)) break;
+
+			$companystatic->id=$objp->socid;
+			$companystatic->name=$objp->name;
+
+			$invoicerectmp->id=$objp->id;
+			$invoicerectmp->frequency=$objp->frequency;
+			$invoicerectmp->suspend=$objp->suspend;
+			$invoicerectmp->unit_frequency=$objp->unit_frequency;
+
+			print '<tr class="oddeven">';
+
+			if (! empty($arrayfields['f.titre']['checked']))
+			{
+			   print '<td><a href="'.DOL_URL_ROOT.'/compta/facture/fiche-rec.php?id='.$objp->facid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$objp->titre;
+			   print "</a></td>\n";
+			   if (! $i) $totalarray['nbfield']++;
+			}
+			if (! empty($arrayfields['s.nom']['checked']))
+			{
+			   print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1,'customer').'</td>';
+			   if (! $i) $totalarray['nbfield']++;
+			}
+			if (! empty($arrayfields['f.total']['checked']))
+			{
+			   print '<td align="right">'.price($objp->total).'</td>'."\n";
+			   if (! $i) $totalarray['nbfield']++;
+			   if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.total';
+			   $totalarray['val']['f.total'] += $objp->total;
+			}
+			if (! empty($arrayfields['f.tva']['checked']))
+			{
+			   print '<td align="right">'.price($objp->total_vat).'</td>'."\n";
+			   if (! $i) $totalarray['nbfield']++;
+			   if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.tva';
+			   $totalarray['val']['f.tva'] += $objp->total_vat;
+			}
+			if (! empty($arrayfields['f.total_ttc']['checked']))
+			{
+			   print '<td align="right">'.price($objp->total_ttc).'</td>'."\n";
+			   if (! $i) $totalarray['nbfield']++;
+			   if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.total_ttc';
+			   $totalarray['val']['f.total_ttc'] += $objp->total_ttc;
+			}
+			// Payment term
+			if (! empty($arrayfields['f.fk_cond_reglement']['checked']))
+			{
+			   print '<td align="right">';
+			   print $form->form_conditions_reglement('', $objp->fk_cond_reglement, 'none');
+			   print '</td>'."\n";
+			   if (! $i) $totalarray['nbfield']++;
+			}
+			// Payment mode
+			if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
+			{
+			   print '<td align="right">';
+			   print $form->form_modes_reglement('', $objp->fk_mode_reglement, 'none');
+			   print '</td>'."\n";
+			   if (! $i) $totalarray['nbfield']++;
+			}
+			if (! empty($arrayfields['recurring']['checked']))
+			{
+			   print '<td align="center">'.yn($objp->frequency?1:0).'</td>';
+			   if (! $i) $totalarray['nbfield']++;
+			}
+			if (! empty($arrayfields['f.frequency']['checked']))
+			{
+			   print '<td align="center">'.($objp->frequency > 0 ? $objp->frequency : '').'</td>';
+			   if (! $i) $totalarray['nbfield']++;
+			}
+			if (! empty($arrayfields['f.unit_frequency']['checked']))
+			{
+			   print '<td align="center">'.($objp->frequency > 0 ? $objp->unit_frequency : '').'</td>';
+			   if (! $i) $totalarray['nbfield']++;
+			}
+			if (! empty($arrayfields['f.nb_gen_done']['checked']))
+			{
+			    print '<td align="center">';
+			    print ($objp->frequency ? $objp->nb_gen_done.($objp->nb_gen_max>0?' / '. $objp->nb_gen_max:'') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+			    print '</td>';
+			    if (! $i) $totalarray['nbfield']++;
+			}
+			if (! empty($arrayfields['f.date_last_gen']['checked']))
+			{
+			   print '<td align="center">';
+			   print ($objp->frequency ? dol_print_date($db->jdate($objp->date_last_gen),'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+			   print '</td>';
+			   if (! $i) $totalarray['nbfield']++;
+			}
+			if (! empty($arrayfields['f.date_when']['checked']))
+			{
+			   print '<td align="center">';
+			   print ($objp->frequency ? dol_print_date($db->jdate($objp->date_when),'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+			   print '</td>';
+			   if (! $i) $totalarray['nbfield']++;
+			}
+			if (! empty($arrayfields['f.datec']['checked']))
+			{
+			   print '<td align="center">';
+			   print dol_print_date($db->jdate($objp->datec),'dayhour');
+			   print '</td>';
+			   if (! $i) $totalarray['nbfield']++;
+			}
+			if (! empty($arrayfields['f.tms']['checked']))
+			{
+			   print '<td align="center">';
+			   print dol_print_date($db->jdate($objp->tms),'dayhour');
+			   print '</td>';
+			   if (! $i) $totalarray['nbfield']++;
+			}
+			if (! empty($arrayfields['status']['checked']))
+			{
+			   print '<td align="center">';
+			   print $invoicerectmp->getLibStatut(3,0);
+			   print '</td>';
+			   if (! $i) $totalarray['nbfield']++;
+			}
+			// Action column
+			print '<td align="center">';
+			if ($user->rights->facture->creer)
+			{
+		        if (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
+		        {
+					print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
+					print $langs->trans("CreateBill").'</a>';
+		        }
+		        else
+		        {
+		            print $langs->trans("DateIsNotEnough");
+		        }
+			}
+			else
+			{
+			    print "&nbsp;";
+			}
+			if (! $i) $totalarray['nbfield']++;
+			print "</td>";
+
+			print "</tr>\n";
+
+			$i++;
+		}
+	}
+	else
+	{
+	    $colspan=1;
+	    foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+	    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	}
+
+	//var_dump($totalarray);
+	// Show total line
+	if (isset($totalarray['pos']))
+	{
+		print '<tr class="liste_total">';
+		$i=0;
+		while ($i < $totalarray['nbfield'])
+		{
+			$i++;
+			if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+			else
+			{
+				if ($i == 1)
+				{
+					if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+					else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+				}
+				else print '<td></td>';
+			}
+		}
+		print '</tr>';
+	}
+
+	print "</table>";
+	print "</div>";
+	print "</form>";
+
+	$db->free($resql);
+}
+else
+{
+	dol_print_error($db);
+}
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 628be5660df..f00f8c146ed 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2987,13 +2987,15 @@ class Form
      *      Constant MAIN_DEFAULT_PAYMENT_TERM_ID can used to set default value but scope is all application, probably not what you want.
      *      See instead to force the default value by the caller.
      *
-     *      @param	int  	$selected        Id of payment term to preselect by default
-     *      @param  string	$htmlname        Nom de la zone select
-     *      @param  int 	$filtertype      Not used
-     *		@param	int		$addempty		 Add an empty entry
+     *      @param	int  	$selected       Id of payment term to preselect by default
+     *      @param  string	$htmlname       Nom de la zone select
+     *      @param  int 	$filtertype     Not used
+     *		@param	int		$addempty		Add an empty entry
+     * 		@param	int		$noadmininfo	0=Add admin info, 1=Disable admin info
+     * 		@param	string	$morecss		Add more CSS on select tag
      *		@return	void
      */
-    function select_conditions_paiements($selected=0, $htmlname='condid', $filtertype=-1, $addempty=0)
+    function select_conditions_paiements($selected=0, $htmlname='condid', $filtertype=-1, $addempty=0, $noinfoadmin=0, $morecss='')
     {
         global $langs, $user, $conf;
 
@@ -3004,7 +3006,7 @@ class Form
         // Set default value if not already set by caller
         if (empty($selected) && ! empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID)) $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
 
-        print '<select class="flat" name="'.$htmlname.'">';
+        print '<select id="'.$htmlname.'" class="flat selectpaymentterms'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'">';
         if ($addempty) print '<option value="0">&nbsp;</option>';
         foreach($this->cache_conditions_paiements as $id => $arrayconditions)
         {
@@ -3020,7 +3022,7 @@ class Form
             print '</option>';
         }
         print '</select>';
-        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        if ($user->admin && empty($noinfoadmin)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
     }
 
 
@@ -3035,7 +3037,7 @@ class Form
      * 		@param	int		$noadmininfo	0=Add admin info, 1=Disable admin info
      *      @param  int		$maxlength      Max length of label
      *      @param  int     $active         Active or not, -1 = all
-     *      @param  string  $morecss        Add more css
+     *      @param  string  $morecss        Add more CSS on select tag
      * 		@return	void
      */
     function select_types_paiements($selected='', $htmlname='paiementtype', $filtertype='', $format=0, $empty=0, $noadmininfo=0, $maxlength=0, $active=1, $morecss='')
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 366247560ac..c8d9b20633b 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -770,7 +770,7 @@ class FormMail extends Form
         			}
         		}
         		$this->substit['__PERSONALIZED__']=$paymenturl;
-        		$this->substit['__ONLINE_PAYMENT_URL__']='YY'.$paymenturl;
+        		$this->substit['__ONLINE_PAYMENT_URL__']=$paymenturl;
 
                 //Add lines substitution key from each line
                 $lines = '';
@@ -1056,7 +1056,7 @@ class FormMail extends Form
 		$this->substit['__DATE_YMD__'] = isset($object->date) ? dol_print_date($object->date, 'day', 0, $outputlangs) : '';
 		$this->substit['__DATE_DUE_YMD__'] = isset($object->date_lim_reglement)? dol_print_date($object->date_lim_reglement, 'day', 0, $outputlangs) : '';
 		$this->substit['__AMOUNT__'] = price($object->total_ttc);
-		$this->substit['__AMOUNT_WO_TAX__'] = price($object->total_ht);
+		$this->substit['__AMOUNT_EXCL_TAX__'] = price($object->total_ht);
 		$this->substit['__AMOUNT_VAT__'] = price($object->total_tva);
 
 		$this->substit['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:'');
@@ -1094,7 +1094,7 @@ class FormMail extends Form
                     '__QUANTITY__' => $line->qty,
                     '__SUBPRICE__' => price($line->subprice),
                     '__AMOUNT__' => price($line->total_ttc),
-                    '__AMOUNT_WO_TAX__' => price($line->total_ht),
+                    '__AMOUNT_EXCL_TAX__' => price($line->total_ht),
                     //'__PRODUCT_EXTRAFIELD_FIELD__' Done dinamically just after
                 );
 
@@ -1142,10 +1142,11 @@ class FormMail extends Form
 			    '__PROJECT_NAME__'=>'__PROJECT_NAME__',
 				'__CONTACTCIVNAME__'=>'__CONTACTCIVNAME__',
 				'__AMOUNT__'=>'__AMOUNT__',
-				'__AMOUNT_WO_TAX__'=>'__AMOUNT_WO_TAX__',
+				'__AMOUNT_EXCL_TAX__'=>'__AMOUNT_EXCL_TAX__',
 				'__AMOUNT_VAT__'=>'__AMOUNT_VAT__',
-			    '__PERSONALIZED__'=>'__PERSONALIZED__',				// Paypal link will be added here in form mode
+				'__ONLINE_PAYMENT_URL__'=>'__ONLINE_PAYMENT_URL__',
 				'__SIGNATURE__'=>'__SIGNATURE__',
+			    '__PERSONALIZED__'=>'__PERSONALIZED__',					// deprecated
 			);
 			if ($mode == 'formwithlines')
 			{
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 83259aa41d2..cdcebae7099 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1369,8 +1369,8 @@ function dol_meta_create($object)
 			DATE=\"" . dol_print_date($object->date,'') . "\"
 			NB_ITEMS=\"" . $nblignes . "\"
 			CLIENT=\"" . $client . "\"
-			AMOUNT_WO_TAX=\"" . $object->total_ht . "\"
-			AMOUNT_INC_TAX=\"" . $object->total_ttc . "\"\n";
+			AMOUNT_EXCL_TAX=\"" . $object->total_ht . "\"
+			AMOUNT=\"" . $object->total_ttc . "\"\n";
 
 			for ($i = 0 ; $i < $nblignes ; $i++)
 			{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f7b0bdd5ad9..f28f8ea96af 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5262,11 +5262,11 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
     }
     if (empty($exclude) || ! in_array('objectamount', $exclude))
     {
-		$substitutionarray['__DATE_YMD__'] = is_object($object)?(isset($object->date) ? dol_print_date($object->date, 'day', 0, $outputlangs) : '') : '';
-		$substitutionarray['__DATE_DUE_YMD__'] = is_object($object)?(isset($object->date_lim_reglement)? dol_print_date($object->date_lim_reglement, 'day', 0, $outputlangs) : '') : '';
-    	$substitutionarray['__AMOUNT__']       = is_object($object)?$object->total_ttc:'';
-        $substitutionarray['__AMOUNT_WO_TAX__']= is_object($object)?$object->total_ht:'';
-        $substitutionarray['__AMOUNT_VAT__']   = is_object($object)?($object->total_vat?$object->total_vat:$object->total_tva):'';
+		$substitutionarray['__DATE_YMD__']        = is_object($object)?(isset($object->date) ? dol_print_date($object->date, 'day', 0, $outputlangs) : '') : '';
+		$substitutionarray['__DATE_DUE_YMD__']    = is_object($object)?(isset($object->date_lim_reglement)? dol_print_date($object->date_lim_reglement, 'day', 0, $outputlangs) : '') : '';
+    	$substitutionarray['__AMOUNT__']          = is_object($object)?$object->total_ttc:'';
+		$substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object)?$object->total_ht:'';
+        $substitutionarray['__AMOUNT_VAT__']      = is_object($object)?($object->total_vat?$object->total_vat:$object->total_tva):'';
         // For backward compatibility
         if ($onlykey != 2)
         {
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 917cfd74891..6a02f67c6d4 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -175,7 +175,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1700__+MAX_llx_menu__, 'billing', 'customer_bills', 6__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills', 'BillsCustomers', 0, 'bills', '$user->rights->facture->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1701__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/card.php?action=create&amp;leftmenu=customers_bills', 'NewBill', 1, 'bills', '$user->rights->facture->creer', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1705__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills', 'List', 1, 'bills', '$user->rights->facture->lire', '', 2, 4, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1702__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/fiche-rec.php?leftmenu=customers_bills', 'ListOfTemplates', 1, 'bills', '$user->rights->facture->lire', '', 2, 5, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1702__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/invoicetemplate_list.php?leftmenu=customers_bills', 'ListOfTemplates', 1, 'bills', '$user->rights->facture->lire', '', 2, 5, __ENTITY__);
 
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1720__+MAX_llx_menu__, 'billing', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=0', 'BillShortStatusDraft', 2, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1721__+MAX_llx_menu__, 'billing', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=1', 'BillShortStatusNotPaid', 2, 'bills', '$user->rights->facture->lire', '', 2, 2, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 55d3b75fe13..8c03d0c1ffc 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -811,7 +811,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_paid&amp;search_status=2",$langs->trans("BillShortStatusPaid"),2,$user->rights->facture->lire);
 					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_canceled&amp;search_status=3",$langs->trans("BillShortStatusCanceled"),2,$user->rights->facture->lire);
 				}
-				$newmenu->add("/compta/facture/fiche-rec.php",$langs->trans("ListOfTemplates"),1,$user->rights->facture->creer);    // No need to see recurring invoices, if user has no permission to create invoice.
+				$newmenu->add("/compta/facture/invoicetemplate_list.php",$langs->trans("ListOfTemplates"),1,$user->rights->facture->creer);    // No need to see recurring invoices, if user has no permission to create invoice.
 
 				$newmenu->add("/compta/paiement/list.php",$langs->trans("Payments"),1,$user->rights->facture->lire);
 
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index d6e0c404d25..7661f46ce3c 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -159,5 +159,5 @@ OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
-
+Information=Information
 
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 5eac282830f..ad8c8b317eb 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -570,7 +570,7 @@ while ($i < min($num, $limit))
             if (! $i) $totalarray['nbfield']++;
             if (! empty($val['isameasure']))
             {
-	            if (! $i) $totalarray['pos'][$totalarray['nbfield']-1]='t.'.$key;
+	            if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
 	           	$totalarray['val']['t.'.$key] += $obj->$key;
             }
         }
@@ -607,7 +607,7 @@ if (isset($totalarray['pos']))
 	            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
 	            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
 	        }
-        	print '<td></td>';
+        	else print '<td></td>';
         }
     }
     print '</tr>';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 786e5a09890..f280a9db89c 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -608,7 +608,7 @@ foreach(array(1,2,3,4,5,6) as $key)
 
 if ($massaction == 'presend')
 {
-	$topicmail="SendEmail";
+	$topicmail="Information";
 	$modelmail="thirdparty";
 	$objecttmp=new Societe($db);
 	$trackid='thi'.$object->id;

From 236cf853e50a2ebbc51c03555ad48c4b02218348 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 22 Sep 2017 11:47:36 +0200
Subject: [PATCH 22/28] Sort list of invoice template

---
 htdocs/admin/mails_templates.php | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 9efe954787c..28ace66a610 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -78,6 +78,9 @@ $offset = $listlimit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
+if (empty($sortfield)) $sortfield='label, lang, position';
+if (empty($sortorder)) $sortorder='ASC';
+
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('emailtemplates'));
 
@@ -87,7 +90,7 @@ $tabname[25]= MAIN_DB_PREFIX."c_email_templates";
 
 // Criteria to sort dictionaries
 $tabsqlsort=array();
-$tabsqlsort[25]="label ASC";
+$tabsqlsort[25]="label ASC, lang ASC, position ASC";
 
 // Nom des champs en resultat de select pour affichage du dictionnaire
 $tabfield=array();
@@ -217,7 +220,7 @@ if (empty($reshook))
             if ($value == 'content') $value='content-'.$rowid;
             if ($value == 'content_lines') $value='content_lines-'.$rowid;
 
-            if ((! isset($_POST[$value]) || $_POST[$value]=='' || $_POST[$value]=='-1') && $value != 'lang' && $value != 'fk_user')
+            if ((! isset($_POST[$value]) || $_POST[$value]=='' || $_POST[$value]=='-1') && $value != 'lang' && $value != 'fk_user' && $value != 'position')
             {
                 $ok=0;
                 $fieldnamekey=$listfield[$f];
@@ -270,10 +273,9 @@ if (empty($reshook))
             $i=0;
             foreach ($listfieldinsert as $f => $value)
             {
+            	//var_dump($i.' - '.$listfieldvalue[$i].' - '.$_POST[$listfieldvalue[$i]].' - '.$value);
             	$keycode=$listfieldvalue[$i];
             	if ($value == 'lang') $keycode='langcode';
-
-            	//var_dump($i.' - '.$listfieldvalue[$i].' - '.$_POST[$listfieldvalue[$i]].' - '.$value);
                 if ($value == 'entity') $_POST[$keycode] = $conf->entity;
                 if ($i) $sql.=",";
                 if ($value == 'fk_user' && ! ($_POST[$keycode] > 0)) $_POST[$keycode]='';
@@ -1036,9 +1038,17 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='sens' || $fieldlist[$field]=='category_type') $size='size="2" ';
 
 			print '<td'.($classtd?' class="'.$classtd.'"':'').'>';
-			if ($fieldlist[$field]=='private' && empty($user->admin))
+			if ($fieldlist[$field]=='private')
 			{
-				print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="1" name="'.$fieldlist[$field].'">';
+				if (empty($user->admin))
+				{
+					print $form->selectyesno($fieldlist[$field], '1');
+				}
+				else
+				{
+					//print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="1" name="'.$fieldlist[$field].'">';
+					print $form->selectyesno($fieldlist[$field], (isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+				}
 			}
 			else
 			{

From 252f0384683cbd9414429b4b3d9a2df7f854cd07 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 22 Sep 2017 14:34:31 +0200
Subject: [PATCH 23/28] Mutualize code of substitutions for emails

---
 htdocs/admin/mails_templates.php          |   6 +-
 htdocs/comm/mailing/card.php              |  97 ++++++------
 htdocs/contrat/card.php                   |   4 +-
 htdocs/core/class/html.form.class.php     |   2 +-
 htdocs/core/class/html.formmail.class.php | 176 ++++++++--------------
 htdocs/core/lib/functions.lib.php         | 142 +++++++++--------
 htdocs/core/tpl/card_presend.tpl.php      |   2 +-
 htdocs/core/tpl/massactions_form.tpl.php  |   2 +-
 htdocs/societe/card.php                   |   2 +-
 scripts/emailings/mailing-send.php        |  62 ++++----
 10 files changed, 239 insertions(+), 256 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 28ace66a610..3000612514a 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -835,6 +835,8 @@ if ($resql)
                         if ($value == 'private')
                         {
                         	$align="center";
+                        	if ($valuetoshow) $valuetoshow=yn($valuetoshow);
+                        	else $valuetoshow='';
                         }
                         if ($value == 'position')
                         {
@@ -1042,12 +1044,12 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			{
 				if (empty($user->admin))
 				{
-					print $form->selectyesno($fieldlist[$field], '1');
+					print $form->selectyesno($fieldlist[$field], '1', 1);
 				}
 				else
 				{
 					//print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="1" name="'.$fieldlist[$field].'">';
-					print $form->selectyesno($fieldlist[$field], (isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+					print $form->selectyesno($fieldlist[$field], (isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), 1);
 				}
 			}
 			else
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index c40192723a8..9f67db88bbb 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -57,24 +57,17 @@ $hookmanager->initHooks(array('mailingcard','globalcard'));
 
 // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
 $object->substitutionarray=FormMail::getAvailableSubstitKey('emailing');
-$object->substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 
-$object->substitutionarrayfortest=array(
-    '__ID__' => 'TESTIdRecord',
-    //'__EMAIL__' => 'TESTEMail',			// Done into "send" action
-    '__LASTNAME__' => 'TESTLastname',
-    '__FIRSTNAME__' => 'TESTFirstname',
-    '__MAILTOEMAIL__' => 'TESTMailtoEmail',
-    '__OTHER1__' => 'TESTOther1',
-    '__OTHER2__' => 'TESTOther2',
-    '__OTHER3__' => 'TESTOther3',
-    '__OTHER4__' => 'TESTOther4',
-    '__OTHER5__' => 'TESTOther5',
-	'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:''),
-    '__CHECK_READ__' => 'TagCheckMail',
-	'__UNSUBSCRIBE__' => 'TagUnsubscribe'
-		//,'__PERSONALIZED__' => 'TESTPersonalized'	// Not used yet
-);
+
+// Set $object->substitutionarrayfortest
+$signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:'');
+
+$targetobject = null;		// Not defined with mass emailing
+
+$parameters=array('mode'=>'emailing');
+$substitutionarray=FormMail::getAvailableSubstitKey('emailing', $targetobject);
+
+$object->substitutionarrayfortest = $substitutionarray;
 
 // List of sending methods
 $listofmethods=array();
@@ -205,24 +198,28 @@ if (empty($reshook))
 	                    $tmpfield=explode('=',$other[2],2); $other3=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
 	                    $tmpfield=explode('=',$other[3],2); $other4=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
 	                    $tmpfield=explode('=',$other[4],2); $other5=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+
 	                    $signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:'');
 
-	                    // Array of possible substitutions (See also fie mailing-send.php that should manage same substitutions)
-						$substitutionarray=array(
-								'__ID__' => $obj->source_id,
-								'__EMAIL__' => $obj->email,
-								'__LASTNAME__' => $obj->lastname,
-								'__FIRSTNAME__' => $obj->firstname,
-								'__MAILTOEMAIL__' => '<a href="mailto:'.$obj->email.'">'.$obj->email.'</a>',
-								'__OTHER1__' => $other1,
-								'__OTHER2__' => $other2,
-								'__OTHER3__' => $other3,
-								'__OTHER4__' => $other4,
-								'__OTHER5__' => $other5,
-								'__SIGNATURE__' => $signature,	// Signature is empty when ran from command line or taken from user in parameter)
-								'__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>',
-								'__UNSUBSCRIBE__' => '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>'
-						);
+	                    $targetobject = null;		// Not defined with mass emailing
+	                    $parameters=array('mode'=>'emailing');
+	                    $substitutionarray=getCommonSubstitutionArray($langs, 2, array('object','objectamount'), $targetobject);			// Note: On mass emailing, this is null because be don't know object
+
+	                    // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
+						$substitutionarray['__ID__'] = $obj->source_id;
+						$substitutionarray['__EMAIL__'] = $obj->email;
+						$substitutionarray['__LASTNAME__'] = $obj->lastname;
+						$substitutionarray['__FIRSTNAME__'] = $obj->firstname;
+						$substitutionarray['__MAILTOEMAIL__'] = '<a href="mailto:'.$obj->email.'">'.$obj->email.'</a>';
+						$substitutionarray['__OTHER1__'] = $other1;
+						$substitutionarray['__OTHER2__'] = $other2;
+						$substitutionarray['__OTHER3__'] = $other3;
+						$substitutionarray['__OTHER4__'] = $other4;
+						$substitutionarray['__OTHER5__'] = $other5;
+						$substitutionarray['__SIGNATURE__'] = $signature;	// Signature is empty when ran from command line or taken from user in parameter)
+						$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
+
 						$onlinepaymentenabled = 0;
 						if (! empty($conf->paypal->enabled)) $onlinepaymentenabled++;
 						if (! empty($conf->paybox->enabled)) $onlinepaymentenabled++;
@@ -230,18 +227,20 @@ if (empty($reshook))
 						if ($onlinepaymentenabled && ! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 						{
 							$substitutionarray['__SECUREKEYPAYMENT__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-
-							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
-
-							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
-
-							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
-
-							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+							{
+								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+							}
+							else
+							{
+								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+							}
 						}
 						/* For backward compatibility */
 						if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
@@ -261,6 +260,7 @@ if (empty($reshook))
 							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
 						}
 						//$substitutionisok=true;
+
 	                    complete_substitutions_array($substitutionarray, $langs);
 						$newsubject=make_substitutions($subject,$substitutionarray);
 						$newmessage=make_substitutions($message,$substitutionarray);
@@ -431,9 +431,12 @@ if (empty($reshook))
 			$msgishtml=-1;	// Inconnu par defaut
 			if (preg_match('/[\s\t]*<html>/i',$object->body)) $msgishtml=1;
 
-			$object->substitutionarrayfortest['__EMAIL__'] = $object->sendto;		// other are set at begin of page
+			// other are set at begin of page
+			$object->substitutionarrayfortest['__EMAIL__'] = $object->sendto;
+			$object->substitutionarrayfortest['__MAILTOEMAIL__'] = '<a href="mailto:'.$object->sendto.'">'.$object->sendto.'</a>';
 
 			// Pratique les substitutions sur le sujet et message
+	        complete_substitutions_array($object->substitutionarrayfortest, $langs);
 			$tmpsujet=make_substitutions($object->sujet,$object->substitutionarrayfortest);
 			$tmpbody=make_substitutions($object->body,$object->substitutionarrayfortest);
 
@@ -1073,7 +1076,7 @@ else
 				$formmail->substit=$object->substitutionarrayfortest;
 				// Tableau des parametres complementaires du post
 				$formmail->param["action"]="send";
-				$formmail->param["models"]="body";
+				$formmail->param["models"]='none';
 				$formmail->param["mailid"]=$object->id;
 				$formmail->param["returnurl"]=$_SERVER['PHP_SELF']."?id=".$object->id;
 
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 16c843466f9..904bd519f76 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2251,7 +2251,7 @@ else
 			}
 			$formmail->substit['__CONTRACT_NEXT_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
 			$formmail->substit['__CONTRACT_NEXT_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
-			$formmail->substit['__PERSONALIZED__']='';
+			$formmail->substit['__PERSONALIZED__']='';		// deprecated
 			$formmail->substit['__CONTACTCIVNAME__']='';
 
 			$custcontact = '';
@@ -2276,7 +2276,7 @@ else
 
 			// Tableau des parametres complementaires
 			$formmail->param['action'] = 'send';
-			$formmail->param['models'] = 'contract_send';
+			$formmail->param['models'] = 'contract';
 			$formmail->param['models_id']=GETPOST('modelmailselected','int');
 			$formmail->param['contractid'] = $object->id;
 			$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f00f8c146ed..ed318bbd900 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5828,7 +5828,7 @@ class Form
      *  @param	int      	$useempty		1=Add empty line
      *	@return	string						See option
      */
-    function selectyesno($htmlname,$value='',$option=0,$disabled=false,$useempty='')
+    function selectyesno($htmlname, $value='', $option=0, $disabled=false, $useempty='')
     {
         global $langs;
 
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index c8d9b20633b..efdd7f6a433 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -293,13 +293,17 @@ class FormMail extends Form
 			}
 
         	// Get message template for $this->param["models"] into c_email_templates
-			$model_id=0;
-        	if (array_key_exists('models_id',$this->param))
-        	{
-        		$model_id=$this->param["models_id"];
-        	}
-        	$arraydefaultmessage=$this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id);
-			//var_dump($this->param["models"]);
+			$arraydefaultmessage=array();
+			if ($this->param['models'] != 'none')
+			{
+				$model_id=0;
+        		if (array_key_exists('models_id',$this->param))
+        		{
+	        		$model_id=$this->param["models_id"];
+        		}
+	        	$arraydefaultmessage=$this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id);
+			}
+        	//var_dump($this->param["models"]);
         	//var_dump($model_id);
         	//var_dump($arraydefaultmessage);
 
@@ -325,18 +329,21 @@ class FormMail extends Form
         		$out.= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";
         	}
 
-        	$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
-        	if ($result < 0)
+        	if ($this->param['models'] != 'none')
         	{
-        		setEventMessages($this->error, $this->errors, 'errors');
-        	}
-        	$modelmail_array=array();
-        	foreach($this->lines_model as $line)
-        	{
-        		$modelmail_array[$line->id]=$line->label;
-        		if ($line->lang) $modelmail_array[$line->id].=' ('.$line->lang.')';
-        		if ($line->private) $modelmail_array[$line->id].=' - '.$langs->trans("Private");
-        		//if ($line->fk_user != $user->id) $modelmail_array[$line->id].=' - '.$langs->trans("By").' ';
+	        	$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
+	        	if ($result < 0)
+	        	{
+	        		setEventMessages($this->error, $this->errors, 'errors');
+	        	}
+	        	$modelmail_array=array();
+	        	foreach($this->lines_model as $line)
+	        	{
+	        		$modelmail_array[$line->id]=$line->label;
+	        		if ($line->lang) $modelmail_array[$line->id].=' ('.$line->lang.')';
+	        		if ($line->private) $modelmail_array[$line->id].=' - '.$langs->trans("Private");
+	        		//if ($line->fk_user != $user->id) $modelmail_array[$line->id].=' - '.$langs->trans("By").' ';
+	        	}
         	}
 
         	// Zone to select its email template
@@ -769,7 +776,7 @@ class FormMail extends Form
 	       				$paymenturl=$url;
         			}
         		}
-        		$this->substit['__PERSONALIZED__']=$paymenturl;
+        		$this->substit['__PERSONALIZED__']=$paymenturl;			// deprecated
         		$this->substit['__ONLINE_PAYMENT_URL__']=$paymenturl;
 
                 //Add lines substitution key from each line
@@ -1038,8 +1045,7 @@ class FormMail extends Form
 
 
 	/**
-	 * Set substit array from object. This is call when suggesting the email template into forms to send email.
-	 * TODO Replace with getCommonSubstitutionArray with param onlykey = 2
+	 * Set substit array from object. This is call when suggesting the email template into forms before sending email.
 	 *
 	 * @param	CommonObject	$object		   Object to use
 	 * @param   Translate  		$outputlangs   Object lang
@@ -1049,34 +1055,12 @@ class FormMail extends Form
 	function setSubstitFromObject($object, $outputlangs=null)
 	{
 		global $conf, $user;
-		$this->substit['__REF__'] = $object->ref;
-		$this->substit['__REFCLIENT__'] = isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : '');
-		$this->substit['__REFSUPPLIER__'] = isset($object->ref_supplier) ? $object->ref_supplier : '';
 
-		$this->substit['__DATE_YMD__'] = isset($object->date) ? dol_print_date($object->date, 'day', 0, $outputlangs) : '';
-		$this->substit['__DATE_DUE_YMD__'] = isset($object->date_lim_reglement)? dol_print_date($object->date_lim_reglement, 'day', 0, $outputlangs) : '';
-		$this->substit['__AMOUNT__'] = price($object->total_ttc);
-		$this->substit['__AMOUNT_EXCL_TAX__'] = price($object->total_ht);
-		$this->substit['__AMOUNT_VAT__'] = price($object->total_tva);
+		$parameters=array('mode'=>$mode);
+		$tmparray=getCommonSubstitutionArray($outputlangs, 0, null, $object);
+		complete_substitutions_array($tmparray, $outputlangs, null, $parameters);
 
-		$this->substit['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:'');
-		$this->substit['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty)?$object->thirdparty->name:'');
-
-		$this->substit['__PROJECT_ID__'] = (is_object($object->projet)?$object->projet->id:'');
-		$this->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
-		$this->substit['__PROJECT_NAME__'] = (is_object($object->projet)?$object->projet->title:'');
-
-		$this->substit['__SIGNATURE__'] = $user->signature;
-		$this->substit['__PERSONALIZED__'] = '';
-		$this->substit['__CONTACTCIVNAME__'] = '';	// Will be replace just before sending
-
-        // Create dynamic tags for __EXTRAFIELD_FIELD__
-        $extrafields = new ExtraFields($this->db);
-        $extralabels = $extrafields->fetch_name_optionals_label($object->table_element, true);
-        $object->fetch_optionals($object->id, $extralabels);
-        foreach ($extrafields->attribute_label as $key => $label) {
-            $this->substit['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];
-        }
+		$this->substit=$tmparray;
 
         // Fill substit_lines with each object lines content
         if (is_array($object->lines))
@@ -1127,55 +1111,43 @@ class FormMail extends Form
 	{
 		global $conf, $langs;
 
-		$vars=array();
-
 		if ($mode == 'formemail' || $mode == 'formemailwithlines' || $mode == 'formemailforlines')
 		{
-			$vars=array(
-				'__REF__'=>'__REF__',
-				'__REFCLIENT__'=>'__REFCLIENT__',
-				'__REFSUPPLIER__'=>'__REFSUPPLIER__',
-			    '__THIRDPARTY_ID__'=>'__THIRDPARTY_ID__',
-			    '__THIRDPARTY_NAME__'=>'__THIRDPARTY_NAME__',
-			    '__PROJECT_ID__'=>'__PROJECT_ID__',
-			    '__PROJECT_REF__'=>'__PROJECT_REF__',
-			    '__PROJECT_NAME__'=>'__PROJECT_NAME__',
-				'__CONTACTCIVNAME__'=>'__CONTACTCIVNAME__',
-				'__AMOUNT__'=>'__AMOUNT__',
-				'__AMOUNT_EXCL_TAX__'=>'__AMOUNT_EXCL_TAX__',
-				'__AMOUNT_VAT__'=>'__AMOUNT_VAT__',
-				'__ONLINE_PAYMENT_URL__'=>'__ONLINE_PAYMENT_URL__',
-				'__SIGNATURE__'=>'__SIGNATURE__',
-			    '__PERSONALIZED__'=>'__PERSONALIZED__',					// deprecated
-			);
+			$parameters=array('mode'=>$mode);
+			$tmparray=getCommonSubstitutionArray($langs, 2, null, $object);			// Note: On email templated edition, this is null because it is related to all type of objects
+			complete_substitutions_array($tmparray, $langs, null, $parameters);
+
 			if ($mode == 'formwithlines')
 			{
-			    $vars[] = '__LINES__';      // Will be set by the get_form function
+			    $tmparray['__LINES__'] = '__LINES__';      // Will be set by the get_form function
 			}
 			if ($mode == 'formforlines')
 			{
-			    $vars[] = '__QUANTITY__';   // Will be set by the get_form function
+			    $tmparray['__QUANTITY__'] = '__QUANTITY__';   // Will be set by the get_form function
 			}
 		}
+
 		if ($mode == 'emailing')
 		{
+			$parameters=array('mode'=>$mode);
+			$tmparray=getCommonSubstitutionArray($langs, 2, array('object','objectamount'), $object);			// Note: On email templated edition, this is null because it is related to all type of objects
+			complete_substitutions_array($tmparray, $langs, null, $parameters);
+
 			// For mass emailing, we have different keys
-			$vars=array(
-			    '__ID__' => 'IdRecord',
-			    '__EMAIL__' => 'EMailRecipient',
-			    '__LASTNAME__' => 'Lastname',
-			    '__FIRSTNAME__' => 'Firstname',
-			    '__MAILTOEMAIL__' => 'TagMailtoEmail',
-			    '__OTHER1__' => 'Other1',
-			    '__OTHER2__' => 'Other2',
-			    '__OTHER3__' => 'Other3',
-			    '__OTHER4__' => 'Other4',
-			    '__OTHER5__' => 'Other5',
-			    '__SIGNATURE__' => 'TagSignature',
-			    '__CHECK_READ__' => 'TagCheckMail',
-				'__UNSUBSCRIBE__' => 'TagUnsubscribe'
+			$tmparray['__ID__'] = 'IdRecord';
+			$tmparray['__EMAIL__'] = 'EMailRecipient';
+			$tmparray['__LASTNAME__'] = 'Lastname';
+			$tmparray['__FIRSTNAME__'] = 'Firstname';
+			$tmparray['__MAILTOEMAIL__'] = 'TagMailtoEmail';
+			$tmparray['__OTHER1__'] = 'Other1';
+			$tmparray['__OTHER2__'] = 'Other2';
+			$tmparray['__OTHER3__'] = 'Other3';
+			$tmparray['__OTHER4__'] = 'Other4';
+			$tmparray['__OTHER5__'] = 'Other5';
+			$tmparray['__SIGNATURE__'] = 'TagSignature';
+			$tmparray['__CHECK_READ__'] = 'TagCheckMail';
+			$tmparray['__UNSUBSCRIBE__'] = 'TagUnsubscribe';
 				//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet in mass emailing
-			);
 
 			$onlinepaymentenabled = 0;
 			if (! empty($conf->paypal->enabled)) $onlinepaymentenabled++;
@@ -1183,13 +1155,13 @@ class FormMail extends Form
 			if (! empty($conf->stripe->enabled)) $onlinepaymentenabled++;
 			if ($onlinepaymentenabled && ! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 			{
-				$vars['__SECUREKEYPAYMENT__']=$conf->global->PAYMENT_SECURITY_TOKEN;
+				$tmparray['__SECUREKEYPAYMENT__']=$conf->global->PAYMENT_SECURITY_TOKEN;
 				if (! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 				{
-					if ($conf->adherent->enabled) $vars['__SECUREKEYPAYMENT_MEMBER__']='SecureKeyPAYMENTUniquePerMember';
-					if ($conf->facture->enabled)  $vars['__SECUREKEYPAYMENT_INVOICE__']='SecureKeyPAYMENTUniquePerInvoice';
-					if ($conf->commande->enabled) $vars['__SECUREKEYPAYMENT_ORDER__']='SecureKeyPAYMENTUniquePerOrder';
-					if ($conf->contrat->enabled)  $vars['__SECUREKEYPAYMENT_CONTRACTLINE__']='SecureKeyPAYMENTUniquePerContractLine';
+					if ($conf->adherent->enabled) $tmparray['__SECUREKEYPAYMENT_MEMBER__']='SecureKeyPAYMENTUniquePerMember';
+					if ($conf->facture->enabled)  $tmparray['__SECUREKEYPAYMENT_INVOICE__']='SecureKeyPAYMENTUniquePerInvoice';
+					if ($conf->commande->enabled) $tmparray['__SECUREKEYPAYMENT_ORDER__']='SecureKeyPAYMENTUniquePerOrder';
+					if ($conf->contrat->enabled)  $tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__']='SecureKeyPAYMENTUniquePerContractLine';
 				}
 			}
 			else
@@ -1202,36 +1174,16 @@ class FormMail extends Form
 				$vars['__SECUREKEYPAYMENT_CONTRACTLINE__']='';
 				*/
 			}
-
-			// Old vars removed from doc
-			/*
-			if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-			{
-				$vars['__SECUREKEYPAYPAL__']='SecureKeyPaypal';
-				if (! empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
-				{
-					if ($conf->adherent->enabled) $vars['__SECUREKEYPAYPAL_MEMBER__']='SecureKeyPaypalUniquePerMember';
-					if ($conf->facture->enabled) $vars['__SECUREKEYPAYPAL_INVOICE__']='SecureKeyPaypalUniquePerInvoice';
-					if ($conf->commande->enabled) $vars['__SECUREKEYPAYPAL_ORDER__']='SecureKeyPaypalUniquePerOrder';
-					if ($conf->contrat->enabled) $vars['__SECUREKEYPAYPAL_CONTRACTLINE__']='SecureKeyPaypalUniquePerContractLine';
-				}
-			}
-			else
-			{
-				$vars['__SECUREKEYPAYPAL__']='';
-				$vars['__SECUREKEYPAYPAL_MEMBER__']='';
-			}*/
 		}
 
-		$parameters=array('mode'=>$mode);
-		$tmparray=getCommonSubstitutionArray($langs, 2, null, $object);
-		complete_substitutions_array($tmparray, $langs, null, $parameters);
+		$tmparray['__(AnyTranslationKey)__']="Translation";
+
 		foreach($tmparray as $key => $val)
 		{
-		    $vars[$key]=$key;
+			if (empty($val)) $tmparray[$key]=$key;
 		}
 
-		return $vars;
+		return $tmparray;
 	}
 
 }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f28f8ea96af..2b8ab5ebf7a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5227,38 +5227,69 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
             '__MYCOMPANY_COUNTRY_ID__' => $mysoc->country_id
         ));
     }
-    if (is_object($object) && (empty($exclude) || ! in_array('object', $exclude)))
+    if (($onlykey || is_object($object)) && (empty($exclude) || ! in_array('object', $exclude)))
     {
-	    $substitutionarray['__ID__'] = $object->id;
-    	$substitutionarray['__REF__'] = $object->ref;
-    	$substitutionarray['__REFCLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : ''));
-    	$substitutionarray['__REFSUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : '');
-
-    	if (is_object($object->thirdparty) && $object->thirdparty->id > 0)
+    	if ($onlykey)
     	{
-    		$substitutionarray['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:'');
-    		$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty)?$object->thirdparty->name:'');
+		    $substitutionarray['__ID__'] = '__ID__';
+	    	$substitutionarray['__REF__'] = '__REF__';
+	    	$substitutionarray['__REFCLIENT__'] = '__REFCLIENT__';
+	    	$substitutionarray['__REFSUPPLIER__'] = '__REFSUPPLIER__';
+	    	$substitutionarray['__EXTRAFIELD_XXX__'] = '__EXTRAFIELD_XXX__';
+
+    		$substitutionarray['__THIRDPARTY_ID__'] = '__THIRDPARTY_ID__';
+    		$substitutionarray['__THIRDPARTY_NAME__'] = '__THIRDPARTY_NAME__';
+
+    		$substitutionarray['__PROJECT_ID__'] = '__PROJECT_ID__';
+    		$substitutionarray['__PROJECT_REF__'] = '__PROJECT_REF__';
+    		$substitutionarray['__PROJECT_NAME__'] = '__PROJECT_REF__';
+
+	    	$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATE__'] = 'Date for next expired service';
+    		$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATETIME__'] = 'Date and hour for next expired service';
+
+    		$substitutionarray['__ONLINE_PAYMENT_URL__'] = 'LinkToPayOnlineIfApplicable';
+    		$substitutionarray['__SECUREKEYPAYMENT__'] = 'Security key (if key is not unique per record)';
+    		$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = 'Security key for payment on a member subscription (one key per member)';
+    		$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = 'Security key for payment on an order';
+    		$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = 'Security key for payment on an invoice';
+    		$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'Security key for payment on a a service';
     	}
-
-    	if (is_object($object->projet) && $object->projet->id > 0)
+    	else
     	{
-    		$substitutionarray['__PROJECT_ID__'] = (is_object($object->projet)?$object->projet->id:'');
-    		$substitutionarray['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
-    		$substitutionarray['__PROJECT_NAME__'] = (is_object($object->projet)?$object->projet->title:'');
-    	}
+		    $substitutionarray['__ID__'] = $object->id;
+	    	$substitutionarray['__REF__'] = $object->ref;
+	    	$substitutionarray['__REFCLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : ''));
+	    	$substitutionarray['__REFSUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : '');
 
-    	// Create dynamic tags for __EXTRAFIELD_FIELD__
-    	if ($object->table_element && $object->id > 0)
-    	{
-	    	$extrafieldstmp = new ExtraFields($db);
-	    	$extralabels = $extrafieldstmp->fetch_name_optionals_label($object->table_element, true);
-	    	$object->fetch_optionals($object->id, $extralabels);
-	    	foreach ($extrafieldstmp->attribute_label as $key => $label) {
-	    		$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];
+	    	if (is_object($object->thirdparty) && $object->thirdparty->id > 0)
+	    	{
+	    		$substitutionarray['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:'');
+	    		$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty)?$object->thirdparty->name:'');
 	    	}
-    	}
 
-    	$substitutionarray['__ONLINE_PAYMENT_URL__'] = 'LinkToPayOnlineIfApplicable';
+	    	if (is_object($object->projet) && $object->projet->id > 0)
+	    	{
+	    		$substitutionarray['__PROJECT_ID__'] = (is_object($object->projet)?$object->projet->id:'');
+	    		$substitutionarray['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
+	    		$substitutionarray['__PROJECT_NAME__'] = (is_object($object->projet)?$object->projet->title:'');
+	    	}
+
+	    	// Create dynamic tags for __EXTRAFIELD_FIELD__
+	    	if ($object->table_element && $object->id > 0)
+	    	{
+		    	$extrafieldstmp = new ExtraFields($db);
+		    	$extralabels = $extrafieldstmp->fetch_name_optionals_label($object->table_element, true);
+		    	$object->fetch_optionals($object->id, $extralabels);
+		    	foreach ($extrafieldstmp->attribute_label as $key => $label) {
+		    		$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];
+		    	}
+	    	}
+
+    		$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATE__'] = 'TODO';
+	    	$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATETIME__'] = 'TODO';
+
+	    	$substitutionarray['__ONLINE_PAYMENT_URL__'] = 'TODO';
+    	}
     }
     if (empty($exclude) || ! in_array('objectamount', $exclude))
     {
@@ -5280,41 +5311,35 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
     {
         include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-        if (! empty($onlykey))
-        {
-            $tmp=$tmp2=$tmp3=$tmp4=$tmp5=array();
-        }
-        else
-        {
-            $tmp=dol_getdate(dol_now(), true);
-            $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']);
-            $tmp3=dol_get_prev_month($tmp['mday'], $tmp['mon'], $tmp['year']);
-            $tmp4=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']);
-            $tmp5=dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']);
-        }
+        $tmp=dol_getdate(dol_now(), true);
+        $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']);
+        $tmp3=dol_get_prev_month($tmp['mday'], $tmp['mon'], $tmp['year']);
+        $tmp4=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']);
+        $tmp5=dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']);
+
         $substitutionarray=array_merge($substitutionarray, array(
-            '__DAY__' => $tmp['mday'],
-            '__MONTH__' => $tmp['mon'],
-            '__YEAR__' => $tmp['year'],
-            '__PREVIOUS_DAY__' => $tmp2['day'],
-            '__PREVIOUS_MONTH__' => $tmp3['month'],
-            '__PREVIOUS_YEAR__' => ($tmp['year'] - 1),
-            '__NEXT_DAY__' => $tmp4['day'],
-            '__NEXT_MONTH__' => $tmp5['month'],
-            '__NEXT_YEAR__' => ($tmp['year'] + 1),
+            '__DAY__' => (string) $tmp['mday'],
+            '__MONTH__' => (string) $tmp['mon'],
+            '__YEAR__' => (string) $tmp['year'],
+            '__PREVIOUS_DAY__' => (string) $tmp2['day'],
+            '__PREVIOUS_MONTH__' => (string) $tmp3['month'],
+            '__PREVIOUS_YEAR__' => (string) ($tmp['year'] - 1),
+            '__NEXT_DAY__' => (string) $tmp4['day'],
+            '__NEXT_MONTH__' => (string) $tmp5['month'],
+            '__NEXT_YEAR__' => (string) ($tmp['year'] + 1),
         ));
     }
 
     if (empty($exclude) || ! in_array('user', $exclude))
     {
         $substitutionarray=array_merge($substitutionarray, array(
-            '__USER_ID__' => $user->id,
-            '__USER_LOGIN__' => $user->login,
-            '__USER_LASTNAME__' => $user->lastname,
-            '__USER_FIRSTNAME__' => $user->firstname,
-            '__USER_FULLNAME__' => $user->getFullName($outputlangs),
-            '__USER_SUPERVISOR_ID__' => $user->fk_user,
-        	'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($user->signature), 30) : $user->signature) : '')
+            '__USER_ID__' => (string) $user->id,
+            '__USER_LOGIN__' => (string) $user->login,
+            '__USER_LASTNAME__' => (string) $user->lastname,
+            '__USER_FIRSTNAME__' => (string) $user->firstname,
+            '__USER_FULLNAME__' => (string) $user->getFullName($outputlangs),
+            '__USER_SUPERVISOR_ID__' => (string) $user->fk_user,
+        	'__SIGNATURE__' => (string) (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($user->signature), 30) : $user->signature) : '')
         ));
     }
     if (! empty($conf->multicompany->enabled))
@@ -5369,8 +5394,8 @@ function make_substitutions($text, $substitutionarray, $outputlangs=null)
 }
 
 /**
- *  Complete the $substitutionarray with more entries.
- *  Can also add substitution keys coming from external module that had set the "substitutions=1" into module_part array. In this case, method completesubstitutionarray provided by module is called.
+ *  Complete the $substitutionarray with more entries coming from external module that had set the "substitutions=1" into module_part array.
+ *  In this case, method completesubstitutionarray provided by module is called.
  *
  *  @param  array		$substitutionarray		Array substitution old value => new value value
  *  @param  Translate	$outputlangs            Output language
@@ -5386,13 +5411,8 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	// Add a substitution key for each object property
-	if (is_object($object))
-	{
-		// TODO
-	}
-
 	// Add a substitution key for each extrafields, using key __EXTRA_XXX__
+	// TODO Remove this. Already available into the getCommonSubstitutionArray used to build the substitution array.
 	if (is_object($object) && is_array($object->array_options))
 	{
 		foreach($object->array_options as $key => $val)
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 062e9777b40..5273a761d4e 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -139,7 +139,7 @@ if ($action == 'presend')
 	// Make substitution in email content
 	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-read.php?tag=' . $object->thirdparty->tag . '&securitykey=' . urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) . '" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
-	$substitutionarray['__PERSONALIZED__'] = '';
+	$substitutionarray['__PERSONALIZED__'] = '';	// deprecated
 	$substitutionarray['__CONTACTCIVNAME__'] = '';
 	// Add specific substitution for contracts
 	if (is_object($object) && $object->element == 'contrat' && is_array($object->lines))
diff --git a/htdocs/core/tpl/massactions_form.tpl.php b/htdocs/core/tpl/massactions_form.tpl.php
index 4f8c7d15aeb..00ca40daf37 100644
--- a/htdocs/core/tpl/massactions_form.tpl.php
+++ b/htdocs/core/tpl/massactions_form.tpl.php
@@ -117,7 +117,7 @@ $formmail->withcancel = 1;
 $substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
 $substitutionarray['__EMAIL__'] = $sendto;
 $substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-read.php?tag=' . $object->thirdparty->tag . '&securitykey=' . urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) . '" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
-$substitutionarray['__PERSONALIZED__'] = '';
+$substitutionarray['__PERSONALIZED__'] = '';	// deprecated
 $substitutionarray['__CONTACTCIVNAME__'] = '';
 // Add specific substitution for contracts
 if (is_object($object) && $object->element == 'contrat' && is_array($object->lines))
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 80d6799e278..3b56046e55f 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2488,7 +2488,7 @@ else
 			$formmail->setSubstitFromObject($object);
 			$formmail->substit['__THIRDPARTY_ID__']=$object->id;		// substit in setSubstitFromObject was wrong for this one
 			$formmail->substit['__THIRDPARTY_NAME__']=$object->name;	// substit in setSubstitFromObject was wrong for this one
-			$formmail->substit['__PERSONALIZED__']='';
+			$formmail->substit['__PERSONALIZED__']='';					// deprecated
 			$formmail->substit['__CONTACTCIVNAME__']='';
 
 			//Find the good contact adress
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 0de6ca4f5fd..a6cf54ab40d 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -163,22 +163,25 @@ if ($resql)
 	                    $tmpfield=explode('=',$other[4],2); $other5=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
 	                    $signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:'');
 
-						// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
-						$substitutionarray=array(
-							'__ID__' => $obj2->source_id,
-							'__EMAIL__' => $obj2->email,
-							'__LASTNAME__' => $obj2->lastname,
-							'__FIRSTNAME__' => $obj2->firstname,
-							'__MAILTOEMAIL__' => '<a href="mailto:'.$obj2->email.'">'.$obj2->email.'</a>',
-							'__OTHER1__' => $other1,
-							'__OTHER2__' => $other2,
-							'__OTHER3__' => $other3,
-							'__OTHER4__' => $other4,
-							'__OTHER5__' => $other5,
-							'__SIGNATURE__' => $signature,	// Signature is empty when ran from command line or taken from user in parameter)
-							'__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj2->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>',
-							'__UNSUBSCRIBE__' => '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj2->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>'
-						);
+	                    $object = null;		// Not defined with mass emailing
+	                    $parameters=array('mode'=>'emailing');
+	                    $substitutionarray=getCommonSubstitutionArray($langs, 2, array('object','objectamount'), $object);			// Note: On mass emailing, this is null because we don't know object
+
+	                    // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
+	                    $substitutionarray['__ID__'] = $obj->source_id;
+	                    $substitutionarray['__EMAIL__'] = $obj->email;
+	                    $substitutionarray['__LASTNAME__'] = $obj->lastname;
+	                    $substitutionarray['__FIRSTNAME__'] = $obj->firstname;
+	                    $substitutionarray['__MAILTOEMAIL__'] = '<a href="mailto:'.$obj->email.'">'.$obj->email.'</a>';
+	                    $substitutionarray['__OTHER1__'] = $other1;
+	                    $substitutionarray['__OTHER2__'] = $other2;
+	                    $substitutionarray['__OTHER3__'] = $other3;
+	                    $substitutionarray['__OTHER4__'] = $other4;
+	                    $substitutionarray['__OTHER5__'] = $other5;
+	                    $substitutionarray['__SIGNATURE__'] = $signature;	// Signature is empty when ran from command line or taken from user in parameter)
+	                    $substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+	                    $substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
+
 						$onlinepaymentenabled = 0;
 						if (! empty($conf->paypal->enabled)) $onlinepaymentenabled++;
 						if (! empty($conf->paybox->enabled)) $onlinepaymentenabled++;
@@ -186,18 +189,20 @@ if ($resql)
 						if ($onlinepaymentenabled && ! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 						{
 							$substitutionarray['__SECUREKEYPAYMENT__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-
-							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
-
-							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
-
-							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
-
-							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+							{
+								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+							}
+							else
+							{
+								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+							}
 						}
 						/* For backward compatibility */
 						if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
@@ -216,6 +221,7 @@ if ($resql)
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
 						}
+
 						complete_substitutions_array($substitutionarray,$langs);
 						$newsubject=make_substitutions($subject,$substitutionarray);
 						$newmessage=make_substitutions($message,$substitutionarray);

From d4bde2a4eae5491db49a3223468f52e22a5480a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 22 Sep 2017 15:12:36 +0200
Subject: [PATCH 24/28] Fix date substitution for contracts

---
 htdocs/admin/mails_templates.php         | 25 ++++++++++++++++++------
 htdocs/contrat/card.php                  | 11 +++++++----
 htdocs/core/actions_sendmails.inc.php    | 11 +++++++----
 htdocs/core/lib/functions.lib.php        | 12 ++++++++----
 htdocs/core/tpl/card_presend.tpl.php     | 17 ++++++++--------
 htdocs/core/tpl/massactions_form.tpl.php | 17 ++++++++--------
 6 files changed, 59 insertions(+), 34 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 3000612514a..356f52061f6 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -125,17 +125,30 @@ $formmail=new FormMail($db);
 if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
 {
     $tmp=FormMail::getAvailableSubstitKey('formemail');
-    $tmp['__(AnyTranslationKey)__']='__(AnyTranslationKey)__';
-    $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
-    $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
+    $tmp['__(AnyTranslationKey)__']='Translation';
+    $helpsubstit = $langs->trans("AvailableVariables").':<br>';
+    $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>';
+    foreach($tmp as $key => $val)
+    {
+    	$helpsubstit.=$key.' -> '.$val.'<br>';
+    	$helpsubstitforlines.=$key.' -> '.$val.'<br>';
+    }
 }
 else
 {
     $tmp=FormMail::getAvailableSubstitKey('formemailwithlines');
-    $tmp['__(AnyTranslationKey)__']='__(AnyTranslationKey)__';
-    $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
+    $tmp['__(AnyTranslationKey)__']='Translation';
+    $helpsubstit = $langs->trans("AvailableVariables").':<br>';
+    $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>';
+    foreach($tmp as $key => $val)
+    {
+    	$helpsubstit.=$key.' -> '.$val.'<br>';
+    }
     $tmp=FormMail::getAvailableSubstitKey('formemailforlines');
-    $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
+    foreach($tmp as $key => $val)
+    {
+    	$helpsubstitforlines.=$key.' -> '.$val.'<br>';
+    }
 }
 
 
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 904bd519f76..07a620963da 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2243,14 +2243,17 @@ else
 			$formmail->withcancel = 1;
 			// Array of substitutions
 			$formmail->setSubstitFromObject($object);
+			$dateplannedstart='';
 			$datenextexpiration='';
 			foreach($object->lines as $line)
 			{
-				if ($line->statut != 4) continue;
-				if ($line->date_fin_prevue > $datenextexpiration) $datenextexpiration = $line->date_fin_prevue;
+				if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;
+				if ($line->statut == 4 && $line->date_fin_prevue && (! $datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
 			}
-			$formmail->substit['__CONTRACT_NEXT_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
-			$formmail->substit['__CONTRACT_NEXT_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
+			$formmail->substit['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
+			$formmail->substit['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
+			$formmail->substit['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
+			$formmail->substit['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
 			$formmail->substit['__PERSONALIZED__']='';		// deprecated
 			$formmail->substit['__CONTACTCIVNAME__']='';
 
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 144cba07779..fddd6889515 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -351,14 +351,17 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			// Add specific substitution for contracts
 			if (is_object($object) && $object->element == 'contrat' && is_array($object->lines))
 			{
+				$dateplannedstart='';
 				$datenextexpiration='';
 				foreach($object->lines as $line)
 				{
-					if ($line->statut != 4) continue;
-					if ($line->date_fin_prevue > $datenextexpiration) $datenextexpiration = $line->date_fin_prevue;
+					if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;
+					if ($line->statut == 4 && $line->date_fin_prevue && (! $datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
 				}
-				$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
-				$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
+				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
+				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
+				$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
+				$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
 			}
 
 			$parameters=array('mode'=>'formemail');
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2b8ab5ebf7a..aa8c74026ff 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5244,8 +5244,10 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
     		$substitutionarray['__PROJECT_REF__'] = '__PROJECT_REF__';
     		$substitutionarray['__PROJECT_NAME__'] = '__PROJECT_REF__';
 
-	    	$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATE__'] = 'Date for next expired service';
-    		$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATETIME__'] = 'Date and hour for next expired service';
+			$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = 'Highest date planned for a service start';
+			$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = 'Highest date and hour planned for service start';
+    		$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = 'Lowest data for planned expiration of service';
+    		$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = 'Lowest date and hour for planned expiration of service';
 
     		$substitutionarray['__ONLINE_PAYMENT_URL__'] = 'LinkToPayOnlineIfApplicable';
     		$substitutionarray['__SECUREKEYPAYMENT__'] = 'Security key (if key is not unique per record)';
@@ -5285,8 +5287,10 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
 		    	}
 	    	}
 
-    		$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATE__'] = 'TODO';
-	    	$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATETIME__'] = 'TODO';
+    		$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = 'TODO';
+	    	$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = 'TODO';
+	    	$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = 'TODO';
+	    	$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = 'TODO';
 
 	    	$substitutionarray['__ONLINE_PAYMENT_URL__'] = 'TODO';
     	}
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 5273a761d4e..af6e3699f39 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -144,16 +144,17 @@ if ($action == 'presend')
 	// Add specific substitution for contracts
 	if (is_object($object) && $object->element == 'contrat' && is_array($object->lines))
 	{
-		$datenextexpiration = '';
-		foreach ($object->lines as $line)
+		$dateplannedstart='';
+		$datenextexpiration='';
+		foreach($object->lines as $line)
 		{
-			if ($line->statut != 4)
-				continue;
-				if ($line->date_fin_prevue > $datenextexpiration)
-					$datenextexpiration = $line->date_fin_prevue;
+			if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;
+			if ($line->statut == 4 && $line->date_fin_prevue && (! $datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
 		}
-		$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
-		$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
+		$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
+		$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
+		$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
+		$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
 	}
 
 	// Choose one contact for the __CONTACTCIVNAME__ TODO Really not reliable.
diff --git a/htdocs/core/tpl/massactions_form.tpl.php b/htdocs/core/tpl/massactions_form.tpl.php
index 00ca40daf37..7e767b7cf03 100644
--- a/htdocs/core/tpl/massactions_form.tpl.php
+++ b/htdocs/core/tpl/massactions_form.tpl.php
@@ -122,16 +122,17 @@ $substitutionarray['__CONTACTCIVNAME__'] = '';
 // Add specific substitution for contracts
 if (is_object($object) && $object->element == 'contrat' && is_array($object->lines))
 {
-	$datenextexpiration = '';
-	foreach ($object->lines as $line)
+	$dateplannedstart='';
+	$datenextexpiration='';
+	foreach($object->lines as $line)
 	{
-		if ($line->statut != 4)
-			continue;
-		if ($line->date_fin_prevue > $datenextexpiration)
-			$datenextexpiration = $line->date_fin_prevue;
+		if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;
+		if ($line->statut == 4 && $line->date_fin_prevue && (! $datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
 	}
-	$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
-	$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
+	$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
+	$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
+	$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
+	$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
 }
 
 $parameters = array(

From 6d7db96359bc5a7941600e1000bffcfbb4878924 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 22 Sep 2017 16:31:05 +0200
Subject: [PATCH 25/28] NEW Option "one email per recipient" when using bulk
 actions emails.

---
 htdocs/contrat/card.php                   |  11 --
 htdocs/contrat/list.php                   |  26 ++-
 htdocs/core/actions_massactions.inc.php   | 223 ++++++++++++----------
 htdocs/core/actions_sendmails.inc.php     |  15 --
 htdocs/core/class/html.formmail.class.php |  13 ++
 htdocs/core/lib/functions.lib.php         |  18 +-
 htdocs/core/tpl/card_presend.tpl.php      |  15 --
 htdocs/core/tpl/massactions_form.tpl.php  |  21 +-
 htdocs/langs/en_US/main.lang              |   3 +
 9 files changed, 174 insertions(+), 171 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 07a620963da..da26f9ed000 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2243,17 +2243,6 @@ else
 			$formmail->withcancel = 1;
 			// Array of substitutions
 			$formmail->setSubstitFromObject($object);
-			$dateplannedstart='';
-			$datenextexpiration='';
-			foreach($object->lines as $line)
-			{
-				if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;
-				if ($line->statut == 4 && $line->date_fin_prevue && (! $datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
-			}
-			$formmail->substit['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
-			$formmail->substit['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
-			$formmail->substit['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
-			$formmail->substit['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
 			$formmail->substit['__PERSONALIZED__']='';		// deprecated
 			$formmail->substit['__CONTACTCIVNAME__']='';
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index c6fbaf478bf..2afee019bed 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -47,6 +47,7 @@ $confirm=GETPOST('confirm','alpha');
 $toselect = GETPOST('toselect', 'array');
 
 $search_name=GETPOST('search_name');
+$search_email=GETPOST('search_email');
 $search_town=GETPOST('search_town','alpha');
 $search_zip=GETPOST('search_zip','alpha');
 $search_state=trim(GETPOST("search_state"));
@@ -116,7 +117,8 @@ $arrayfields=array(
     'c.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1),
     'c.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1),
     's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
-    's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0),
+    's.email'=>array('label'=>$langs->trans("ThirdPartyEmail"), 'checked'=>0),
+	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0),
     's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>0),
     'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
     'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
@@ -156,7 +158,8 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 	$month='';
 	$year='';
     $search_name="";
-	$search_town='';
+    $search_email="";
+    $search_town='';
 	$search_zip="";
 	$search_state="";
 	$search_type='';
@@ -199,7 +202,7 @@ llxHeader('', $langs->trans("Contracts"));
 
 $sql = 'SELECT';
 $sql.= " c.rowid, c.ref, c.datec as date_creation, c.tms as date_update, c.date_contrat, c.statut, c.ref_customer, c.ref_supplier, c.note_private, c.note_public,";
-$sql.= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
+$sql.= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
 $sql.= " typent.code as typent_code,";
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
 $sql.= ' SUM('.$db->ifsql("cd.statut=0",1,0).') as nb_initial,';
@@ -246,6 +249,7 @@ else if ($year > 0)
 	$sql.= " AND c.date_contrat BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
 }
 if ($search_name) $sql .= natural_search('s.nom', $search_name);
+if ($search_email) $sql .= natural_search('s.email', $search_name);
 if ($search_contract) $sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract);
 if (!empty($search_ref_customer)) $sql .= natural_search(array('c.ref_customer'), $search_ref_customer);
 if (!empty($search_ref_supplier)) $sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier);
@@ -275,7 +279,7 @@ $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // No
 $sql.=$hookmanager->resPrint;
 
 $sql.= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.date_contrat, c.statut, c.ref_customer, c.ref_supplier, c.note_private, c.note_public,";
-$sql.= ' s.rowid, s.nom, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
+$sql.= ' s.rowid, s.nom, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
 $sql.= " typent.code,";
 $sql.= " state.code_departement, state.nom";
 // Add fields from extrafields
@@ -324,6 +328,7 @@ if ($resql)
     if ($sall != '')                $param.='&sall='.$sall;
     if ($search_contract != '')     $param.='&search_contract='.$search_contract;
     if ($search_name != '')         $param.='&search_name='.$search_name;
+    if ($search_email != '')        $param.='&search_email='.$search_email;
     if ($search_ref_supplier != '') $param.='&search_ref_supplier='.$search_ref_supplier;
     if ($search_sale != '')         $param.='&search_sale=' .$search_sale;
     if ($show_files)                $param.='&show_files=' .$show_files;
@@ -446,6 +451,12 @@ if ($resql)
         print '<input type="text" class="flat" size="8" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
         print '</td>';
     }
+    if (! empty($arrayfields['s.email']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '<input type="text" class="flat" size="6" name="search_email" value="'.dol_escape_htmltag($search_email).'">';
+        print '</td>';
+    }
     // Town
     if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
     // Zip
@@ -542,7 +553,8 @@ if ($resql)
     if (! empty($arrayfields['c.ref_customer']['checked']))      print_liste_field_titre($arrayfields['c.ref_customer']['label'], $_SERVER["PHP_SELF"], "c.ref_customer","","$param",'',$sortfield,$sortorder);
     if (! empty($arrayfields['c.ref_supplier']['checked']))      print_liste_field_titre($arrayfields['c.ref_supplier']['label'], $_SERVER["PHP_SELF"], "c.ref_supplier","","$param",'',$sortfield,$sortorder);
     if (! empty($arrayfields['s.nom']['checked']))               print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom","","$param",'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.town']['checked']))              print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['s.email']['checked']))             print_liste_field_titre($arrayfields['s.email']['label'], $_SERVER["PHP_SELF"], "s.email","","$param",'',$sortfield,$sortorder);
+    if (! empty($arrayfields['s.town']['checked']))              print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['s.zip']['checked']))               print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['state.nom']['checked']))           print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['country.code_iso']['checked']))    print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
@@ -621,6 +633,10 @@ if ($resql)
         {
             print '<td><a href="../comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
         }
+        if (! empty($arrayfields['s.email']['checked']))
+        {
+            print '<td>'.$obj->email.'</td>';
+        }
         // Town
         if (! empty($arrayfields['s.town']['checked']))
         {
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 2ac0b3a5885..e0acad65ab8 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -104,7 +104,7 @@ if (! $error && $massaction == 'confirm_presend')
     	if (empty($receiver) || $receiver == '-1') $receiver=array();
     	else $receiver=array($receiver);
     }
-    if (count($receiver) == 0 && count($listofobjectthirdparties) == 1)	// if only one recipient, receiver is mandatory
+    if (! trim($_POST['sendto']) && count($receiver) == 0 && count($listofobjectthirdparties) == 1)	// if only one recipient, receiver is mandatory
     {
      	$error++;
        	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Recipient")), null, 'warnings');
@@ -322,114 +322,129 @@ if (! $error && $massaction == 'confirm_presend')
                 if ($objectclass == 'CommandeFournisseur')	$sendtocc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO);
                 if ($objectclass == 'FactureFournisseur')	$sendtocc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO);
 
-                $objecttmp=new $objectclass($db);
-                $objecttmp->thirdparty = $thirdparty;
-
-                // Make substitution in email content
-                $substitutionarray=getCommonSubstitutionArray($langs, 0, null, $objecttmp);
-                $substitutionarray['__ID__'] = join(', ',array_keys($listofqualifiedid));
-                $substitutionarray['__EMAIL__'] = $thirdparty->email;
-                $substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
-                $substitutionarray['__REF__'] = join(', ',$listofqualifiedref);
-
-                $parameters=array('mode'=>'formemail');
-                complete_substitutions_array($substitutionarray, $langs, $objecttmp, $parameters);
-
-                $subject=make_substitutions($subject, $substitutionarray);
-                $message=make_substitutions($message, $substitutionarray);
-
-                $filepath = $attachedfiles['paths'];
-                $filename = $attachedfiles['names'];
-                $mimetype = $attachedfiles['mimes'];
-
-                //var_dump($filepath);
-
-                // Send mail (substitutionarray must be done just before this)
-                require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php');
-                $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1);
-                if ($mailfile->error)
+                // $listofqualifiedid is array with key = object id of qualified objects for the current thirdparty
+                $oneemailperrecipient=(GETPOST('oneemailperrecipient')=='on'?1:0);
+                $looparray=array();
+                if (! $oneemailperrecipient)
                 {
-                    $resaction.='<div class="error">'.$mailfile->error.'</div>';
+                	$looparray = $listofqualifiedid;
                 }
                 else
                 {
-                    $result=$mailfile->sendfile();
-                    if ($result)
-                    {
-                        $resaction.=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2)).'<br>';		// Must not contain "
-
-                        $error=0;
-
-                        // Insert logs into agenda
-                        foreach($listofqualifiedid as $objid => $object)
-                        {
-                            /*if ($objectclass == 'Propale') $actiontypecode='AC_PROP';
-                            if ($objectclass == 'Commande') $actiontypecode='AC_COM';
-                            if ($objectclass == 'Facture') $actiontypecode='AC_FAC';
-                            if ($objectclass == 'Supplier_Proposal') $actiontypecode='AC_SUP_PRO';
-                            if ($objectclass == 'CommandeFournisseur') $actiontypecode='AC_SUP_ORD';
-                            if ($objectclass == 'FactureFournisseur') $actiontypecode='AC_SUP_INV';*/
-
-                            $actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
-                            if ($message)
-                            {
-                                if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
-                                $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
-                                $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
-                                $actionmsg = dol_concatdesc($actionmsg, $message);
-                            }
-                            $actionmsg2='';
-
-                            // Initialisation donnees
-                            $object->sendtoid		= 0;
-                            $object->actionmsg		= $actionmsg;  // Long text
-                            $object->actionmsg2		= $actionmsg2; // Short text
-                            $object->fk_element		= $objid;
-                            $object->elementtype	= $object->element;
-
-                            $triggername = strtoupper(get_class($object)) .'_SENTBYMAIL';
-                            if ($triggername == 'SOCIETE_SENTBYMAIL')    $triggername = 'COMPANY_SENTBYEMAIL';
-                            if ($triggername == 'CONTRAT_SENTBYMAIL')    $triggername = 'CONTRACT_SENTBYEMAIL';
-                            if ($triggername == 'COMMANDE_SENTBYMAIL')   $triggername = 'ORDER_SENTBYEMAIL';
-                            if ($triggername == 'FACTURE_SENTBYMAIL')    $triggername = 'BILL_SENTBYEMAIL';
-                            if ($triggername == 'EXPEDITION_SENTBYMAIL') $triggername = 'SHIPPING_SENTBYEMAIL';
-                            if ($triggername == 'COMMANDEFOURNISSEUR_SENTBYMAIL') $triggername = 'ORDER_SUPPLIER_SENTBYMAIL';
-                            if ($triggername == 'FACTUREFOURNISSEUR_SENTBYMAIL') $triggername = 'BILL_SUPPLIER_SENTBYEMAIL';
-                            if ($triggername == 'SUPPLIERPROPOSAL_SENTBYMAIL') $triggername = 'PROPOSAL_SUPPLIER_SENTBYEMAIL';
-
-                            if (! empty($trigger_name))
-                            {
-	                            // Appel des triggers
-	                            include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
-	                            $interface=new Interfaces($db);
-	                            $result=$interface->run_triggers($trigger_name, $object, $user, $langs, $conf);
-	                            if ($result < 0) { $error++; $errors=$interface->errors; }
-	                            // Fin appel triggers
-
-	                            if ($error)
-	                            {
-	                                setEventMessages($db->lasterror(), $errors, 'errors');
-	                                dol_syslog("Error in trigger ".$trigger_name.' '.$db->lasterror(), LOG_ERR);
-	                            }
-                            }
-
-                            $nbsent++;
-                        }
-                    }
-                    else
-                    {
-                        $langs->load("other");
-                        if ($mailfile->error)
-                        {
-                            $resaction.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
-                            $resaction.='<br><div class="error">'.$mailfile->error.'</div>';
-                        }
-                        else
-                        {
-                            $resaction.='<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
-                        }
-                    }
+                	$objectforloop=new $objectclass($db);
+                	$objectforloop->thirdparty = $thirdparty;
+                	$looparray[0]=$objectforloop;
                 }
+                //var_dump($looparray);exit;
+
+				foreach ($looparray as $objecttmp)		// $objecttmp is a real object or an empty if we choose to send one email per thirdparty instead of per record
+				{
+	                // Make substitution in email content
+	                $substitutionarray=getCommonSubstitutionArray($langs, 0, null, $objecttmp);
+	                $substitutionarray['__ID__']    = ($oneemailperrecipient ? join(', ',array_keys($listofqualifiedid)) : $objecttmp->id);
+	                $substitutionarray['__REF__']   = ($oneemailperrecipient ? join(', ',$listofqualifiedref) : $objecttmp->ref);
+	                $substitutionarray['__EMAIL__'] = $thirdparty->email;
+	                $substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+
+	                $parameters=array('mode'=>'formemail');
+	                complete_substitutions_array($substitutionarray, $langs, $objecttmp, $parameters);
+
+	                $subject=make_substitutions($subject, $substitutionarray);
+	                $message=make_substitutions($message, $substitutionarray);
+
+	                $filepath = $attachedfiles['paths'];
+	                $filename = $attachedfiles['names'];
+	                $mimetype = $attachedfiles['mimes'];
+
+	                //var_dump($filepath);
+
+	                // Send mail (substitutionarray must be done just before this)
+	                require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php');
+	                $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1);
+	                if ($mailfile->error)
+	                {
+	                    $resaction.='<div class="error">'.$mailfile->error.'</div>';
+	                }
+	                else
+	                {
+	                    $result=$mailfile->sendfile();
+	                    if ($result)
+	                    {
+	                        $resaction.=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2)).'<br>';		// Must not contain "
+
+	                        $error=0;
+
+	                        // Insert logs into agenda
+	                        foreach($listofqualifiedid as $objid => $object)
+	                        {
+	                            /*if ($objectclass == 'Propale') $actiontypecode='AC_PROP';
+	                            if ($objectclass == 'Commande') $actiontypecode='AC_COM';
+	                            if ($objectclass == 'Facture') $actiontypecode='AC_FAC';
+	                            if ($objectclass == 'Supplier_Proposal') $actiontypecode='AC_SUP_PRO';
+	                            if ($objectclass == 'CommandeFournisseur') $actiontypecode='AC_SUP_ORD';
+	                            if ($objectclass == 'FactureFournisseur') $actiontypecode='AC_SUP_INV';*/
+
+	                            $actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
+	                            if ($message)
+	                            {
+	                                if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+	                                $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
+	                                $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+	                                $actionmsg = dol_concatdesc($actionmsg, $message);
+	                            }
+	                            $actionmsg2='';
+
+	                            // Initialisation donnees
+	                            $object->sendtoid		= 0;
+	                            $object->actionmsg		= $actionmsg;  // Long text
+	                            $object->actionmsg2		= $actionmsg2; // Short text
+	                            $object->fk_element		= $objid;
+	                            $object->elementtype	= $object->element;
+
+	                            $triggername = strtoupper(get_class($object)) .'_SENTBYMAIL';
+	                            if ($triggername == 'SOCIETE_SENTBYMAIL')    $triggername = 'COMPANY_SENTBYEMAIL';
+	                            if ($triggername == 'CONTRAT_SENTBYMAIL')    $triggername = 'CONTRACT_SENTBYEMAIL';
+	                            if ($triggername == 'COMMANDE_SENTBYMAIL')   $triggername = 'ORDER_SENTBYEMAIL';
+	                            if ($triggername == 'FACTURE_SENTBYMAIL')    $triggername = 'BILL_SENTBYEMAIL';
+	                            if ($triggername == 'EXPEDITION_SENTBYMAIL') $triggername = 'SHIPPING_SENTBYEMAIL';
+	                            if ($triggername == 'COMMANDEFOURNISSEUR_SENTBYMAIL') $triggername = 'ORDER_SUPPLIER_SENTBYMAIL';
+	                            if ($triggername == 'FACTUREFOURNISSEUR_SENTBYMAIL') $triggername = 'BILL_SUPPLIER_SENTBYEMAIL';
+	                            if ($triggername == 'SUPPLIERPROPOSAL_SENTBYMAIL') $triggername = 'PROPOSAL_SUPPLIER_SENTBYEMAIL';
+
+	                            if (! empty($trigger_name))
+	                            {
+		                            // Appel des triggers
+		                            include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+		                            $interface=new Interfaces($db);
+		                            $result=$interface->run_triggers($trigger_name, $object, $user, $langs, $conf);
+		                            if ($result < 0) { $error++; $errors=$interface->errors; }
+		                            // Fin appel triggers
+
+		                            if ($error)
+		                            {
+		                                setEventMessages($db->lasterror(), $errors, 'errors');
+		                                dol_syslog("Error in trigger ".$trigger_name.' '.$db->lasterror(), LOG_ERR);
+		                            }
+	                            }
+
+	                            $nbsent++;
+	                        }
+	                    }
+	                    else
+	                    {
+	                        $langs->load("other");
+	                        if ($mailfile->error)
+	                        {
+	                            $resaction.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
+	                            $resaction.='<br><div class="error">'.$mailfile->error.'</div>';
+	                        }
+	                        else
+	                        {
+	                            $resaction.='<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
+	                        }
+	                    }
+	                }
+				}
             }
         }
 
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index fddd6889515..771c8441bcf 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -348,21 +348,6 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			$substitutionarray=getCommonSubstitutionArray($langs, 0, null, $object);
 			$substitutionarray['__EMAIL__'] = $sendto;
 			$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty))?'<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>':'';
-			// Add specific substitution for contracts
-			if (is_object($object) && $object->element == 'contrat' && is_array($object->lines))
-			{
-				$dateplannedstart='';
-				$datenextexpiration='';
-				foreach($object->lines as $line)
-				{
-					if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;
-					if ($line->statut == 4 && $line->date_fin_prevue && (! $datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
-				}
-				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
-				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
-				$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
-				$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
-			}
 
 			$parameters=array('mode'=>'formemail');
 			complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index efdd7f6a433..5d9a963f7a0 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -465,6 +465,19 @@ class FormMail extends Form
         		}
         	}
 
+        	// withoptiononeemailperrecipient
+        	if (! empty($this->withoptiononeemailperrecipient))
+        	{
+        		$out.= '<tr><td class="fieldrequired" width="180">';
+        		$out.= $langs->trans("GroupEmails");
+        		$out.= '</td><td>';
+        		$out.=' <input type="checkbox" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0?' checked="checked"':'').'> ';
+        		$out.= $langs->trans("OneEmailPerRecipient").' - ';
+        		$out.= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");
+        		$out.= '</td></tr>';
+
+        	}
+
         	// To
         	if (! empty($this->withto) || is_array($this->withto))
         	{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index aa8c74026ff..706e2a11a1b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5287,10 +5287,20 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
 		    	}
 	    	}
 
-    		$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = 'TODO';
-	    	$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = 'TODO';
-	    	$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = 'TODO';
-	    	$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = 'TODO';
+	    	if (is_object($object) && $object->element == 'contrat' && is_array($object->lines))
+	    	{
+	    		$dateplannedstart='';
+	    		$datenextexpiration='';
+	    		foreach($object->lines as $line)
+	    		{
+	    			if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;
+	    			if ($line->statut == 4 && $line->date_fin_prevue && (! $datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
+	    		}
+	    		$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
+	    		$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
+	    		$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
+	    		$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
+	    	}
 
 	    	$substitutionarray['__ONLINE_PAYMENT_URL__'] = 'TODO';
     	}
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index af6e3699f39..502dfb33df6 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -141,21 +141,6 @@ if ($action == 'presend')
 	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-read.php?tag=' . $object->thirdparty->tag . '&securitykey=' . urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) . '" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
 	$substitutionarray['__PERSONALIZED__'] = '';	// deprecated
 	$substitutionarray['__CONTACTCIVNAME__'] = '';
-	// Add specific substitution for contracts
-	if (is_object($object) && $object->element == 'contrat' && is_array($object->lines))
-	{
-		$dateplannedstart='';
-		$datenextexpiration='';
-		foreach($object->lines as $line)
-		{
-			if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;
-			if ($line->statut == 4 && $line->date_fin_prevue && (! $datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
-		}
-		$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
-		$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
-		$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
-		$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
-	}
 
 	// Choose one contact for the __CONTACTCIVNAME__ TODO Really not reliable.
 	/*
diff --git a/htdocs/core/tpl/massactions_form.tpl.php b/htdocs/core/tpl/massactions_form.tpl.php
index 7e767b7cf03..ded6f170d95 100644
--- a/htdocs/core/tpl/massactions_form.tpl.php
+++ b/htdocs/core/tpl/massactions_form.tpl.php
@@ -97,8 +97,10 @@ if (count($listofselectedthirdparties) == 1) // Only 1 different recipient selec
 } else {
 	$formmail->withtoreadonly = 1;
 }
-$formmail->withto = $liste;
-$formmail->withtofree = 0;
+
+$formmail->withoptiononeemailperrecipient = (GETPOST('oneemailperrecipient')=='on')?1:-1;
+$formmail->withto = empty($liste)?(GETPOST('sendto','alpha')?GETPOST('sendto','alpha'):array()):$liste;
+$formmail->withtofree = empty($liste)?1:0;
 $formmail->withtocc = 1;
 $formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
 $formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
@@ -119,21 +121,6 @@ $substitutionarray['__EMAIL__'] = $sendto;
 $substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-read.php?tag=' . $object->thirdparty->tag . '&securitykey=' . urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) . '" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
 $substitutionarray['__PERSONALIZED__'] = '';	// deprecated
 $substitutionarray['__CONTACTCIVNAME__'] = '';
-// Add specific substitution for contracts
-if (is_object($object) && $object->element == 'contrat' && is_array($object->lines))
-{
-	$dateplannedstart='';
-	$datenextexpiration='';
-	foreach($object->lines as $line)
-	{
-		if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;
-		if ($line->statut == 4 && $line->date_fin_prevue && (! $datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
-	}
-	$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
-	$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
-	$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
-	$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
-}
 
 $parameters = array(
 	'mode' => 'formemail'
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 7475d1194eb..8560b75357f 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -811,6 +811,9 @@ Websites=Web sites
 Events=Events
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+GroupEmails=Group emails
+OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
+WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email may be sent for several different record selected. If your email text contains substitution variables that refers to data of a record, it becomes not possible to replace them. 
 # Week day
 Monday=Monday
 Tuesday=Tuesday

From 8578a1b825f76a864d0847220b6d1b10a0092f94 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 22 Sep 2017 17:04:26 +0200
Subject: [PATCH 26/28] NEW Option "one email per recipient" when using bulk
 actions emails.

---
 htdocs/core/class/html.formmail.class.php | 1 +
 htdocs/core/tpl/massactions_form.tpl.php  | 4 ++--
 htdocs/langs/en_US/mails.lang             | 5 ++++-
 htdocs/langs/en_US/main.lang              | 3 ---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 5d9a963f7a0..8e61eb46012 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -515,6 +515,7 @@ class FormMail extends Form
         			}
         			else
         			{
+        				// Note withto may be a text like 'AllRecipientSelected'
         				$out.= (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
         			}
         		}
diff --git a/htdocs/core/tpl/massactions_form.tpl.php b/htdocs/core/tpl/massactions_form.tpl.php
index ded6f170d95..4087d988c3b 100644
--- a/htdocs/core/tpl/massactions_form.tpl.php
+++ b/htdocs/core/tpl/massactions_form.tpl.php
@@ -74,7 +74,7 @@ if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAI
 	$formmail->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
 }
 $formmail->withfrom = 1;
-$liste = $langs->trans("AllRecipientSelected", count($listofselectedthirdparties));
+$liste = $langs->trans("AllRecipientSelected", count($arrayofselected));
 if (count($listofselectedthirdparties) == 1) // Only 1 different recipient selected, we can suggest contacts
 {
 	$liste = array();
@@ -98,7 +98,7 @@ if (count($listofselectedthirdparties) == 1) // Only 1 different recipient selec
 	$formmail->withtoreadonly = 1;
 }
 
-$formmail->withoptiononeemailperrecipient = (GETPOST('oneemailperrecipient')=='on')?1:-1;
+$formmail->withoptiononeemailperrecipient = empty($liste)?0:((GETPOST('oneemailperrecipient')=='on')?1:-1);
 $formmail->withto = empty($liste)?(GETPOST('sendto','alpha')?GETPOST('sendto','alpha'):array()):$liste;
 $formmail->withtofree = empty($liste)?1:0;
 $formmail->withtocc = 1;
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 7661f46ce3c..0caae25c1d5 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -70,7 +70,10 @@ EMailSentToNRecipients=EMail sent to %s recipients.
 EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
 OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
-AllRecipientSelected=The %s unique recipients selected (1 email per recipient), and if an email is set.
+AllRecipientSelected=The recipients of the %s record selected (if their email is known).
+GroupEmails=Group emails
+OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
+WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them. 
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 8560b75357f..7475d1194eb 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -811,9 +811,6 @@ Websites=Web sites
 Events=Events
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
-GroupEmails=Group emails
-OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
-WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email may be sent for several different record selected. If your email text contains substitution variables that refers to data of a record, it becomes not possible to replace them. 
 # Week day
 Monday=Monday
 Tuesday=Tuesday

From f990667b1a85c57da060e658a5742d31df63890c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 22 Sep 2017 17:48:38 +0200
Subject: [PATCH 27/28] NEW Can send email from the member card using email
 templates.

---
 htdocs/adherents/card.php                     | 163 ++++++++++-------
 htdocs/adherents/class/adherent.class.php     |   2 +-
 htdocs/admin/mails_templates.php              |   1 +
 htdocs/commande/card.php                      |  10 +-
 htdocs/contrat/card.php                       | 170 ++----------------
 htdocs/core/actions_sendmails.inc.php         |  13 +-
 htdocs/core/class/html.formmail.class.php     |  40 ++---
 htdocs/core/tpl/card_presend.tpl.php          |  19 +-
 .../mysql/data/llx_c_action_trigger.sql       |   1 +
 .../install/mysql/migration/6.0.0-7.0.0.sql   |   2 +
 htdocs/langs/en_US/admin.lang                 |   1 +
 11 files changed, 165 insertions(+), 257 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index bb67ec46468..758fad1e015 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -121,14 +121,22 @@ $hookmanager->initHooks(array('membercard','globalcard'));
  * 	Actions
  */
 
-if ($cancel) $action='';
-
 $parameters=array('id'=>$id, 'rowid'=>$id, 'objcanvas'=>$objcanvas);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
 {
+	if ($cancel)
+	{
+		if (! empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action='';
+	}
+
 	if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer))
 	{
 		$error=0;
@@ -715,10 +723,21 @@ if (empty($reshook))
 		}
 	}
 
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
 	// Actions to build doc
 	$upload_dir = $conf->adherent->dir_output;
 	$permissioncreate=$user->rights->adherent->creer;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+	// Actions to send emails
+	$trigger_name='MEMBER_SENTBYMAIL';
+	$paramname='id';
+	$mode='emailfrommember';
+	$trackid='mem'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
 }
 
 
@@ -1590,6 +1609,30 @@ else
 		if (empty($reshook)) {
 			if ($action != 'valid' && $action != 'editlogin' && $action != 'editthirdparty')
 			{
+				// Send
+				if ($object->statut == 1) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>';
+				}
+
+				// Send card by email
+				// TODO Remove this to replace with a template
+				if ($user->rights->adherent->creer)
+				{
+					if ($object->statut >= 1)
+					{
+						if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=sendinfo">'.$langs->trans("SendCardByMail")."</a></div>\n";
+						else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendCardByMail")."</a></div>\n";
+					}
+					else
+					{
+						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("SendCardByMail")."</font></div>";
+					}
+				}
+				else
+				{
+					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("SendCardByMail")."</font></div>";
+				}
+
 				// Modify
 				if ($user->rights->adherent->creer)
 				{
@@ -1626,24 +1669,6 @@ else
 					}
 				}
 
-				// Send card by email
-				if ($user->rights->adherent->creer)
-				{
-					if ($object->statut >= 1)
-					{
-						if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=sendinfo">'.$langs->trans("SendCardByMail")."</a></div>\n";
-						else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendCardByMail")."</a></div>\n";
-					}
-					else
-					{
-						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("SendCardByMail")."</font></div>";
-					}
-				}
-				else
-				{
-					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("SendCardByMail")."</font></div>";
-				}
-
 				// Terminate
 				if ($object->statut >= 1)
 				{
@@ -1720,52 +1745,66 @@ else
 		}
 
 
-
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-		print '<a name="builddoc"></a>'; // ancre
-
-		// Documents generes
-		$filename = dol_sanitizeFileName($object->ref);
-		//$filename =  'tmp_cards.php';
-		//$filedir = $conf->adherent->dir_output . '/' . get_exdir($object->id, 2, 0, 0, $object, 'member') . dol_sanitizeFileName($object->ref);
-		$filedir = $conf->adherent->dir_output . '/' . get_exdir(0, 0, 0, 0, $object, 'member');
-		$urlsource = $_SERVER['PHP_SELF'] . '?id=' . $object->id;
-		$genallowed = $user->rights->adherent->creer;
-		$delallowed = $user->rights->adherent->supprimer;
-
-		print $formfile->showdocuments('member', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $object->default_lang, '', $object);
-		$somethingshown = $formfile->numoffiles;
-
-		// Show links to link elements
-		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('subscription'));
-		//$somethingshown = $form->showLinkedObjectBlock($object, '');
-
-		// Show links to link elements
-		/*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
-		 if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
-		 */
-
-		// Shon online payment link
-		$useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
-
-		if ($useonlinepayment)
-		{
-			print '<br>';
-
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-			print showOnlinePaymentUrl('membersubscription', $object->ref);
+		// Select mail models is same action as presend
+		if (GETPOST('modelselected')) {
+			$action = 'presend';
 		}
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		if ($action != 'presend')
+		{
+			print '<div class="fichecenter"><div class="fichehalfleft">';
+			print '<a name="builddoc"></a>'; // ancre
 
-		// List of actions on element
-        /* Already in tab Agenda/Events
-        include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, 'member', $socid, 1);
-		*/
-		print '</div></div></div>';
+			// Documents generes
+			$filename = dol_sanitizeFileName($object->ref);
+			//$filename =  'tmp_cards.php';
+			//$filedir = $conf->adherent->dir_output . '/' . get_exdir($object->id, 2, 0, 0, $object, 'member') . dol_sanitizeFileName($object->ref);
+			$filedir = $conf->adherent->dir_output . '/' . get_exdir(0, 0, 0, 0, $object, 'member');
+			$urlsource = $_SERVER['PHP_SELF'] . '?id=' . $object->id;
+			$genallowed = $user->rights->adherent->creer;
+			$delallowed = $user->rights->adherent->supprimer;
 
+			print $formfile->showdocuments('member', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $object->default_lang, '', $object);
+			$somethingshown = $formfile->numoffiles;
+
+			// Show links to link elements
+			//$linktoelem = $form->showLinkToObjectBlock($object, null, array('subscription'));
+			//$somethingshown = $form->showLinkedObjectBlock($object, '');
+
+			// Show links to link elements
+			/*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
+			 if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
+			 */
+
+			// Shon online payment link
+			$useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
+
+			if ($useonlinepayment)
+			{
+				print '<br>';
+
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+				print showOnlinePaymentUrl('membersubscription', $object->ref);
+			}
+
+			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+			// List of actions on element
+	        /* Already in tab Agenda/Events
+	        include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+			$formactions = new FormActions($db);
+			$somethingshown = $formactions->showactions($object, 'member', $socid, 1);
+			*/
+			print '</div></div></div>';
+		}
+
+		// Presend form
+		$modelmail='member';
+		$defaulttopic='SendMemberRef';
+		$diroutput = $conf->adherent->dir_output;
+		$trackid = 'mem'.$object->id;
+
+		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 	}
 }
 
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 85665280275..793f972139b 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1192,7 +1192,7 @@ class Adherent extends CommonObject
                 // Load other properties
                 $result=$this->fetch_subscriptions();
 
-                return $result;
+                return $this->id;
             }
             else
             {
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 356f52061f6..2f440f9f873 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -175,6 +175,7 @@ if ($conf->supplier_proposal->enabled) $elementList['supplier_proposal_send']=$l
 if ($conf->fournisseur->enabled)       $elementList['order_supplier_send']=$langs->trans('MailToSendSupplierOrder');
 if ($conf->fournisseur->enabled)       $elementList['invoice_supplier_send']=$langs->trans('MailToSendSupplierInvoice');
 if ($conf->societe->enabled)           $elementList['thirdparty']=$langs->trans('MailToThirdparty');
+if ($conf->adherent->enabled)          $elementList['member']=$langs->trans('MailToMember');
 if ($conf->contrat->enabled)           $elementList['contract']=$langs->trans('MailToSendContract');
 $elementList['all']=$langs->trans('VisibleEverywhere');
 $elementList['none']=$langs->trans('VisibleNowhere');
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 4c49cef6820..eb510b53333 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1210,11 +1210,6 @@ if (empty($reshook))
 		}
 	}
 
-	// Actions to build doc
-	$upload_dir = $conf->commande->dir_output;
-	$permissioncreate = $user->rights->commande->creer;
-	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-
 	if ($action == 'update_extras')
 	{
 		// Fill array 'array_options' with data from update form
@@ -1254,6 +1249,11 @@ if (empty($reshook))
 	// Actions when printing a doc from card
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
+	// Actions to build doc
+	$upload_dir = $conf->commande->dir_output;
+	$permissioncreate = $user->rights->commande->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
 	// Actions to send emails
 	$trigger_name='ORDER_SENTBYMAIL';
 	$paramname='id';
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index da26f9ed000..6d2181886a0 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -918,51 +918,17 @@ if (empty($reshook))
 	    }
 	}
 
-	// Generation doc (depuis lien ou depuis cartouche doc)
-	else if ($action == 'builddoc' && $user->rights->contrat->creer) {
-		if (GETPOST('model')) {
-			$object->setDocModel($user, GETPOST('model'));
-		}
 
-		// Define output language
-		$outputlangs = $langs;
-		if (! empty($conf->global->MAIN_MULTILANGS)) {
-			$outputlangs = new Translate("", $conf);
-			$newlang = (GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $object->thirdparty->default_lang);
-			$outputlangs->setDefaultLang($newlang);
-		}
-		$ret = $object->fetch($id); // Reload to get new records
-		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-		if ($result <= 0)
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-	        $action='';
-		}
-	}
-
-	// Remove file in doc form
-	else if ($action == 'remove_file' && $user->rights->contrat->creer) {
-		if ($object->id > 0) {
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-
-			$langs->load("other");
-			$upload_dir = $conf->contrat->dir_output;
-			$file = $upload_dir . '/' . GETPOST('file');
-			$ret = dol_delete_file($file, 0, 0, 0, $object);
-			if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
-			else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
-		}
-	}
-
-	/*
-	 * Send mail
-	 */
+	// Actions to build doc
+	$upload_dir = $conf->contrat->dir_output;
+	$permissioncreate = $user->rights->contrat->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	// Actions to send emails
 	$trigger_name='CONTRACT_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromcontract';
-	$trackid='cont'.$object->id;
+	$trackid='con'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
@@ -2164,127 +2130,13 @@ else
     		print '</div></div></div>';
     	}
 
-		/*
-		 * Action presend
-		 */
-		if ($action == 'presend')
-		{
-			$object->fetch_projet();
-
-			$ref = dol_sanitizeFileName($object->ref);
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-			$fileparams = dol_most_recent_file($conf->contrat->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
-
-			// Define output language
-			$outputlangs = $langs;
-			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-				$newlang = $_REQUEST['lang_id'];
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-				$newlang = $object->thirdparty->default_lang;
-
-			if (!empty($newlang))
-			{
-				$outputlangs = new Translate('', $conf);
-				$outputlangs->setDefaultLang($newlang);
-				$outputlangs->load('commercial');
-			}
-
-			// Build document if it not exists
-			if (! $file || ! is_readable($file)) {
-				$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				if ($result <= 0) {
-					dol_print_error($db, $object->error, $object->errors);
-					exit();
-				}
-				$fileparams = dol_most_recent_file($conf->contrat->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-				$file = $fileparams['fullname'];
-			}
-
-			print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-			print '<div class="clearboth"></div>';
-			print '<br>';
-			print load_fiche_titre($langs->trans('SendByMail'));
-
-			dol_fiche_head('');
-
-			// Cree l'objet formulaire mail
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-			$formmail = new FormMail($db);
-			$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-            $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-            if($formmail->fromtype === 'user'){
-                $formmail->fromid = $user->id;
-
-            }
-			$formmail->trackid='cont'.$object->id;
-			if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-			{
-				include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-				$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
-			}
-			$formmail->withfrom = 1;
-			$liste = array();
-			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
-				$liste [$key] = $value;
-			$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
-			$formmail->withtocc = $liste;
-			$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-			if (empty($object->ref_client)) {
-				$formmail->withtopic = $outputlangs->trans('SendContractRef', '__CONTRACTREF__');
-			} else if (! empty($object->ref_client)) {
-				$formmail->withtopic = $outputlangs->trans('SendContractRef', '__CONTRACTREF__ (__REFCLIENT__)');
-			}
-			$formmail->withfile = 2;
-			$formmail->withbody = 1;
-			$formmail->withdeliveryreceipt = 1;
-			$formmail->withcancel = 1;
-			// Array of substitutions
-			$formmail->setSubstitFromObject($object);
-			$formmail->substit['__PERSONALIZED__']='';		// deprecated
-			$formmail->substit['__CONTACTCIVNAME__']='';
-
-			$custcontact = '';
-			$contactarr = array();
-			$contactarr = $object->liste_contact(- 1, 'external');
-
-			if (is_array($contactarr) && count($contactarr) > 0)
-			{
-				foreach ($contactarr as $contact)
-				{
-					if ($contact['libelle'] == $langs->trans('TypeContact_contract_external_CUSTOMER')) {	// TODO Use code and not label
-						$contactstatic = new Contact($db);
-						$contactstatic->fetch($contact['id']);
-						$custcontact = $contactstatic->getFullName($langs, 1);
-					}
-				}
-
-				if (! empty($custcontact)) {
-					$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
-				}
-			}
-
-			// Tableau des parametres complementaires
-			$formmail->param['action'] = 'send';
-			$formmail->param['models'] = 'contract';
-			$formmail->param['models_id']=GETPOST('modelmailselected','int');
-			$formmail->param['contractid'] = $object->id;
-			$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-
-			// Init list of files
-			if (GETPOST("mode") == 'init') {
-				$formmail->clear_attached_files();
-				$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
-			}
-
-			// Show form
-			print $formmail->get_form();
-
-			dol_fiche_end();
-		}
+		// Presend form
+		$modelmail='contract';
+		$defaulttopic='SendContractRef';
+		$diroutput = $conf->contrat->dir_output;
+		$trackid = 'con'.$object->id;
 
+		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
     }
 }
 
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 771c8441bcf..e0bd7081043 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -18,8 +18,8 @@
 
 /**
  *	\file			htdocs/core/actions_sendmails.inc.php
-*  \brief			Code for actions on sending mails from object page
-*/
+ *  \brief			Code for actions on sending mails from object page
+ */
 
 // $mysoc must be defined
 // $id must be defined
@@ -113,13 +113,18 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 		$result=$object->fetch($id);
 
 		$sendtosocid=0;    // Thirdparty on object
-		if (method_exists($object,"fetch_thirdparty") && $object->element != 'societe')
+		if (method_exists($object,"fetch_thirdparty") && ! in_array($object->element, array('societe','member')))
 		{
 			$result=$object->fetch_thirdparty();
 			if ($object->element == 'user' && $result == 0) $result=1;    // Even if not found, we consider ok
 			$thirdparty=$object->thirdparty;
 			$sendtosocid=$thirdparty->id;
 		}
+		else if ($object->element == 'member')
+		{
+			$thirdparty=$object;
+			if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
+		}
 		else if ($object->element == 'societe')
 		{
 			$thirdparty=$object;
@@ -470,7 +475,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 	else
 	{
 		$langs->load("other");
-		setEventMessages($langs->trans('ErrorFailedToReadEntity',$object->element), null, 'errors');
+		setEventMessages($langs->trans('ErrorFailedToReadObject',$object->element), null, 'errors');
 		dol_syslog('Failed to read data of object id='.$object->id.' element='.$object->element);
 		$action = 'presend';
 	}
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 8e61eb46012..ed99002c442 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -465,19 +465,6 @@ class FormMail extends Form
         		}
         	}
 
-        	// withoptiononeemailperrecipient
-        	if (! empty($this->withoptiononeemailperrecipient))
-        	{
-        		$out.= '<tr><td class="fieldrequired" width="180">';
-        		$out.= $langs->trans("GroupEmails");
-        		$out.= '</td><td>';
-        		$out.=' <input type="checkbox" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0?' checked="checked"':'').'> ';
-        		$out.= $langs->trans("OneEmailPerRecipient").' - ';
-        		$out.= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");
-        		$out.= '</td></tr>';
-
-        	}
-
         	// To
         	if (! empty($this->withto) || is_array($this->withto))
         	{
@@ -545,10 +532,22 @@ class FormMail extends Form
         		$out.= "</td></tr>\n";
         	}
 
+        	// withoptiononeemailperrecipient
+        	if (! empty($this->withoptiononeemailperrecipient))
+        	{
+        		$out.= '<tr><td>';
+        		$out.= $langs->trans("GroupEmails");
+        		$out.= '</td><td>';
+        		$out.=' <input type="checkbox" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0?' checked="checked"':'').'> ';
+        		$out.= $langs->trans("OneEmailPerRecipient").' - ';
+        		$out.= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");
+        		$out.= '</td></tr>';
+        	}
+
         	// CC
         	if (! empty($this->withtocc) || is_array($this->withtocc))
         	{
-        		$out.= '<tr><td width="180">';
+        		$out.= '<tr><td>';
         		$out.= $form->textwithpicto($langs->trans("MailCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
         		$out.= '</td><td>';
         		if ($this->withtoccreadonly)
@@ -577,7 +576,7 @@ class FormMail extends Form
         	// CCC
         	if (! empty($this->withtoccc) || is_array($this->withtoccc))
         	{
-        		$out.= '<tr><td width="180">';
+        		$out.= '<tr><td>';
         		$out.= $form->textwithpicto($langs->trans("MailCCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
         		$out.= '</td><td>';
         		if (! empty($this->withtocccreadonly))
@@ -645,7 +644,7 @@ class FormMail extends Form
         	// Ask delivery receipt
         	if (! empty($this->withdeliveryreceipt))
         	{
-        		$out.= '<tr><td width="180">'.$langs->trans("DeliveryReceipt").'</td><td>';
+        		$out.= '<tr><td>'.$langs->trans("DeliveryReceipt").'</td><td>';
 
         		if (! empty($this->withdeliveryreceiptreadonly))
         		{
@@ -677,7 +676,7 @@ class FormMail extends Form
         		$defaulttopic=make_substitutions($defaulttopic,$this->substit);
 
         		$out.= '<tr>';
-        		$out.= '<td class="fieldrequired" width="180">'.$langs->trans("MailTopic").'</td>';
+        		$out.= '<td class="fieldrequired">'.$langs->trans("MailTopic").'</td>';
         		$out.= '<td>';
         		if ($this->withtopicreadonly)
         		{
@@ -695,7 +694,7 @@ class FormMail extends Form
         	if (! empty($this->withfile))
         	{
         		$out.= '<tr>';
-        		$out.= '<td width="180">'.$langs->trans("MailFile").'</td>';
+        		$out.= '<td>'.$langs->trans("MailFile").'</td>';
 
         		$out.= '<td>';
         		if (! empty($this->withmaindocfile))
@@ -785,7 +784,8 @@ class FormMail extends Form
 	        			$typeforonlinepayment='free';
 	        			if ($this->param["models"]=='order_send')   $typeforonlinepayment='order';		// TODO use detection on something else than template
 	        			if ($this->param["models"]=='facture_send') $typeforonlinepayment='invoice';	// TODO use detection on something else than template
-	       				$url=getOnlinePaymentUrl(0, $typeforonlinepayment, $this->substit['__REF__']);
+	        			if ($this->param["models"]=='member_send')  $typeforonlinepayment='member';		// TODO use detection on something else than template
+	        			$url=getOnlinePaymentUrl(0, $typeforonlinepayment, $this->substit['__REF__']);
 	       				//$paymenturl=str_replace('\n',"\n",$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url));
 	       				$paymenturl=$url;
         			}
@@ -825,7 +825,7 @@ class FormMail extends Form
 				}
 
         		$out.= '<tr>';
-        		$out.= '<td width="180" valign="top">'.$langs->trans("MailText").'</td>';
+        		$out.= '<td valign="top">'.$langs->trans("MailText").'</td>';
         		$out.= '<td>';
         		if ($this->withbodyreadonly)
         		{
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 502dfb33df6..9e0d6f09fcf 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -73,13 +73,16 @@ if ($action == 'presend')
 
 	// Build document if it not exists
 	if (! $file || ! is_readable($file)) {
-		$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-		if ($result <= 0) {
-			dol_print_error($db, $object->error, $object->errors);
-			exit();
+		if ($object->element != 'member')
+		{
+			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			if ($result <= 0) {
+				dol_print_error($db, $object->error, $object->errors);
+				exit();
+			}
+			$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+			$file = $fileparams['fullname'];
 		}
-		$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file = $fileparams['fullname'];
 	}
 
 	print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
@@ -120,6 +123,10 @@ if ($action == 'presend')
 			$liste[$key] = $value;
 		}
 	}
+	elseif ($object->element == 'member')
+	{
+		$liste['thirdparty'] = $object->getFullName($langs)." &lt;".$object->email."&gt;";
+	}
 	else
 	{
 		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 51811f25a86..ccc1f9b77bd 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -73,6 +73,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SUBSCRIPTION','Member subscribed','Executed when a member is subscribed','member',24);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',25);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',26);
diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index c3df19fee06..23467355174 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -42,6 +42,8 @@ ALTER TABLE llx_website_page ADD COLUMN fk_user_modif integer;
 -- For 7.0
 
 
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23);
+
 ALTER TABLE llx_ecm_files MODIFY label varchar(128) NOT NULL;
 ALTER TABLE llx_ecm_files ADD COLUMN share varchar(128) NULL after label;
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1e855abc41a..7aefde7340c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1694,6 +1694,7 @@ MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
 MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
+MailToMember=To send email from member page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)

From 63ec14e47ddefcab2d62dbd1d8ff9d263072e7b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 22 Sep 2017 20:18:11 +0200
Subject: [PATCH 28/28] Convert sode to send member info email into new generic
 email template system.

---
 htdocs/adherents/card.php                     | 15 ++---
 htdocs/adherents/class/adherent.class.php     | 62 +++++--------------
 htdocs/core/actions_sendmails.inc.php         |  6 ++
 htdocs/core/class/html.formactions.class.php  | 33 +++++-----
 htdocs/core/class/html.formmail.class.php     | 16 ++++-
 htdocs/core/lib/functions.lib.php             | 27 +++++++-
 htdocs/core/tpl/card_presend.tpl.php          | 21 -------
 .../mysql/data/llx_c_email_templates.sql      | 23 +++++++
 .../install/mysql/migration/6.0.0-7.0.0.sql   |  2 +
 9 files changed, 112 insertions(+), 93 deletions(-)
 create mode 100644 htdocs/install/mysql/data/llx_c_email_templates.sql

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 758fad1e015..b2bb56b14b5 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -238,6 +238,7 @@ if (empty($reshook))
 		}
 	}
 
+	/*
 	if ($action == 'confirm_sendinfo' && $confirm == 'yes')
 	{
 		if ($object->email)
@@ -250,7 +251,7 @@ if (empty($reshook))
 			$langs->load("mails");
 			setEventMessages($langs->trans("MailSuccessfulySent", $from, $object->email), null, 'mesgs');
 		}
-	}
+	}*/
 
 	if ($action == 'update' && ! $cancel && $user->rights->adherent->creer)
 	{
@@ -1363,10 +1364,10 @@ else
 		}
 
 		// Confirm send card by mail
-		if ($action == 'sendinfo')
+		/*if ($action == 'sendinfo')
 		{
 			print $form->formconfirm("card.php?rowid=".$id,$langs->trans("SendCardByMail"),$langs->trans("ConfirmSendCardByMail",$object->email),"confirm_sendinfo",'',0,1);
-		}
+		}*/
 
 		// Confirm terminate
 		if ($action == 'resign')
@@ -1616,6 +1617,7 @@ else
 
 				// Send card by email
 				// TODO Remove this to replace with a template
+				/*
 				if ($user->rights->adherent->creer)
 				{
 					if ($object->statut >= 1)
@@ -1631,7 +1633,7 @@ else
 				else
 				{
 					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("SendCardByMail")."</font></div>";
-				}
+				}*/
 
 				// Modify
 				if ($user->rights->adherent->creer)
@@ -1790,11 +1792,10 @@ else
 			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 			// List of actions on element
-	        /* Already in tab Agenda/Events
 	        include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
-			$somethingshown = $formactions->showactions($object, 'member', $socid, 1);
-			*/
+			$somethingshown = $formactions->showactions($object, 'member', $socid, 1, 'listactions', 10);
+
 			print '</div></div></div>';
 		}
 
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 793f972139b..81fc6ea5909 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -213,51 +213,23 @@ class Adherent extends CommonObject
 
 		// Substitutions
 		$substitutionarray=array(
-				'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
-				'__ID__'=>$msgishtml?dol_htmlentitiesbr($this->id):$this->id,
-				'__CIVILITY__'=>$this->getCivilityLabel(),
-				'__FIRSTNAME__'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname,
-				'__LASTNAME__'=>$msgishtml?dol_htmlentitiesbr($this->lastname):$this->lastname,
-				'__FULLNAME__'=>$msgishtml?dol_htmlentitiesbr($this->getFullName($langs)):$this->getFullName($langs),
-				'__COMPANY__'=>$msgishtml?dol_htmlentitiesbr($this->societe):$this->societe,
-				'__ADDRESS__'=>$msgishtml?dol_htmlentitiesbr($this->address):$this->address,
-				'__ZIP__'=>$msgishtml?dol_htmlentitiesbr($this->zip):$this->zip,
-				'__TOWN_'=>$msgishtml?dol_htmlentitiesbr($this->town):$this->town,
-				'__COUNTRY__'=>$msgishtml?dol_htmlentitiesbr($this->country):$this->country,
-				'__EMAIL__'=>$msgishtml?dol_htmlentitiesbr($this->email):$this->email,
-				'__BIRTH__'=>$msgishtml?dol_htmlentitiesbr($birthday):$birthday,
-				'__PHOTO__'=>$msgishtml?dol_htmlentitiesbr($this->photo):$this->photo,
-				'__LOGIN__'=>$msgishtml?dol_htmlentitiesbr($this->login):$this->login,
-				'__PASSWORD__'=>$msgishtml?dol_htmlentitiesbr($this->pass):$this->pass,
-				// For backward compatibility
-				'%DOL_MAIN_URL_ROOT%'=>DOL_MAIN_URL_ROOT,
-				'%ID%'=>$msgishtml?dol_htmlentitiesbr($this->id):$this->id,
-				'%CIVILITY%'=>$this->getCivilityLabel(),
-				'%FIRSTNAME%'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname,
-				'%LASTNAME%'=>$msgishtml?dol_htmlentitiesbr($this->lastname):$this->lastname,
-				'%FULLNAME%'=>$msgishtml?dol_htmlentitiesbr($this->getFullName($langs)):$this->getFullName($langs),
-				'%COMPANY%'=>$msgishtml?dol_htmlentitiesbr($this->societe):$this->societe,
-				'%ADDRESS%'=>$msgishtml?dol_htmlentitiesbr($this->address):$this->address,
-				'%ZIP%'=>$msgishtml?dol_htmlentitiesbr($this->zip):$this->zip,
-				'%TOWN%'=>$msgishtml?dol_htmlentitiesbr($this->town):$this->town,
-				'%COUNTRY%'=>$msgishtml?dol_htmlentitiesbr($this->country):$this->country,
-				'%EMAIL%'=>$msgishtml?dol_htmlentitiesbr($this->email):$this->email,
-				'%BIRTH%'=>$msgishtml?dol_htmlentitiesbr($birthday):$birthday,
-				'%PHOTO%'=>$msgishtml?dol_htmlentitiesbr($this->photo):$this->photo,
-				'%LOGIN%'=>$msgishtml?dol_htmlentitiesbr($this->login):$this->login,
-				'%PASSWORD%'=>$msgishtml?dol_htmlentitiesbr($this->pass):$this->pass,
-                '%TYPE%'=>$msgishtml?dol_htmlentitiesbr($this->type):$this->type,
-                '%PHONE_PRO%'=>$msgishtml?dol_htmlentitiesbr($this->phone):$this->phone,
-                '%PHONE_PERSO%'=>$msgishtml?dol_htmlentitiesbr($this->phone_perso):$this->phone_perso,
-                '%PHONE_MOBILE%'=>$msgishtml?dol_htmlentitiesbr($this->phone_mobile):$this->phone_mobile,
-				// For backward compatibility
-				'%INFOS%'=>$msgishtml?dol_htmlentitiesbr($infos):$infos,
-				'%SOCIETE%'=>$msgishtml?dol_htmlentitiesbr($this->societe):$this->societe,
-				'%PRENOM%'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname,
-				'%NOM%'=>$msgishtml?dol_htmlentitiesbr($this->lastname):$this->lastname,
-				'%CP%'=>$msgishtml?dol_htmlentitiesbr($this->zip):$this->zip,
-				'%VILLE%'=>$msgishtml?dol_htmlentitiesbr($this->town):$this->town,
-				'%PAYS%'=>$msgishtml?dol_htmlentitiesbr($this->country):$this->country,
+			'__CIVILITY__'=>$this->getCivilityLabel(),
+			'__FIRSTNAME__'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname,
+			'__LASTNAME__'=>$msgishtml?dol_htmlentitiesbr($this->lastname):$this->lastname,
+			'__FULLNAME__'=>$msgishtml?dol_htmlentitiesbr($this->getFullName($langs)):$this->getFullName($langs),
+			'__COMPANY__'=>$msgishtml?dol_htmlentitiesbr($this->societe):$this->societe,
+			'__ADDRESS__'=>$msgishtml?dol_htmlentitiesbr($this->address):$this->address,
+			'__ZIP__'=>$msgishtml?dol_htmlentitiesbr($this->zip):$this->zip,
+			'__TOWN__'=>$msgishtml?dol_htmlentitiesbr($this->town):$this->town,
+			'__COUNTRY__'=>$msgishtml?dol_htmlentitiesbr($this->country):$this->country,
+			'__EMAIL__'=>$msgishtml?dol_htmlentitiesbr($this->email):$this->email,
+			'__BIRTH__'=>$msgishtml?dol_htmlentitiesbr($birthday):$birthday,
+			'__PHOTO__'=>$msgishtml?dol_htmlentitiesbr($this->photo):$this->photo,
+			'__LOGIN__'=>$msgishtml?dol_htmlentitiesbr($this->login):$this->login,
+			'__PASSWORD__'=>$msgishtml?dol_htmlentitiesbr($this->pass):$this->pass,
+			'__PHONE__'=>$msgishtml?dol_htmlentitiesbr($this->phone):$this->phone,
+			'__PHONEPRO__'=>$msgishtml?dol_htmlentitiesbr($this->phone_perso):$this->phone_perso,
+			'__PHONEMOBILE__'=>$msgishtml?dol_htmlentitiesbr($this->phone_mobile):$this->phone_mobile,
 		);
 
 		complete_substitutions_array($substitutionarray, $langs, $this);
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index e0bd7081043..4439f0034ce 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -360,6 +360,12 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			$subject=make_substitutions($subject, $substitutionarray);
 			$message=make_substitutions($message, $substitutionarray);
 
+			if (method_exists($object, 'makeSubstitution'))
+			{
+				$subject = $object->makeSubstitution($subject);
+				$message = $object->makeSubstitution($message);
+			}
+
 			// Send mail (substitutionarray must be done just before this)
 			if (empty($sendcontext)) $sendcontext = 'standard';
 			$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1,'','',$trackid,'', $sendcontext);
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index f09dab9be38..b93083d9a9f 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -150,14 +150,14 @@ class FormActions
     /**
      *  Show list of actions for element
      *
-     *  @param	Object	$object			Object
-     *  @param  string	$typeelement	'invoice','propal','order','invoice_supplier','order_supplier','fichinter'
-     *	@param	int		$socid			socid of user
-     *  @param	int		$forceshowtitle	Show title even if there is no actions to show
-     *  @param  string  $morecss        More css on table
-     *  @param	int		$max			Max number of record
+     *  @param	Object	$object					Object
+     *  @param  string	$typeelement			'invoice','propal','order','invoice_supplier','order_supplier','fichinter'
+     *	@param	int		$socid					Socid of user
+     *  @param	int		$forceshowtitle			Show title even if there is no actions to show
+     *  @param  string  $morecss        		More css on table
+     *  @param	int		$max					Max number of record
      *  @param	string	$moreparambacktopage	More param for the backtopage
-     *	@return	int						<0 if KO, >=0 if OK
+     *	@return	int								<0 if KO, >=0 if OK
      */
     function showactions($object, $typeelement, $socid=0, $forceshowtitle=0, $morecss='listactions', $max=0, $moreparambacktopage='')
     {
@@ -175,17 +175,18 @@ class FormActions
         $num = count($listofactions);
         if ($num || $forceshowtitle)
         {
-        	if ($typeelement == 'invoice')   $title=$langs->trans('ActionsOnBill');
+        	if ($typeelement == 'invoice')               $title=$langs->trans('ActionsOnBill');
         	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'propal')    $title=$langs->trans('ActionsOnPropal');
-        	elseif ($typeelement == 'supplier_payment')    $title=$langs->trans('ActionsOnSupplierPayment');
-        	elseif ($typeelement == 'supplier_proposal')    $title=$langs->trans('ActionsOnSupplierProposal');
-        	elseif ($typeelement == 'order')     $title=$langs->trans('ActionsOnOrder');
+        	elseif ($typeelement == 'propal')            $title=$langs->trans('ActionsOnPropal');
+        	elseif ($typeelement == 'supplier_payment')  $title=$langs->trans('ActionsOnSupplierPayment');
+        	elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
+        	elseif ($typeelement == 'order')             $title=$langs->trans('ActionsOnOrder');
         	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'shipping')  $title=$langs->trans('ActionsOnShipping');
-            elseif ($typeelement == 'fichinter') $title=$langs->trans('ActionsOnFicheInter');
-            elseif ($typeelement == 'project') $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'task') $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+        	elseif ($typeelement == 'shipping')          $title=$langs->trans('ActionsOnShipping');
+            elseif ($typeelement == 'fichinter')         $title=$langs->trans('ActionsOnFicheInter');
+            elseif ($typeelement == 'project')           $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+            elseif ($typeelement == 'task')              $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+            elseif ($typeelement == 'member')            $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
             else $title=$langs->trans("Actions");
 
             $urlbacktopage=$_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage?'&'.$moreparambacktopage:'');
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index ed99002c442..3e09c1a83e8 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -339,16 +339,25 @@ class FormMail extends Form
 	        	$modelmail_array=array();
 	        	foreach($this->lines_model as $line)
 	        	{
-	        		$modelmail_array[$line->id]=$line->label;
+	        		$langs->trans("members");
+	        		if (preg_match('/\((.*)\)/', $line->label, $reg))
+	        		{
+	        			$modelmail_array[$line->id]=$langs->trans($reg[1]);		// langs->trans when label is __(xxx)__
+	        		}
+	        		else
+	        		{
+	        			$modelmail_array[$line->id]=$line->label;
+	        		}
 	        		if ($line->lang) $modelmail_array[$line->id].=' ('.$line->lang.')';
 	        		if ($line->private) $modelmail_array[$line->id].=' - '.$langs->trans("Private");
 	        		//if ($line->fk_user != $user->id) $modelmail_array[$line->id].=' - '.$langs->trans("By").' ';
 	        	}
         	}
 
-        	// Zone to select its email template
+        	// Zone to select email template
         	if (count($modelmail_array)>0)
         	{
+        		// If list of template is filled
 	        	$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
         	    $out.= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100');
 	        	if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
@@ -363,6 +372,7 @@ class FormMail extends Form
         	        'invoice_supplier_send','thirdparty','contract','all'
            	    )))
         	{
+        		// If list of template is empty
 	        	$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
         	    $out.= $langs->trans('SelectMailModel').': <select name="modelmailselected" disabled="disabled"><option value="none">'.$langs->trans("NoTemplateDefined").'</option></select>';    // Do not put 'disabled' on 'option' tag, it is already on 'select' and it makes chrome crazy.
         	    if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
@@ -1020,7 +1030,7 @@ class FormMail extends Form
 		$sql = "SELECT rowid, label, topic, content, content_lines, lang, fk_user, private, position";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template IN ('".$this->db->escape($type_template)."', 'all')";
-		$sql.= " AND entity IN (".getEntity('c_email_templates', 0).")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', 1).")";
 		$sql.= " AND (private = 0 OR fk_user = ".$user->id.")";		// See all public templates or templates I own.
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		//if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";	// Return all languages
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 706e2a11a1b..704653ade84 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -129,7 +129,7 @@ function getEntity($element, $shared=1)
 	else
 	{
 		$out='';
-		$addzero = array('user', 'usergroup', 'email_template', 'default_values');
+		$addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');
 		if (in_array($element, $addzero)) $out.= '0,';
 		$out.= $conf->entity;
 		return $out;
@@ -5240,6 +5240,10 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
     		$substitutionarray['__THIRDPARTY_ID__'] = '__THIRDPARTY_ID__';
     		$substitutionarray['__THIRDPARTY_NAME__'] = '__THIRDPARTY_NAME__';
 
+    		$substitutionarray['__MEMBER_CIVILITY__'] = '__MEMBER_CIVILITY__';
+    		$substitutionarray['__MEMBER_FIRSTNAME__'] = '__MEMBER_FIRSTNAME__';
+    		$substitutionarray['__MEMBER_LASTNAME__'] = '__MEMBER_LASTNAME__';
+
     		$substitutionarray['__PROJECT_ID__'] = '__PROJECT_ID__';
     		$substitutionarray['__PROJECT_REF__'] = '__PROJECT_REF__';
     		$substitutionarray['__PROJECT_NAME__'] = '__PROJECT_REF__';
@@ -5263,6 +5267,27 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
 	    	$substitutionarray['__REFCLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : ''));
 	    	$substitutionarray['__REFSUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : '');
 
+	    	// TODO USe this ?
+	    	$msgishtml = 0;
+
+	    	if (method_exists($object, 'getCivilityLabel')) $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+	    	$substitutionarray['__MEMBER_FIRSTNAME__']=$msgishtml?dol_htmlentitiesbr($object->firstname):$object->firstname;
+	    	$substitutionarray['__MEMBER_LASTNAME__']=$msgishtml?dol_htmlentitiesbr($object->lastname):$object->lastname;
+	    	if (method_exists($object, 'getFullName')) $substitutionarray['__MEMBER_FULLNAME__']=$msgishtml?dol_htmlentitiesbr($object->getFullName($langs)):$object->getFullName($langs);
+	    	$substitutionarray['__MEMBER_COMPANY__']=$msgishtml?dol_htmlentitiesbr($object->societe):$object->societe;
+	    	$substitutionarray['__MEMBER_ADDRESS__']=$msgishtml?dol_htmlentitiesbr($object->address):$object->address;
+	    	$substitutionarray['__MEMBER_ZIP__']=$msgishtml?dol_htmlentitiesbr($object->zip):$object->zip;
+	    	$substitutionarray['__MEMBER_TOWN__']=$msgishtml?dol_htmlentitiesbr($object->town):$object->town;
+	    	$substitutionarray['__MEMBER_COUNTRY__']=$msgishtml?dol_htmlentitiesbr($object->country):$object->country;
+	    	$substitutionarray['__MEMBER_EMAIL__']=$msgishtml?dol_htmlentitiesbr($object->email):$object->email;
+	    	$substitutionarray['__MEMBER_BIRTH__']=$msgishtml?dol_htmlentitiesbr($birthday):$birthday;
+	    	$substitutionarray['__MEMBER_PHOTO__']=$msgishtml?dol_htmlentitiesbr($object->photo):$object->photo;
+	    	$substitutionarray['__MEMBER_LOGIN__']=$msgishtml?dol_htmlentitiesbr($object->login):$object->login;
+	    	$substitutionarray['__MEMBER_PASSWORD__']=$msgishtml?dol_htmlentitiesbr($object->pass):$object->pass;
+	    	$substitutionarray['__MEMBER_PHONE__']=$msgishtml?dol_htmlentitiesbr($object->phone):$object->phone;
+	    	$substitutionarray['__MEMBER_PHONEPRO__']=$msgishtml?dol_htmlentitiesbr($object->phone_perso):$object->phone_perso;
+	    	$substitutionarray['__MEMBER_PHONEMOBILE__']=$msgishtml?dol_htmlentitiesbr($object->phone_mobile):$object->phone_mobile;
+
 	    	if (is_object($object->thirdparty) && $object->thirdparty->id > 0)
 	    	{
 	    		$substitutionarray['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:'');
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 9e0d6f09fcf..e24fbb44f7a 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -149,27 +149,6 @@ if ($action == 'presend')
 	$substitutionarray['__PERSONALIZED__'] = '';	// deprecated
 	$substitutionarray['__CONTACTCIVNAME__'] = '';
 
-	// Choose one contact for the __CONTACTCIVNAME__ TODO Really not reliable.
-	/*
-	$custcontact = '';
-	$contactarr = array();
-	$contactarr = $object->liste_contact(-1, 'external');
-	if (is_array($contactarr) && count($contactarr) > 0)
-	{
-	foreach ($contactarr as $contact)
-	{
-	if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
-	$contactstatic = new Contact($db);
-	$contactstatic->fetch($contact ['id']);
-	$custcontact = $contactstatic->getFullName($langs, 1);
-	}
-	}
-
-	if (! empty($custcontact)) {
-	$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
-	}
-	}*/
-
 	$parameters = array(
 		'mode' => 'formemail'
 	);
diff --git a/htdocs/install/mysql/data/llx_c_email_templates.sql b/htdocs/install/mysql/data/llx_c_email_templates.sql
new file mode 100644
index 00000000000..b3bb3292ba6
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_email_templates.sql
@@ -0,0 +1,23 @@
+-- Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+--
+
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,active,topic,content,content_lines) VALUES (0,null,'member',null,0,null,null,'(SendAnEMailToMember)',1,1,'__(CardContent)__','__(ThisIsContentOfYourCard)__<br />\n__(ID)__ : __ID__<br />\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br />\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br />\n__(Lastname)__ : __MEMBER_LASTNAME__<br />\n__(Fullname)__ : __MEMBER_FULLNAME__<br />\n__(Company)__ : __MEMBER_COMPANY__<br />\n__(Address)__ : __MEMBER_ADDRESS__<br />\n__(Zip)__ : __MEMBER_ZIP__<br />\n__(Town)__ : __MEMBER_TOWN__<br />\n__(Country)__ : __MEMBER_COUNTRY__<br />\n__(Email)__ : __MEMBER_EMAIL__<br />\n__(Birthday)__ : __MEMBER_BIRTH__<br />\n__(Photo)__ : __MEMBER_PHOTO__<br />\n__(Login)__ : __MEMBER_LOGIN__<br />\n__(Password)__ : __MEMBER_PASSWORD__<br />\n__(Phone)__ : __MEMBER_PHONE__<br />\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br />\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__',null);
diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index 23467355174..c8f2142684c 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -66,6 +66,8 @@ ALTER TABLE llx_contrat MODIFY COLUMN ref_ext varchar(50);
 
 UPDATE llx_c_email_templates SET position = 0 WHERE position IS NULL;
 
+INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,active,topic,content,content_lines) VALUES (0,null,'member',null,0,null,null,'(SendAnEMailToMember)',1,1,'__(CardContent)__','__(ThisIsContentOfYourCard)__<br />\n__(ID)__ : __ID__<br />\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br />\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br />\n__(Lastname)__ : __MEMBER_LASTNAME__<br />\n__(Fullname)__ : __MEMBER_FULLNAME__<br />\n__(Company)__ : __MEMBER_COMPANY__<br />\n__(Address)__ : __MEMBER_ADDRESS__<br />\n__(Zip)__ : __MEMBER_ZIP__<br />\n__(Town)__ : __MEMBER_TOWN__<br />\n__(Country)__ : __MEMBER_COUNTRY__<br />\n__(Email)__ : __MEMBER_EMAIL__<br />\n__(Birthday)__ : __MEMBER_BIRTH__<br />\n__(Photo)__ : __MEMBER_PHOTO__<br />\n__(Login)__ : __MEMBER_LOGIN__<br />\n__(Password)__ : __MEMBER_PASSWORD__<br />\n__(Phone)__ : __MEMBER_PHONE__<br />\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br />\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__',null);
+
 INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  1, 'VENTES',    'Income of products/services',               'Exemple: 7xxxxx', 0, 0, '',                '10', 1, 1);
 INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  2, 'DEPENSES',  'Expenses of products/services',             'Exemple: 6xxxxx', 0, 0, '',                '20', 1, 1);
 INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  3, 'PROFIT',    'Balance',                                   '',                0, 1, 'VENTES+DEPENSES', '30', 1, 1);