Browse Source

Move edition of emails templates out of dictionaries so we would be able
to have templates per user (not reserved to admin).

Laurent Destailleur 8 years ago
parent
commit
05c9f57fd4

+ 14 - 107
htdocs/admin/dict.php

@@ -86,7 +86,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,33,34,0,6,0,29,0,7,17,24,28,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,25,0,26,0,32,0);
+$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,33,34,0,6,0,29,0,7,17,24,28,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,26,0,32,0);
 
 // Name of SQL tables of dictionaries
 $tabname=array();
@@ -114,7 +114,7 @@ $tabname[21]= MAIN_DB_PREFIX."c_availability";
 $tabname[22]= MAIN_DB_PREFIX."c_input_reason";
 $tabname[23]= MAIN_DB_PREFIX."c_revenuestamp";
 $tabname[24]= MAIN_DB_PREFIX."c_type_resource";
-$tabname[25]= MAIN_DB_PREFIX."c_email_templates";
+//$tabname[25]= MAIN_DB_PREFIX."c_email_templates";
 $tabname[26]= MAIN_DB_PREFIX."c_units";
 $tabname[27]= MAIN_DB_PREFIX."c_stcomm";
 $tabname[28]= MAIN_DB_PREFIX."c_holiday_types";
@@ -151,7 +151,7 @@ $tablib[21]= "DictionaryAvailability";
 $tablib[22]= "DictionarySource";
 $tablib[23]= "DictionaryRevenueStamp";
 $tablib[24]= "DictionaryResourceType";
-$tablib[25]= "DictionaryEMailTemplates";
+//$tablib[25]= "DictionaryEMailTemplates";
 $tablib[26]= "DictionaryUnits";
 $tablib[27]= "DictionaryProspectStatus";
 $tablib[28]= "DictionaryHolidayTypes";
@@ -188,7 +188,7 @@ $tabsql[21]= "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX
 $tabsql[22]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason";
 $tabsql[23]= "SELECT t.rowid as rowid, t.taux, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
 $tabsql[24]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource";
-$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template',1).")";
+//$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template',1).")";
 $tabsql[26]= "SELECT rowid   as rowid, code, label, short_label, active FROM ".MAIN_DB_PREFIX."c_units";
 $tabsql[27]= "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_stcomm";
 $tabsql[28]= "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newbymonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM ".MAIN_DB_PREFIX."c_holiday_types as h LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON h.fk_country=c.rowid";
@@ -225,7 +225,7 @@ $tabsqlsort[21]="code ASC, label ASC";
 $tabsqlsort[22]="code ASC, label ASC";
 $tabsqlsort[23]="country ASC, taux ASC";
 $tabsqlsort[24]="code ASC,label ASC";
-$tabsqlsort[25]="label ASC";
+//$tabsqlsort[25]="label ASC";
 $tabsqlsort[26]="code ASC";
 $tabsqlsort[27]="code ASC";
 $tabsqlsort[28]="country ASC, code ASC";
@@ -262,7 +262,7 @@ $tabfield[21]= "code,label";
 $tabfield[22]= "code,label";
 $tabfield[23]= "country_id,country,taux,accountancy_code_sell,accountancy_code_buy,note";
 $tabfield[24]= "code,label";
-$tabfield[25]= "label,type_template,private,position,topic,content_lines,content";
+//$tabfield[25]= "label,type_template,private,position,topic,content_lines,content";
 $tabfield[26]= "code,label,short_label";
 $tabfield[27]= "code,libelle";
 $tabfield[28]= "code,label,affect,delay,newbymonth,country_id,country";
@@ -299,7 +299,7 @@ $tabfieldvalue[21]= "code,label";
 $tabfieldvalue[22]= "code,label";
 $tabfieldvalue[23]= "country,taux,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldvalue[24]= "code,label";
-$tabfieldvalue[25]= "label,type_template,private,position,topic,content_lines,content";
+//$tabfieldvalue[25]= "label,type_template,private,position,topic,content_lines,content";
 $tabfieldvalue[26]= "code,label,short_label";
 $tabfieldvalue[27]= "code,libelle";
 $tabfieldvalue[28]= "code,label,affect,delay,newbymonth,country";
@@ -336,7 +336,7 @@ $tabfieldinsert[21]= "code,label";
 $tabfieldinsert[22]= "code,label";
 $tabfieldinsert[23]= "fk_pays,taux,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[24]= "code,label";
-$tabfieldinsert[25]= "label,type_template,private,position,topic,content_lines,content,entity";
+//$tabfieldinsert[25]= "label,type_template,private,position,topic,content_lines,content,entity";
 $tabfieldinsert[26]= "code,label,short_label";
 $tabfieldinsert[27]= "code,libelle";
 $tabfieldinsert[28]= "code,label,affect,delay,newbymonth,fk_country";
@@ -375,7 +375,7 @@ $tabrowid[21]= "rowid";
 $tabrowid[22]= "rowid";
 $tabrowid[23]= "";
 $tabrowid[24]= "";
-$tabrowid[25]= "";
+//$tabrowid[25]= "";
 $tabrowid[26]= "";
 $tabrowid[27]= "id";
 $tabrowid[28]= "";
@@ -412,7 +412,7 @@ $tabcond[21]= ! empty($conf->propal->enabled);
 $tabcond[22]= (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled));
 $tabcond[23]= true;
 $tabcond[24]= ! empty($conf->resource->enabled);
-$tabcond[25]= true; // && ! empty($conf->global->MAIN_EMAIL_EDIT_TEMPLATE_FROM_DIC);
+//$tabcond[25]= true; // && ! empty($conf->global->MAIN_EMAIL_EDIT_TEMPLATE_FROM_DIC);
 $tabcond[26]= ! empty($conf->product->enabled);
 $tabcond[27]= ! empty($conf->societe->enabled);
 $tabcond[28]= ! empty($conf->holiday->enabled);
@@ -449,7 +449,7 @@ $tabhelp[21] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[22] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[23] = array();
 $tabhelp[24] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[25] = array('topic'=>$langs->trans('SeeSubstitutionVars'),'content'=>$langs->trans('SeeSubstitutionVars'),'content_lines'=>$langs->trans('SeeSubstitutionVars'),'type_template'=>$langs->trans("TemplateForElement"),'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), 'position'=>$langs->trans("PositionIntoComboList"));
+//$tabhelp[25] = array('topic'=>$langs->trans('SeeSubstitutionVars'),'content'=>$langs->trans('SeeSubstitutionVars'),'content_lines'=>$langs->trans('SeeSubstitutionVars'),'type_template'=>$langs->trans("TemplateForElement"),'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[26] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[27] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[28] = array('affect'=>$langs->trans("FollowedByACounter"),'delay'=>$langs->trans("MinimumNoticePeriod"), 'newbymonth'=>$langs->trans("NbAddedAutomatically"));
@@ -486,7 +486,7 @@ $tabfieldcheck[21] = array();
 $tabfieldcheck[22] = array();
 $tabfieldcheck[23] = array();
 $tabfieldcheck[24] = array();
-$tabfieldcheck[25] = array();
+//$tabfieldcheck[25] = array();
 $tabfieldcheck[26] = array();
 $tabfieldcheck[27] = array();
 $tabfieldcheck[28] = array();
@@ -544,29 +544,6 @@ if ($id == 11)
 			'external' => $langs->trans('External')
 	);
 }
