Fix: Removed not translated combo box.
This commit is contained in:
Laurent Destailleur
parent
7e913d2972
commit
55b9d6b86a
@ -48,7 +48,7 @@ if ($_POST["action"] == 'update' || $_POST["action"] == 'add')
|
||||
|
||||
$const=$_POST["constname"];
|
||||
$value=$_POST["constvalue"];
|
||||
if (in_array($const,array('ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) $value=$_POST["constvalue".$const];
|
||||
if (in_array($const,array('ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) $value=$_POST["constvalue".$const];
|
||||
$type=$_POST["consttype"];
|
||||
$constnote=isset($_POST["constnote"])?$_POST["constnote"]:'';
|
||||
|
||||
@ -374,7 +374,7 @@ function form_constantes($tableau)
|
||||
print '</td><td>';
|
||||
print '<input type="hidden" name="consttype" value="texte">';
|
||||
}
|
||||
else if (in_array($const,array('ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL')))
|
||||
else if (in_array($const,array('ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL')))
|
||||
{
|
||||
// Editor wysiwyg
|
||||
if ($conf->fckeditor->enabled)
|
||||
|
||||
@ -225,8 +225,8 @@ if ($_GET["action"] == 'create')
|
||||
// Comment
|
||||
print '<tr><td valign="top">'.$langs->trans("Comment").'</td>';
|
||||
print '<td colspan="3">';
|
||||
// Editeur wysiwyg
|
||||
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING)
|
||||
// Editor wysiwyg
|
||||
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE)
|
||||
{
|
||||
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
|
||||
$doleditor=new DolEditor('account_comment',$account->comment,200,'dolibarr_notes','',false);
|
||||
@ -235,7 +235,8 @@ if ($_GET["action"] == 'create')
|
||||
else
|
||||
{
|
||||
print '<textarea class="flat" name="account_comment" cols="70" rows="10">';
|
||||
print dol_htmlentitiesbr_decode($account->comment).'</textarea>';
|
||||
print dol_htmlentitiesbr_decode($account->comment);
|
||||
print '</textarea>';
|
||||
}
|
||||
print '</td></tr>';
|
||||
|
||||
@ -463,8 +464,8 @@ else
|
||||
// Comment
|
||||
print '<tr><td valign="top">'.$langs->trans("Comment").'</td>';
|
||||
print '<td colspan="3">';
|
||||
// <EFBFBD>diteur wysiwyg
|
||||
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING)
|
||||
// Editor wysiwyg
|
||||
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE)
|
||||
{
|
||||
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
|
||||
$doleditor=new DolEditor('account_comment',$account->comment,200,'dolibarr_notes','',false);
|
||||
|
||||
@ -99,14 +99,14 @@ insert into llx_const (name, value, type, note, visible) values('SOCIETE_CODECOM
|
||||
--
|
||||
-- Mail Adherent
|
||||
--
|
||||
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_REQUIRED','1','yesno','Le mail est obligatoire pour créer un adhérent',0);
|
||||
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_FROM','adherents@domain.com','chaine','From des mails adherents',0);
|
||||
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_RESIL','Votre adhesion vient d\'etre resiliee.\r\nNous esperons vous revoir tres bientot','texte','Mail de Resiliation',0);
|
||||
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_VALID','Votre adhesion vient d\'etre validee. \r\nVoici le rappel de vos coordonnees (toute information erronee entrainera la non validation de votre inscription) :\r\n\r\n%INFOS%\r\n\r\n','texte','Mail de validation',0);
|
||||
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_COTIS','Bonjour %PRENOM%,\r\nMerci de votre inscription.\r\nCet email confirme que votre cotisation a ete recue et enregistree.\r\n\r\n','texte','Mail de validation de cotisation',0);
|
||||
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_VALID_SUBJECT','Votre adhésion a ete validée','chaine','Sujet du mail de validation',0);
|
||||
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_RESIL_SUBJECT','Resiliation de votre adhesion','chaine','Sujet du mail de resiliation',0);
|
||||
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_COTIS_SUBJECT','Recu de votre cotisation','chaine','Sujet du mail de validation de cotisation',0);
|
||||
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_REQUIRED','1','yesno','EMail required to create a new member',0);
|
||||
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_FROM','adherents@domain.com','chaine','Sender EMail for automatic emails',0);
|
||||
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_RESIL','Your subscription has been resiliated.\r\nWe hope to see you soon again','texte','Mail resiliation',0);
|
||||
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_VALID','Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','texte','Mail de validation',0);
|
||||
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_COTIS','Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','texte','Mail de validation de cotisation',0);
|
||||
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_VALID_SUBJECT','Your subscription has been validated','chaine','Sujet du mail de validation',0);
|
||||
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_RESIL_SUBJECT','Resiliating your subscription','chaine','Sujet du mail de resiliation',0);
|
||||
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_COTIS_SUBJECT','Receipt of your subscription','chaine','Sujet du mail de validation de cotisation',0);
|
||||
|
||||
|
||||
--
|
||||
|
||||
@ -36,22 +36,22 @@ class DolEditor
|
||||
|
||||
|
||||
/**
|
||||
\brief DolEditor
|
||||
\param htmlname Nom formulaire html WYSIWIG
|
||||
\param content Contenu edition WYSIWIG
|
||||
\param height Hauteur en pixel de la zone edition
|
||||
\param toolbarname Nom barre de menu editeur
|
||||
\param toolbarlocation Emplacement de la barre de menu :
|
||||
'In' chaque fenetre d'edition a la propre barre d'outils
|
||||
'Out:nom' partage de la barre d'outils ou 'nom' est le nom du DIV qui affiche la barre
|
||||
\param toolbarstartexpanded visible ou non au demarrage
|
||||
\param modulepart modulepart pour protection wrapper download viewimage
|
||||
*/
|
||||
* \brief DolEditor
|
||||
* \param htmlname Nom formulaire html WYSIWIG
|
||||
* \param content Contenu edition WYSIWIG
|
||||
* \param height Hauteur en pixel de la zone edition
|
||||
* \param toolbarname Nom barre de menu editeur
|
||||
* \param toolbarlocation Emplacement de la barre de menu :
|
||||
* 'In' chaque fenetre d'edition a la propre barre d'outils
|
||||
* 'Out:nom' partage de la barre d'outils ou 'nom' est le nom du DIV qui affiche la barre
|
||||
* \param toolbarstartexpanded visible ou non au demarrage
|
||||
* \param uselocalbrowser Enabled to add links to local object with local browsers. If false, only external images can be added in content.
|
||||
*/
|
||||
function DolEditor($htmlname,$content,$height=200,$toolbarname='Basic',$toolbarlocation='In',$toolbarstartexpanded=false,$uselocalbrowser=true)
|
||||
{
|
||||
global $conf,$langs;
|
||||
|
||||
dol_syslog("DolEditor::DolEditor modulepart=".$modulepart);
|
||||
dol_syslog("DolEditor::DolEditor htmlname=".$htmlname);
|
||||
|
||||
require_once(DOL_DOCUMENT_ROOT."/includes/fckeditor/fckeditor.php");
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user