-if ($id == 25)
-{
-	// We save list of template email Dolibarr can manage. This list can found by a grep into code on "->param['models']"
-	$elementList = array();
-	if ($conf->propal->enabled) $elementList['propal_send']=$langs->trans('MailToSendProposal');
-	if ($conf->commande->enabled) $elementList['order_send']=$langs->trans('MailToSendOrder');
-	if ($conf->facture->enabled) $elementList['facture_send']=$langs->trans('MailToSendInvoice');
-	if ($conf->expedition->enabled) $elementList['shipping_send']=$langs->trans('MailToSendShipment');
-	if ($conf->ficheinter->enabled) $elementList['fichinter_send']=$langs->trans('MailToSendIntervention');
-	if ($conf->supplier_proposal->enabled) $elementList['supplier_proposal_send']=$langs->trans('MailToSendSupplierRequestForQuotation');
-	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->contrat->enabled) $elementList['contract']=$langs->trans('MailToSendContract');
-
-	$parameters=array('elementList'=>$elementList);
-	$reshook=$hookmanager->executeHooks('emailElementlist',$parameters);    // Note that $action and $object may have been modified by some hooks
-	if ($reshook == 0) {
-		foreach ($hookmanager->resArray as $item => $value) {
-			$elementList[$item] = $value;
-		}
-	}
-}
 
 // Define localtax_typeList (used for dictionary "llx_c_tva")
 $localtax_typeList = array();
@@ -1048,7 +1025,6 @@ if ($id)
             if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
             if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
 	        if ($fieldlist[$field]=='short_label')     { $valuetoshow=$langs->trans("ShortLabel"); }
-            if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
 			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
 			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
 			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
@@ -1062,8 +1038,6 @@ if ($id)
 			if ($fieldlist[$field]=='font_size')       { $valuetoshow=$langs->trans("FontSize"); }
 			if ($fieldlist[$field]=='custom_x')        { $valuetoshow=$langs->trans("CustomX"); }
 			if ($fieldlist[$field]=='custom_y')        { $valuetoshow=$langs->trans("CustomY"); }
-			if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); }
-			if ($fieldlist[$field]=='content_lines')   { $valuetoshow=$langs->trans("ContentLines"); }
 			if ($fieldlist[$field]=='percent')         { $valuetoshow=$langs->trans("Percentage"); }
 			if ($fieldlist[$field]=='affect')          { $valuetoshow=$langs->trans("Info"); }
 			if ($fieldlist[$field]=='delay')           { $valuetoshow=$langs->trans("NoticePeriod"); }
@@ -1117,35 +1091,18 @@ if ($id)
 
         if (empty($reshook))
         {
-        	if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates' && $action == 'edit')
-        	{
-				fieldList($fieldlist,$obj,$tabname[$id],'hide');
-        	}
-        	else
-        	{
-        		fieldList($fieldlist,$obj,$tabname[$id],'add');
-        	}
+       		fieldList($fieldlist,$obj,$tabname[$id],'add');
         }
 
         if ($id == 4) print '<td></td>';
         print '<td colspan="3" align="right">';
-        if ($tabname[$id] != MAIN_DB_PREFIX.'c_email_templates' || $action != 'edit')
+        if ($action != 'edit')
         {
         	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
         }
         print '</td>';
         print "</tr>";
 
-        if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates')
-        {
-        	print '<tr><td colspan="8">* '.$langs->trans("AvailableVariables").": ";
-        	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-        	$formmail=new FormMail($db);
-        	$tmp=$formmail->getAvailableSubstitKey('form');
-        	print implode(', ', $tmp);
-        	print '</td></tr>';
-        }
-
         $colspan=count($fieldlist)+3;
         if ($id == 4) $colspan++;
 
@@ -1240,7 +1197,6 @@ if ($id)
             if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
             if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
             if ($fieldlist[$field]=='short_label')     { $valuetoshow=$langs->trans("ShortLabel"); }
-        	if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
 			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
 			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
 			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
@@ -1254,8 +1210,6 @@ if ($id)
 			if ($fieldlist[$field]=='font_size')       { $valuetoshow=$langs->trans("FontSize"); }
 			if ($fieldlist[$field]=='custom_x')        { $valuetoshow=$langs->trans("CustomX"); }
 			if ($fieldlist[$field]=='custom_y')        { $valuetoshow=$langs->trans("CustomY"); }
-			if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); }
-			if ($fieldlist[$field]=='content_lines')   { $valuetoshow=$langs->trans("ContentLines"); }
 			if ($fieldlist[$field]=='percent')         { $valuetoshow=$langs->trans("Percentage"); }
 			if ($fieldlist[$field]=='affect')          { $valuetoshow=$langs->trans("Info"); }
 			if ($fieldlist[$field]=='delay')           { $valuetoshow=$langs->trans("NoticePeriod"); }
@@ -1354,10 +1308,6 @@ if ($id)
                             $showfield=1;
                         	$align="left";
                             $valuetoshow=$obj->{$fieldlist[$field]};
-                            if ($value == 'type_template')
-                            {
-                                $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
-                            }
                             if ($value == 'element')
                             {
                                 $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
@@ -1726,13 +1676,6 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT,'lang');
 			print '</td>';
 		}
-		// Le type de template
-		elseif ($fieldlist[$field] == 'type_template')
-		{
-			print '<td>';
-			print $form->selectarray('type_template', $elementList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
-			print '</td>';
-		}
 		// Le type de l'element (pour les type de contact)
 		elseif ($fieldlist[$field] == 'element')
 		{
@@ -1773,42 +1716,6 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 		elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
 			print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea></td>';
 		}
-		elseif (in_array($fieldlist[$field], array('content_lines')))
-		{
-			if ($tabname == MAIN_DB_PREFIX.'c_email_templates')
-			{
-				print '<td colspan="4"></td></tr><tr class="pair nohover"><td colspan="5">';		// To create an artificial CR for the current tr we are on
-			}
-			else print '<td>';
-			if ($context != 'hide')
-			{
-				//print '<input type="text" size="100" class="flat" value="'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
-				$okforextended=true;
-				if ($tabname == MAIN_DB_PREFIX.'c_email_templates' && empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended=false;
-				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 100, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_1, '90%');
-				print $doleditor->Create(1);
-			}
-			else print '&nbsp;';
-			print '</td>';
-		}
-		elseif (in_array($fieldlist[$field], array('content')))
-		{
-			if ($tabname == MAIN_DB_PREFIX.'c_email_templates')
-			{
-				print '<td colspan="4"></td></tr><tr class="pair nohover"><td colspan="5">';		// To create an artificial CR for the current tr we are on
-			}
-			else print '<td>';
-			if ($context != 'hide')
-			{
-				//print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
-				$okforextended=true;
-				if ($tabname == MAIN_DB_PREFIX.'c_email_templates' && empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended=false;
-				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_8, '90%');
-				print $doleditor->Create(1);
-			}
-			else print '&nbsp;';
-			print '</td>';
-		}
 		elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i',$fieldlist[$field])) {
 			print '<td><input type="text" class="flat minwidth75" value="'.price((! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'')).'" name="'.$fieldlist[$field].'"></td>';
 		}

+ 31 - 8
htdocs/admin/mails.php

@@ -114,17 +114,24 @@ $server=! empty($conf->global->MAIN_MAIL_SMTP_SERVER)?$conf->global->MAIN_MAIL_S
 if (! $server) $server='127.0.0.1';
 
 
-/*
- * View
- */
-
 $wikihelp='EN:Setup EMails|FR:Paramétrage EMails|ES:Configuración EMails';
 llxHeader('',$langs->trans("Setup"),$wikihelp);
 
 print load_fiche_titre($langs->trans("EMailsSetup"),'','title_setup');
 
-print $langs->trans("EMailsDesc")."<br>\n";
-print "<br>\n";
+
+$h = 0;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/mails.php";
+$head[$h][1] = $langs->trans("OutGoingEmailSetup");
+$head[$h][2] = 'common';
+$h++;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/mails_templates.php";
+$head[$h][1] = $langs->trans("DictionaryEMailTemplates");
+$head[$h][2] = 'templates';
+$h++;
+
 
 // List of sending methods
 $listofmethods=array();
@@ -221,6 +228,12 @@ if ($action == 'edit')
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="update">';
 
+	dol_fiche_head($head, 'common', '');
+	
+	print $langs->trans("EMailsDesc")."<br>\n";
+	print "<br>\n";
+	
+	
 	clearstatcache();
 	$var=true;
 
@@ -428,6 +441,8 @@ if ($action == 'edit')
 
     print '</table>';
 
+    dol_fiche_end();
+    
     print '<br><div class="center">';
     print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
     print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
@@ -438,6 +453,12 @@ if ($action == 'edit')
 }
 else
 {
+    dol_fiche_head($head, 'common', '');
+    
+    print $langs->trans("EMailsDesc")."<br>\n";
+    print "<br>\n";
+    
+    
 	$var=true;
 
 	print '<table class="noborder" width="100%">';
@@ -570,10 +591,12 @@ else
 		print '&nbsp;';
 	}
 	print '</td></tr>';
-
     
 	print '</table>';
 
+	dol_fiche_end();
+	
+	
     if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
     {
         print '<br>';
@@ -619,7 +642,7 @@ else
 	print '</div>';
 
 
-	if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
+	if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && ! in_array($action, array('testconnect', 'test', 'testhtml')))
 	{
         $text = $langs->trans("WarningPHPMail");
 	    print info_admin($text);

+ 869 - 0
htdocs/admin/mails_templates.php

@@ -0,0 +1,869 @@
+<?php
+/* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010-2016  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2011-2015  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011       Remy Younes             <ryounes@gmail.com>
+ * Copyright (C) 2012-2015  Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2012       Christophe Battarel     <christophe.battarel@ltairis.fr>
+ * Copyright (C) 2011-2016  Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.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/admin/dict.php
+ *		\ingroup    setup
+ *		\brief      Page to administer data tables
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+
+$langs->load("errors");
+$langs->load("admin");
+$langs->load("main");
+$langs->load("mails");
+
+$action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
+$confirm=GETPOST('confirm','alpha');
+$id=GETPOST('id','int');
+$rowid=GETPOST('rowid','alpha');
+
+$allowed=$user->admin;
+if (! $allowed) accessforbidden();
+
+$acts[0] = "activate";
+$acts[1] = "disable";
+$actl[0] = img_picto($langs->trans("Disabled"),'switch_off');
+$actl[1] = img_picto($langs->trans("Activated"),'switch_on');
+
+$listoffset=GETPOST('listoffset');
+$listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000;
+$active = 1;
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0 ; }
+$offset = $listlimit * $page ;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('emailtemplates'));
+
+// Name of SQL tables of dictionaries
+$tabname=array();
+$tabname[25]= MAIN_DB_PREFIX."c_email_templates";
+
+// Requests to extract data
+$tabsql=array();
+$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template',1).")";
+
+// Criteria to sort dictionaries
+$tabsqlsort=array();
+$tabsqlsort[25]="label ASC";
+
+// Nom des champs en resultat de select pour affichage du dictionnaire
+$tabfield=array();
+$tabfield[25]= "label,type_template,private,position,topic,content";
+if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfield[25].=',content_lines';
+
+// Nom des champs d'edition pour modification d'un enregistrement
+$tabfieldvalue=array();
+$tabfieldvalue[25]= "label,type_template,private,position,topic,content";
+if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfield[25].=',content_lines';
+
+// Nom des champs dans la table pour insertion d'un enregistrement
+$tabfieldinsert=array();
+$tabfieldinsert[25]= "label,type_template,private,position,topic,content";
+if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfield[25].=',content_lines';
+$tabfieldinsert[25].=',entity';     // Must be at end because not into other arrays
+
+// Nom du rowid si le champ n'est pas de type autoincrement
+// Example: "" if id field is "rowid" and has autoincrement on
+//          "nameoffield" if id field is not "rowid" or has not autoincrement on
+$tabrowid=array();
+$tabrowid[25]= "";
+
+// Condition to show dictionary in setup page
+$tabcond=array();
+$tabcond[25]= true;
+
+// List of help for fields
+// Set MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES to allow edit of template for lines
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+$formmail=new FormMail($db);
+if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
+{
+    $tmp=$formmail->getAvailableSubstitKey('form');
+    $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
+    $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
+}
+else
+{
+    $tmp=$formmail->getAvailableSubstitKey('formwithlines');
+    $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
+    $tmp=$formmail->getAvailableSubstitKey('formforlines');
+    $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
+}
+
+
+$tabhelp=array();
+$tabhelp[25] = array('topic'=>$helpsubstit,'content'=>$helpsubstit,'content_lines'=>$helpsubstitforlines,'type_template'=>$langs->trans("TemplateForElement"),'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), 'position'=>$langs->trans("PositionIntoComboList"));
+
+// List of check for fields (NOT USED YET)
+$tabfieldcheck=array();
+$tabfieldcheck[25] = array();
+
+
+// Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
+$elementList = array();
+$sourceList=array();
+
+// We save list of template email Dolibarr can manage. This list can found by a grep into code on "->param['models']"
+$elementList = array();
+if ($conf->propal->enabled) $elementList['propal_send']=$langs->trans('MailToSendProposal');
+if ($conf->commande->enabled) $elementList['order_send']=$langs->trans('MailToSendOrder');
+if ($conf->facture->enabled) $elementList['facture_send']=$langs->trans('MailToSendInvoice');
+if ($conf->expedition->enabled) $elementList['shipping_send']=$langs->trans('MailToSendShipment');
+if ($conf->ficheinter->enabled) $elementList['fichinter_send']=$langs->trans('MailToSendIntervention');
+if ($conf->supplier_proposal->enabled) $elementList['supplier_proposal_send']=$langs->trans('MailToSendSupplierRequestForQuotation');
+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->contrat->enabled) $elementList['contract']=$langs->trans('MailToSendContract');
+
+$parameters=array('elementList'=>$elementList);
+$reshook=$hookmanager->executeHooks('emailElementlist',$parameters);    // Note that $action and $object may have been modified by some hooks
+if ($reshook == 0) {
+	foreach ($hookmanager->resArray as $item => $value) {
+		$elementList[$item] = $value;
+	}
+}
+
+$id = 25;
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
+{
+    //$search_country_id = '';    
+}
+
+// Actions add or modify an entry into a dictionary
+if (GETPOST('actionadd') || GETPOST('actionmodify'))
+{
+    $listfield=explode(',', str_replace(' ', '',$tabfield[$id]));
+    $listfieldinsert=explode(',',$tabfieldinsert[$id]);
+    $listfieldmodify=explode(',',$tabfieldinsert[$id]);
+    $listfieldvalue=explode(',',$tabfieldvalue[$id]);
+
+    // Check that all fields are filled
+    $ok=1;
+    foreach ($listfield as $f => $value)
+    {
+        if ($value == 'content') continue;
+        if ($value == 'content_lines') continue;
+        if ($value == 'content') $value='content-'.$rowid;
+        if ($value == 'content_lines') $value='content_lines-'.$rowid;
+
+        if (! isset($_POST[$value]) || $_POST[$value]=='')
+        {
+            $ok=0;
+            $fieldnamekey=$listfield[$f];
+            // We take translate key of field
+            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
+            if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
+            if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
+            if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
+            if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
+
+            setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+        }
+    }
+
+    // Si verif ok et action add, on ajoute la ligne
+    if ($ok && GETPOST('actionadd'))
+    {
+        if ($tabrowid[$id])
+        {
+            // Recupere id libre pour insertion
+            $newid=0;
+            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $obj = $db->fetch_object($result);
+                $newid=($obj->newid + 1);
+
+            } else {
+                dol_print_error($db);
+            }
+        }
+
+        // Add new entry
+        $sql = "INSERT INTO ".$tabname[$id]." (";
+        // List of fields
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+        	$sql.= $tabrowid[$id].",";
+        $sql.= $tabfieldinsert[$id];
+        $sql.=",active)";
+        $sql.= " VALUES(";
+
+        // List of values
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+        	$sql.= $newid.",";
+        $i=0;
+        foreach ($listfieldinsert as $f => $value)
+        {
+            //var_dump($i.' - '.$listfieldvalue[$i].' - '.$_POST[$listfieldvalue[$i]].' - '.$value);
+            if ($value == 'entity') {
+            	$_POST[$listfieldvalue[$i]] = $conf->entity;
+            }
+            if ($i) $sql.=",";
+            if ($value == 'private' && ! is_numeric($_POST[$listfieldvalue[$i]])) $_POST[$listfieldvalue[$i]]='0';
+            if ($value == 'position' && ! is_numeric($_POST[$listfieldvalue[$i]])) $_POST[$listfieldvalue[$i]]='1';
+            if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";  // For vat, we want/accept code = ''
+            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+            $i++;
+        }
+        $sql.=",1)";
+
+        dol_syslog("actionadd", LOG_DEBUG);
+        $result = $db->query($sql);
+        if ($result)	// Add is ok
+        {
+            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+        	$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
+        }
+        else
+        {
+            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+            }
+            else {
+                dol_print_error($db);
+            }
+        }
+    }
+
+    // Si verif ok et action modify, on modifie la ligne
+    if ($ok && GETPOST('actionmodify'))
+    {
+        if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+        else { $rowidcol="rowid"; }
+
+        // Modify entry
+        $sql = "UPDATE ".$tabname[$id]." SET ";
+        // Modifie valeur des champs
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldmodify))
+        {
+            $sql.= $tabrowid[$id]."=";
+            $sql.= "'".$db->escape($rowid)."', ";
+        }
+        $i = 0;
+        foreach ($listfieldmodify as $field)
+        {
+            if ($value == 'content') $_POST['content']=$_POST['content-'.$rowid];
+            if ($value == 'content_lines') $_POST['content_lines']=$_POST['content_lines-'.$rowid];
+            if ($field == 'entity') {
+            	$_POST[$listfieldvalue[$i]] = $conf->entity;
+            }
+            if ($i) $sql.=",";
+            $sql.= $field."=";
+            if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";  // For vat, we want/accept code = ''
+            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+            $i++;
+        }
+        $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
+
+        dol_syslog("actionmodify", LOG_DEBUG);
+        //print $sql;
+        $resql = $db->query($sql);
+        if (! $resql)
+        {
+            setEventMessages($db->error(), null, 'errors');
+        }
+    }
+}
+
+if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
+
+    dol_syslog("delete", LOG_DEBUG);
+    $result = $db->query($sql);
+    if (! $result)
+    {
+        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+        {
+            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+    }
+}
+
+// activate
+if ($action == $acts[0])
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    if ($rowid) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
+    }
+    elseif ($_GET["code"]) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$_GET["code"]."'";
+    }
+
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
+}
+
+// disable
+if ($action == $acts[1])
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    if ($rowid) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
+    }
+    elseif ($_GET["code"]) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$_GET["code"]."'";
+    }
+
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formadmin=new FormAdmin($db);
+
+llxHeader();
+
+$titre=$langs->trans("EMailsSetup");
+$linkback='';
+$titlepicto='title_setup';
+
+print load_fiche_titre($titre,$linkback,$titlepicto);
+
+$h = 0;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/mails.php";
+$head[$h][1] = $langs->trans("OutGoingEmailSetup");
+$head[$h][2] = 'common';
+$h++;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/mails_templates.php";
+$head[$h][1] = $langs->trans("DictionaryEMailTemplates");
+$head[$h][2] = 'templates';
+$h++;
+
+
+dol_fiche_head($head, 'templates', '');
+
+// Confirmation de la suppression de la ligne
+if ($action == 'delete')
+{
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$_GET["code"].'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
+}
+//var_dump($elementList);
+
+// Complete requete recherche valeurs avec critere de tri
+$sql=$tabsql[$id];
+
+if ($search_country_id > 0)
+{
+    if (preg_match('/ WHERE /',$sql)) $sql.= " AND ";
+    else $sql.=" WHERE ";
+    $sql.= " c.rowid = ".$search_country_id;
+}
+
+if ($sortfield)
+{
+    // If sort order is "country", we use country_code instead
+	if ($sortfield == 'country') $sortfield='country_code';
+    $sql.= " ORDER BY ".$sortfield;
+    if ($sortorder)
+    {
+        $sql.=" ".strtoupper($sortorder);
+    }
+    $sql.=", ";
+    // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
+    $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
+    $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
+}
+else {
+    $sql.=" ORDER BY ";
+}
+$sql.=$tabsqlsort[$id];
+$sql.=$db->plimit($listlimit+1,$offset);
+//print $sql;
+
+$fieldlist=explode(',',$tabfield[$id]);
+
+print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
+
+print '<table class="noborder" width="100%">';
+
+// Form to add a new line
+$alabelisused=0;
+$var=false;
+
+$fieldlist=explode(',',$tabfield[$id]);
+
+if ($action != 'edit')
+{
+    // Line for title
+    print '<tr class="liste_titre">';
+    foreach ($fieldlist as $field => $value)
+    {
+        // Determine le nom du champ par rapport aux noms possibles
+        // dans les dictionnaires de donnees
+        $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
+        $valuetoshow=$langs->trans($valuetoshow);   // try to translate
+        $align="left";
+        if ($fieldlist[$field]=='lang')            { $valuetoshow=$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"); }
+        if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
+    	if ($fieldlist[$field]=='content')         { $valuetoshow=''; }
+    	if ($fieldlist[$field]=='content_lines')   { $valuetoshow=''; }
+    		
+        if ($valuetoshow != '')
+        {
+            print '<td align="'.$align.'">';
+        	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
+        	else if (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
+        	else print $valuetoshow;
+            print '</td>';
+         }
+         if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
+    }
+    
+    print '<td colspan="3">';
+    print '<input type="hidden" name="id" value="'.$id.'">';
+    print '</td>';
+    print '</tr>';
+    
+    // Line to enter new values
+    print "<tr ".$bcnd[$var].">";
+    
+    $obj = new stdClass();
+    // If data was already input, we define them in obj to populate input fields.
+    if (GETPOST('actionadd'))
+    {
+        foreach ($fieldlist as $key=>$val)
+        {
+            if (GETPOST($val) != '')
+            	$obj->$val=GETPOST($val);
+        }
+    }
+    
+    $tmpaction = 'create';
+    $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+    $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+    $error=$hookmanager->error; $errors=$hookmanager->errors;
+    
+    if (empty($reshook))
+    {
+    	if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates' && $action == 'edit')
+    	{
+    		fieldList($fieldlist,$obj,$tabname[$id],'hide');
+    	}
+    	else
+    	{
+    		fieldList($fieldlist,$obj,$tabname[$id],'add');
+    	}
+    }
+    
+    print '<td align="right" colspan="3">';
+    print '</td>';
+    print "</tr>";
+    
+    $fieldsforcontent = array('content');
+    if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
+    {
+        $fieldsforcontent = array('content', 'content_lines');
+    }
+    foreach ($fieldsforcontent as $tmpfieldlist)
+    {
+        print '<tr class="impair nodrag nodrop nohover"><td colspan="5">';
+        if ($tmpfieldlist == 'content')
+        {
+            print '<strong>'.$form->textwithpicto($langs->trans("Content"),$tabhelp[$id][$tmpfieldlist]).'</strong><br>';
+        }
+        if ($context != 'hide')
+        {
+            //print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
+            $okforextended=true;
+            if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended=false;
+            $doleditor = new DolEditor($tmpfieldlist, (! empty($obj->{$tmpfieldlist})?$obj->{$tmpfieldlist}:''), '', 120, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_4, '90%');
+            print $doleditor->Create(1);
+        }
+        else print '&nbsp;';
+        print '</td>';
+        if ($tmpfieldlist == 'content') 
+        {
+            print '<td align="center" colspan="3" rowspan="'.(count($fieldsforcontent)).'">';
+            if ($action != 'edit')
+            {
+                print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+            }
+            print '</td>';
+        }
+        //else print '<td></td>';
+        print '</tr>';
+    }
+    
+    
+    
+    $colspan=count($fieldlist)+1;
+    print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
+}    
+
+
+// List of available record in database
+dol_syslog("htdocs/admin/dict", LOG_DEBUG);
+$resql=$db->query($sql);
+if ($resql)
+{
+    $num = $db->num_rows($resql);
+    $i = 0;
+    $var=true;
+
+    $param = '&id='.$id;
+    $paramwithsearch = $param;
+    if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
+    if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
+    if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
+    
+    // There is several pages
+    if ($num > $listlimit)
+    {
+        print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
+        print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
+        print '</td></tr>';
+    }
+
+    // Title of lines
+    print '<tr class="liste_titre'.($action != 'edit' ? ' liste_titre_add' : '').'">';
+    foreach ($fieldlist as $field => $value)
+    {
+        // Determine le nom du champ par rapport aux noms possibles
+        // dans les dictionnaires de donnees
+        $showfield=1;							  	// By defaut
+        $align="left";
+        $sortable=1;
+        $valuetoshow='';
+        /*
+        $tmparray=getLabelOfField($fieldlist[$field]);
+        $showfield=$tmp['showfield'];
+        $valuetoshow=$tmp['valuetoshow'];
+        $align=$tmp['align'];
+        $sortable=$tmp['sortable'];
+		*/
+        $valuetoshow=ucfirst($fieldlist[$field]);   // By defaut
+        $valuetoshow=$langs->trans($valuetoshow);   // try to translate
+        if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
+        if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
+        if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
+    	if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
+		if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); $showfield=0;}
+		if ($fieldlist[$field]=='content_lines')   { $valuetoshow=$langs->trans("ContentLines"); $showfield=0; }
+
+        // Affiche nom du champ
+        if ($showfield)
+        {
+            if (! empty($tabhelp[$id][$value])) $valuetoshow = $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
+            print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
+        }
+    }
+
+    print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
+    print getTitleFieldOfList('');
+    print getTitleFieldOfList('');
+    print '</tr>';
+
+    // Title line with search boxes
+    print '<tr class="liste_titre">';
+    $filterfound=0;
+    foreach ($fieldlist as $field => $value)
+    {
+        if (! in_array($field, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
+    }
+    print '<td class="liste_titre"></td>';
+    print '<td class="liste_titre"></td>';
+    print '<td class="liste_titre"></td>';
+    print '</tr>';
+        
+    if ($num)
+    {
+        // Lines with values
+        while ($i < $num)
+        {
+            $var = ! $var;
+
+            $obj = $db->fetch_object($resql);
+            //print_r($obj);
+            print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">';
+            if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
+            {
+                $tmpaction='edit';
+                $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+                $reshook=$hookmanager->executeHooks('editDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+                $error=$hookmanager->error; $errors=$hookmanager->errors;
+
+                // Show fields
+                if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
+
+                print '<td colspan="3" align="center">';
+                print '<input type="hidden" name="page" value="'.$page.'">';
+                print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+                print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+                print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
+                print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+                print '</td>';
+                
+                $fieldsforcontent = array('content');
+                if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
+                {
+                    $fieldsforcontent = array('content', 'content_lines');
+                }
+                foreach ($fieldsforcontent as $tmpfieldlist)
+                {
+                    $showfield = 1;
+                    $align = "left";
+                    $valuetoshow = $obj->{$tmpfieldlist};
+                
+                    $class = 'tddict';
+                    // Show value for field
+                    if ($showfield) {
+                
+                        print '</tr><tr '.$bc[$var].' nohover tr-'.$tmpfieldlist.'-'.($i+1).' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
+                        $okforextended = true;
+                        if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
+                            $okforextended = false;
+                            $doleditor = new DolEditor($tmpfieldlist.'-'.($i+1), (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
+                            print $doleditor->Create(1);
+                            print '</td>';
+                            print '<td></td><td></td><td></td>';
+                
+                    }
+                }                
+            }
+            else
+            {
+              	$tmpaction = 'view';
+                $parameters=array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+                $reshook=$hookmanager->executeHooks('viewDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+
+                $error=$hookmanager->error; $errors=$hookmanager->errors;
+
+                if (empty($reshook))
+                {
+                    foreach ($fieldlist as $field => $value)
+                    {
+                        if (in_array($fieldlist[$field], array('content','content_lines'))) continue;
+                        $showfield=1;
+                    	$align="left";
+                        $valuetoshow=$obj->{$fieldlist[$field]};
+                        if ($value == 'type_template')
+                        {
+                            $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
+                        }
+
+                        $class='tddict';
+						// Show value for field
+						if ($showfield)
+						{
+                            print '<!-- '.$fieldlist[$field].' --><td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
+						}
+                    }
+                }
+
+                // Can an entry be erased or disabled ?
+                $iserasable=1;$canbedisabled=1;$canbemodified=1;	// true by default
+                $canbemodified=$iserasable;
+
+                $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
+                if ($param) $url .= '&'.$param;
+                $url.='&';
+
+                // Active
+                print '<td align="center" class="nowrap">';
+                if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+                else
+             	{
+             		if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
+             		else if (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
+              		else if (isset($obj->type) && in_array($obj->type, array('system')) && ! empty($obj->active) && $obj->code != 'AC_OTH') print $langs->trans("UsedOnlyWithTypeOption");
+                	else print $langs->trans("AlwaysActive");
+                }
+                print "</td>";
+
+                // Modify link
+                if ($canbemodified) print '<td align="center"><a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a></td>';
+                else print '<td>&nbsp;</td>';
+
+                // Delete link
+                if ($iserasable)
+                {
+                    print '<td align="center">';
+                    if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
+                    //else print '<a href="#">'.img_delete().'</a>';    // Some dictionnary can be edited by other profile than admin
+                    print '</td>';
+                }
+                else print '<td>&nbsp;</td>';
+
+                /*
+                $fieldsforcontent = array('content');
+                if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
+                {
+                    $fieldsforcontent = array('content', 'content_lines');
+                }
+                foreach ($fieldsforcontent as $tmpfieldlist) 
+                {
+                    $showfield = 1;
+                    $align = "left";
+                    $valuetoshow = $obj->{$tmpfieldlist};
+                    
+                    $class = 'tddict';
+                    // Show value for field
+                    if ($showfield) {
+                        
+                        print '</tr><tr '.$bc[$var].' nohover tr-'.$tmpfieldlist.'-'.$i.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
+                        $okforextended = true;
+                        if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
+                            $okforextended = false;
+                        $doleditor = new DolEditor($tmpfieldlist.'-'.$i, (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%', 1);
+                        print $doleditor->Create(1);
+                        print '</td>';
+                        print '<td></td><td></td><td></td>';
+                        
+                    }
+                }*/
+            }
+            print "</tr>\n";
+            
+            
+            $i++;
+        }
+    }
+}
+else {
+    dol_print_error($db);
+}
+
+print '</table>';
+
+print '</form>';
+
+
+dol_fiche_end();
+
+llxFooter();
+$db->close();
+
+
+/**
+ *	Show fields in insert/edit mode
+ *
+ * 	@param		array	$fieldlist		Array of fields
+ * 	@param		Object	$obj			If we show a particular record, obj is filled with record fields
+ *  @param		string	$tabname		Name of SQL table
+ *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
+ *	@return		void
+ */
+function fieldList($fieldlist, $obj='', $tabname='', $context='')
+{
+	global $conf,$langs,$db;
+	global $form;
+	global $region_id;
+	global $elementList,$sourceList,$localtax_typeList;
+	global $bc;
+
+	$formadmin = new FormAdmin($db);
+	$formcompany = new FormCompany($db);
+	if (! empty($conf->accounting->enabled)) $formaccountancy = new FormVentilation($db);
+
+	foreach ($fieldlist as $field => $value)
+	{
+		if ($fieldlist[$field] == 'lang')
+		{
+			print '<td>';
+			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT,'lang');
+			print '</td>';
+		}
+		// Le type de template
+		elseif ($fieldlist[$field] == 'type_template')
+		{
+			print '<td>';
+			print $form->selectarray('type_template', $elementList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+			print '</td>';
+		}
+		elseif (in_array($fieldlist[$field], array('content','content_lines'))) continue;
+		else
+		{
+			print '<td>';
+			$size=''; $class='';
+			if ($fieldlist[$field]=='code') $class='maxwidth100';
+			if ($fieldlist[$field]=='private') $class='maxwidth50';
+			if ($fieldlist[$field]=='position') $class='maxwidth50';
+			if ($fieldlist[$field]=='libelle') $class='quatrevingtpercent';
+			if ($fieldlist[$field]=='topic') $class='quatrevingtpercent';
+			if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='sens' || $fieldlist[$field]=='category_type') $size='size="2" ';
+			print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="'.(isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
+			print '</td>';
+		}
+	}
+}
+

+ 137 - 132
htdocs/admin/modulehelp.php

@@ -46,9 +46,10 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
 $langs->load("errors");
 $langs->load("admin");
 
-$mode=GETPOST('mode', 'alpha')?GETPOST('mode', 'alpha'):0;
+$mode=GETPOST('mode', 'alpha');
 $action=GETPOST('action','alpha');
 $id = GETPOST('id', 'int');
+if (empty($mode)) $mode='desc';
 
 if (! $user->admin)
 	accessforbidden();
@@ -232,17 +233,15 @@ asort($orders);
 
 $h = 0;
 
-$categidx='desc';    // Main
 $head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$id.'&mode=desc';
 $head[$h][1] = $langs->trans("Description");
 $head[$h][2] = 'desc';
 $h++;
 
-/*$categidx='feature';
 $head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$id.'&mode=feature';
 $head[$h][1] = $langs->trans("Features");
 $head[$h][2] = 'feature';
-$h++;*/
+$h++;
 
 
 $i=0;
@@ -356,159 +355,165 @@ if ($objMod->isCoreOrExternalModule() == 'external')
 
 // Define text of description of module
 $text='';
-
-if ($objMod->getDescLong()) $text.=$objMod->getDesc().'<br>';
-
-$text.='<br><strong>'.$langs->trans("Version").':</strong> '.$version;
-
-$textexternal='';
-if ($objMod->isCoreOrExternalModule() == 'external')
+   
+if ($mode == 'desc')
 {
-    $textexternal.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("ExternalModule",$dirofmodule);
-    if ($objMod->editor_name != 'dolibarr') $textexternal.='<br><strong>'.$langs->trans("Publisher").':</strong> '.(empty($objMod->editor_name)?$langs->trans("Unknown"):$objMod->editor_name);
-    if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i',$objMod->editor_url)) $textexternal.='<br><strong>'.$langs->trans("Url").':</strong> '.$objMod->editor_url;
-    $text.=$textexternal;
+    $text.='<strong>'.$langs->trans("Version").':</strong> '.$version;
+    
+    $textexternal='';
+    if ($objMod->isCoreOrExternalModule() == 'external')
+    {
+        $textexternal.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("ExternalModule",$dirofmodule);
+        if ($objMod->editor_name != 'dolibarr') $textexternal.='<br><strong>'.$langs->trans("Publisher").':</strong> '.(empty($objMod->editor_name)?$langs->trans("Unknown"):$objMod->editor_name);
+        if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i',$objMod->editor_url)) $textexternal.='<br><strong>'.$langs->trans("Url").':</strong> '.$objMod->editor_url;
+        $text.=$textexternal;
+        $text.='<br>';
+    }
+    else
+    {
+        $text.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("Core").'<br>';
+    }
+    $text.='<br><strong>'.$langs->trans("LastActivationDate").':</strong> ';
+    if (! empty($conf->global->$const_name)) $text.=dol_print_date($objMod->getLastActivationDate(), 'dayhour');
+    else $text.=$langs->trans("Disabled");
     $text.='<br>';
+
+    if ($objMod->getDescLong()) $text.=$objMod->getDesc().'<br>';
 }
-else
-{
-    $text.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("Core").'<br>';
-}
-$text.='<br><strong>'.$langs->trans("LastActivationDate").':</strong> ';
-if (! empty($conf->global->$const_name)) $text.=dol_print_date($objMod->getLastActivationDate(), 'dayhour');
-else $text.=$langs->trans("Disabled");
-$text.='<br>';
 
-$text.='<br><strong>'.$langs->trans("AddRemoveTabs").':</strong> ';
-if (isset($objMod->tabs) && is_array($objMod->tabs) && count($objMod->tabs))
+if ($mode == 'feature')
 {
-    $i=0;
-    foreach($objMod->tabs as $val)
+    $text.='<strong>'.$langs->trans("AddRemoveTabs").':</strong> ';
+    if (isset($objMod->tabs) && is_array($objMod->tabs) && count($objMod->tabs))
     {
-        $tmp=explode(':',$val,3);
-        $text.=($i?', ':'').$tmp[0].':'.$tmp[1];
-        $i++;
+        $i=0;
+        foreach($objMod->tabs as $val)
+        {
+            $tmp=explode(':',$val,3);
+            $text.=($i?', ':'').$tmp[0].':'.$tmp[1];
+            $i++;
+        }
     }
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddDictionaries").':</strong> ';
-if (isset($objMod->dictionaries) && isset($objMod->dictionaries['tablib']) && is_array($objMod->dictionaries['tablib']) && count($objMod->dictionaries['tablib']))
-{
-    $i=0;
-    foreach($objMod->dictionaries['tablib'] as $val)
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddDictionaries").':</strong> ';
+    if (isset($objMod->dictionaries) && isset($objMod->dictionaries['tablib']) && is_array($objMod->dictionaries['tablib']) && count($objMod->dictionaries['tablib']))
     {
-        $text.=($i?', ':'').$val;
-        $i++;
+        $i=0;
+        foreach($objMod->dictionaries['tablib'] as $val)
+        {
+            $text.=($i?', ':'').$val;
+            $i++;
+        }
     }
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddBoxes").':</strong> ';
-if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes))
-{
-    $i=0;
-    foreach($objMod->boxes as $val)
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddBoxes").':</strong> ';
+    if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes))
     {
-        $text.=($i?', ':'').($val['file']?$val['file']:$val[0]);
-        $i++;
+        $i=0;
+        foreach($objMod->boxes as $val)
+        {
+            $text.=($i?', ':'').($val['file']?$val['file']:$val[0]);
+            $i++;
+        }
     }
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddModels").':</strong> ';
-if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
-{
-    $text.=$langs->trans("Yes");
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddSubstitutions").':</strong> ';
-if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
-{
-    $text.=$langs->trans("Yes");
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddSheduledJobs").':</strong> ';
-if (isset($objMod->cronjobs) && is_array($objMod->cronjobs) && count($objMod->cronjobs))
-{
-    $i=0;
-    foreach($objMod->cronjobs as $val)
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddModels").':</strong> ';
+    if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
     {
-        $text.=($i?', ':'').($val['label']);
-        $i++;
+        $text.=$langs->trans("Yes");
     }
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddTriggers").':</strong> ';
-if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
-{
-    $text.=$langs->trans("Yes");
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddHooks").':</strong> ';
-if (isset($objMod->module_parts) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks']))
-{
-    $i=0;
-    foreach($objMod->module_parts['hooks'] as $val)
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddSubstitutions").':</strong> ';
+    if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
     {
-        $text.=($i?', ':'').($val);
-        $i++;
+        $text.=$langs->trans("Yes");
     }
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddPermissions").':</strong> ';
-if (isset($objMod->rights) && is_array($objMod->rights) && count($objMod->rights))
-{
-    $i=0;
-    foreach($objMod->rights as $val)
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddSheduledJobs").':</strong> ';
+    if (isset($objMod->cronjobs) && is_array($objMod->cronjobs) && count($objMod->cronjobs))
     {
-        $text.=($i?', ':'').($val[1]);
-        $i++;
+        $i=0;
+        foreach($objMod->cronjobs as $val)
+        {
+            $text.=($i?', ':'').($val['label']);
+            $i++;
+        }
     }
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddMenus").':</strong> ';
-if (isset($objMod->menu) && ! empty($objMod->menu)) // objMod can be an array or just an int 1
-{
-    $text.=$langs->trans("Yes");
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddExportProfiles").':</strong> ';
-if (isset($objMod->export_label) && is_array($objMod->export_label) && count($objMod->export_label))
-{
-    $i=0;
-    foreach($objMod->export_label as $val)
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddTriggers").':</strong> ';
+    if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
     {
-        $text.=($i?', ':'').($val);
-        $i++;
+        $text.=$langs->trans("Yes");
     }
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddImportProfiles").':</strong> ';
-if (isset($objMod->import_label) && is_array($objMod->import_label) && count($objMod->import_label))
-{
-    $i=0;
-    foreach($objMod->import_label as $val)
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddHooks").':</strong> ';
+    if (isset($objMod->module_parts) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks']))
+    {
+        $i=0;
+        foreach($objMod->module_parts['hooks'] as $val)
+        {
+            $text.=($i?', ':'').($val);
+            $i++;
+        }
+    }
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddPermissions").':</strong> ';
+    if (isset($objMod->rights) && is_array($objMod->rights) && count($objMod->rights))
+    {
+        $i=0;
+        foreach($objMod->rights as $val)
+        {
+            $text.=($i?', ':'').($val[1]);
+            $i++;
+        }
+    }
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddMenus").':</strong> ';
+    if (isset($objMod->menu) && ! empty($objMod->menu)) // objMod can be an array or just an int 1
+    {
+        $text.=$langs->trans("Yes");
+    }
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddExportProfiles").':</strong> ';
+    if (isset($objMod->export_label) && is_array($objMod->export_label) && count($objMod->export_label))
+    {
+        $i=0;
+        foreach($objMod->export_label as $val)
+        {
+            $text.=($i?', ':'').($val);
+            $i++;
+        }
+    }
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddImportProfiles").':</strong> ';
+    if (isset($objMod->import_label) && is_array($objMod->import_label) && count($objMod->import_label))
     {
-        $text.=($i?', ':'').($val);
-        $i++;
+        $i=0;
+        foreach($objMod->import_label as $val)
+        {
+            $text.=($i?', ':'').($val);
+            $i++;
+        }
     }
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
+    $text.=$langs->trans("DetectionNotPossible");
 }
-else $text.=$langs->trans("No");
 
-$text.='<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
-$text.=$langs->trans("DetectionNotPossible");
 
 print $text;
-        
 
 
 dol_fiche_end();

+ 25 - 9
htdocs/core/class/html.formmail.class.php

@@ -984,7 +984,7 @@ class FormMail extends Form
 	 */
 	function setSubstitFromObject($object, $outputlangs=null)
 	{
-		global $user;
+		global $conf, $user;
 		$this->substit['__REF__'] = $object->ref;
 		$this->substit['__REFCLIENT__'] = isset($object->ref_client) ? $object->ref_client : '';
 		$this->substit['__REFSUPPLIER__'] = isset($object->ref_supplier) ? $object->ref_supplier : '';
@@ -993,6 +993,7 @@ class FormMail extends Form
 		$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_VAT__'] = price($object->total_tva);
 		
 		$this->substit['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:'');
 		$this->substit['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty)?$object->thirdparty->name:'');
@@ -1005,6 +1006,7 @@ class FormMail extends Form
 		$this->substit['__PERSONALIZED__'] = '';
 		$this->substit['__CONTACTCIVNAME__'] = '';	// Will be replace just before sending
         
+		
         //Fill substit_lines with each object lines content
         if (is_array($object->lines))
         {
@@ -1022,10 +1024,10 @@ class FormMail extends Form
                     '__SUBPRICE__' => price($line->subprice),
                     '__AMOUNT__' => price($line->total_ttc),
                     '__AMOUNT_WO_TAX__' => price($line->total_ht),
-                    //'__PRODUCT_EXTRAFIELD_FIELD__' Done dinamically
+                    //'__PRODUCT_EXTRAFIELD_FIELD__' Done dinamically just after
                 );
 
-                // Create dinamic tags for __PRODUCT_EXTRAFIELD_FIELD__
+                // Create dynamic tags for __PRODUCT_EXTRAFIELD_FIELD__
                 if (!empty($line->fk_product))
                 {
                     $extrafields = new ExtraFields($this->db);
@@ -1045,7 +1047,7 @@ class FormMail extends Form
 	/**
 	 * Set substit array from object
 	 * 
-	 * @param	string	$mode		'form' or 'emailing'
+	 * @param	string	$mode		'form', 'formwithlines', 'formforlines' or 'emailing'
 	 * @return	void
 	 */
 	function getAvailableSubstitKey($mode='form')
@@ -1054,18 +1056,32 @@ class FormMail extends Form
 		
 		$vars=array();
 		
-		if ($mode == 'form')
+		if ($mode == 'form' || $mode == 'formwithlines' || $mode == 'formforlines')
 		{
 			$vars=array(
 				'__REF__', 
 				'__REFCLIENT__', 
-				'__THIRDPARTY_NAME__', 
-				'__PROJECT_REF__', 
-				'__PROJECT_NAME__',
+				'__REFSUPPLIER__', 
+			    '__THIRDPARTY_ID__', 
+			    '__THIRDPARTY_NAME__', 
+			    '__PROJECT_ID__', 
+			    '__PROJECT_REF__', 
+			    '__PROJECT_NAME__',
 				'__CONTACTCIVNAME__',
-				'__PERSONALIZED__',			// Paypal link will be added here in form mode
+				'__AMOUNT__', 
+				'__AMOUNT_WO_TAX__', 
+				'__AMOUNT_VAT__', 
+			    '__PERSONALIZED__',			// Paypal link will be added here in form mode
 				'__SIGNATURE__', 
 			);
+			if ($mode == 'formwithlines')
+			{
+			    $vars[] = '__LINES__';      // Will be set by the get_form function
+			}
+			if ($mode == 'formforlines')
+			{
+			    $vars[] = '__QUANTITY__';   // Will be set by the get_form function
+			}
 		}
 		if ($mode == 'emailing')
 		{

+ 1 - 0
htdocs/langs/en_US/admin.lang

@@ -1623,6 +1623,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version

+ 3 - 0
htdocs/langs/en_US/mails.lang

@@ -150,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+