From f3b3c836117c4dac9e80e5e96b7e0dfc12fd24e5 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 13 Jul 2011 07:38:10 +0000 Subject: [PATCH 001/310] Fix: possibility to split buttons and files view --- htdocs/core/class/html.formfile.class.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index ab274743513..cfd46212a10 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -22,7 +22,7 @@ * \file htdocs/core/class/html.formfile.class.php * \ingroup core * \brief File of class to offer components to list and upload files - * \version $Id: html.formfile.class.php,v 1.49 2011/07/13 14:41:03 eldy Exp $ + * \version $Id: html.formfile.class.php,v 1.48 2011/07/13 07:38:11 hregis Exp $ */ @@ -152,7 +152,6 @@ class FormFile */ function show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hooks='') { - $this->numoffiles=0; print $this->showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$maxfilenamelength,$noform,$param,$title,$buttonlabel,$codelang,$hooks); return $this->numoffiles; } @@ -846,12 +845,12 @@ class FormFile print ''; print ''; print ''; - + print ''; - + print '
'; print '
'; - + print ''; /*print ''; print ''; From f2e39ffac128df409db6c958580f39ce79ce4404 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 08:57:21 +0000 Subject: [PATCH 002/310] Restore hidden param to enable feature for the release 3.1. I suggest to test it during on version untill making it visible by default. From a578b3beab5d5f0eff501f8b24379471cd1606d5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 10:22:54 +0000 Subject: [PATCH 003/310] Fix: Only one message --- htdocs/public/members/new.php | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index f4d349046b0..035e8848da4 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -22,7 +22,7 @@ * \file htdocs/public/members/new.php * \ingroup member * \brief Example of form to add a new member - * \version $Id: new.php,v 1.42 2011/07/13 11:56:36 eldy Exp $ + * \version $Id: new.php,v 1.40 2011/07/13 10:22:54 eldy Exp $ * * Note that you can add following constant to change behaviour of page * MEMBER_NEWFORM_AMOUNT Default amount for autosubscribe form @@ -182,18 +182,13 @@ if ($action == 'add') $langs->load("errors"); $errmsg .= $langs->trans("ErrorBadDateFormat")."
\n"; } - if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) + if (isset($public)) { - if (GETPOST("morphy") == 'mor' && GETPOST('budget') <= 0) - { - $error+=1; - $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."
\n"; - } + $public=1; + }else{ + $public=0; } - if (isset($public)) $public=1; - else $public=0; - if (! $error) { // email a peu pres correct et le login n'existe pas @@ -237,24 +232,20 @@ if ($action == 'add') } if ($backtopage) $urlback=$backtopage; - else if ($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION) - { - $urlback=$conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION; - // TODO Make replacement of __AMOUNT__, etc... - } + else if ($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION) $urlback=$conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION; else $urlback=$_SERVER["PHP_SELF"]."?action=added"; if (! empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) { if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox') { - $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref; + $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?source=membersubscription&ref='.$adh->ref; if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount')); if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email')); } else if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal') { - $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref; + $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=membersubscription&ref='.$adh->ref; if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount')); if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email')); } @@ -289,7 +280,7 @@ if ($action == 'added') print $langs->trans("NewMemberbyWeb"); print ''; - llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $'); + llxFooterVierge('$Date: 2011/07/13 10:22:54 $ - $Revision: 1.40 $'); exit; } @@ -459,7 +450,7 @@ print ''."\n"; if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) { $arraybudget=array('50'=>'<= 100 000','100'=>'<= 200 000','200'=>'<= 500 000','400'=>'<= 1 500 000','750'=>'<= 3 000 000','1500'=>'<= 5 000 000','2000'=>'5 000 000+'); - print ''."\n"; if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) { $arraybudget=array('50'=>'<= 100 000','100'=>'<= 200 000','200'=>'<= 500 000','400'=>'<= 1 500 000','750'=>'<= 3 000 000','1500'=>'<= 5 000 000','2000'=>'5 000 000+'); - print ''."\n"; -} +if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYBOX_NEWMEMBER_TEXT)."
\n"; if (empty($text)) { $text.=''."\n"; @@ -729,5 +723,5 @@ html_print_paybox_footer($mysoc,$langs); $db->close(); -llxFooterPayBox('$Date: 2011/07/13 12:03:30 $ - $Revision: 1.60 $'); +llxFooterPayBox('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.57 $'); ?> diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index 5215b3f9924..82fd23583a6 100755 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -23,7 +23,7 @@ * \ingroup paypal * \brief File to offer a way to make a payment for a particular Dolibarr entity * \author Laurent Destailleur - * \version $Id: newpayment.php,v 1.24 2011/07/13 12:00:18 eldy Exp $ + * \version $Id: newpayment.php,v 1.22 2011/07/13 11:14:43 eldy Exp $ */ define("NOLOGIN",1); // This means this output page does not require to be logged. @@ -282,12 +282,7 @@ if ($urllogo) // Output introduction text $text=''; -if (! empty($conf->global->PAYPAL_NEWFORM_TEXT)) -{ - $langs->load("members"); - if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."
\n"; - else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."
\n"; -} +if (! empty($conf->global->PAYPAL_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYPAL_NEWMEMBER_TEXT)."
\n"; if (empty($text)) { $text.=''."\n"; @@ -946,5 +941,5 @@ html_print_paypal_footer($mysoc,$langs); $db->close(); -llxFooterPaypal('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.24 $'); +llxFooterPaypal('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.22 $'); ?> From f5ddfbe7bf065b15298f21ba122aa125e9849c4a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 11:23:52 +0000 Subject: [PATCH 006/310] Setup menu visible by default if admin --- htdocs/includes/menus/init_menu_auguria.sql | 28 ++++++++++----------- htdocs/includes/menus/standard/eldy.lib.php | 26 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index fc98e29aa63..eabed5dfd26 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.121 2011/07/13 11:26:17 eldy Exp $ --- $Revision: 1.121 $ +-- $Id: init_menu_auguria.sql,v 1.120 2011/07/13 11:23:53 eldy Exp $ +-- $Revision: 1.120 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -24,18 +24,18 @@ insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', 13__+MAX_llx_menu__, __HANDLER__, 'top', 'members', '', 0, '/adherents/index.php?mainmenu=members&leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 15, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 100__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 0, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 2, 4, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php?leftmenu=setup', 'Modules', 1, 'admin', '', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?leftmenu=setup', 'Boxes', 1, 'admin', '', '', 2, 5, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 105__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/menus.php?leftmenu=setup', 'Menus', 1, 'admin', '', '', 2, 3, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 8, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 9, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\' && $conf->global->MAIN_FEATURES_LEVEL', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'Sms', 1, 'admin', '', '', 2, 9, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'DictionnarySetup', 1, 'admin', '', '', 2, 10, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 11, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 2, 4, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php?leftmenu=setup', 'Modules', 1, 'admin', '', '', 2, 2, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?leftmenu=setup', 'Boxes', 1, 'admin', '', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 105__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/menus.php?leftmenu=setup', 'Menus', 1, 'admin', '', '', 2, 3, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 6, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 8, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 9, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin && $conf->global->MAIN_FEATURES_LEVEL', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'Sms', 1, 'admin', '', '', 2, 9, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'DictionnarySetup', 1, 'admin', '', '', 2, 10, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 11, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 200__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/system/index.php?leftmenu=system', 'SystemInfo', 0, 'admin', '', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'system\'', __HANDLER__, 'left', 201__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/dolibarr.php?leftmenu=system', 'Dolibarr', 1, 'admin', '', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'system\'', __HANDLER__, 'left', 202__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/system/constall.php?leftmenu=system', 'AllParameters', 2, 'admin', '', '', 2, 1, __ENTITY__); diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 062f1f002a6..a3ccfd9a116 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.57 2011/07/13 11:26:17 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.56 2011/07/13 11:23:52 eldy Exp $ */ @@ -629,19 +629,19 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) $langs->load("help"); $newmenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup")); - if ($leftmenu=="setup") $newmenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1); - if ($leftmenu=="setup") $newmenu->add("/admin/modules.php", $langs->trans("Modules"),1); - if ($leftmenu=="setup") $newmenu->add("/admin/menus.php", $langs->trans("Menus"),1); - if ($leftmenu=="setup") $newmenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1); - if ($leftmenu=="setup") $newmenu->add("/admin/boxes.php", $langs->trans("Boxes"),1); - if ($leftmenu=="setup") $newmenu->add("/admin/delais.php",$langs->trans("Alerts"),1); + $newmenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1); + $newmenu->add("/admin/modules.php", $langs->trans("Modules"),1); + $newmenu->add("/admin/menus.php", $langs->trans("Menus"),1); + $newmenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1); + $newmenu->add("/admin/boxes.php", $langs->trans("Boxes"),1); + $newmenu->add("/admin/delais.php",$langs->trans("Alerts"),1); - if ($leftmenu=="setup") $newmenu->add("/admin/proxy.php", $langs->trans("Security"),1); - if ($leftmenu=="setup") $newmenu->add("/admin/limits.php", $langs->trans("MenuLimits"),1); - if ($leftmenu=="setup") $newmenu->add("/admin/mails.php", $langs->trans("Emails"),1); - if ($leftmenu=="setup" && $conf->global->MAIN_FEATURES_LEVEL) $newmenu->add("/admin/sms.php", $langs->trans("Sms"),1); - if ($leftmenu=="setup") $newmenu->add("/admin/dict.php", $langs->trans("DictionnarySetup"),1); - if ($leftmenu=="setup") $newmenu->add("/admin/const.php", $langs->trans("OtherSetup"),1); + $newmenu->add("/admin/proxy.php", $langs->trans("Security"),1); + $newmenu->add("/admin/limits.php", $langs->trans("MenuLimits"),1); + $newmenu->add("/admin/mails.php", $langs->trans("Emails"),1); + if ($conf->global->MAIN_FEATURES_LEVEL) $newmenu->add("/admin/sms.php", $langs->trans("Sms"),1); + $newmenu->add("/admin/dict.php", $langs->trans("DictionnarySetup"),1); + $newmenu->add("/admin/const.php", $langs->trans("OtherSetup"),1); $newmenu->add("/admin/system/index.php?leftmenu=system", $langs->trans("SystemInfo")); if ($leftmenu=="system") $newmenu->add("/admin/system/dolibarr.php", $langs->trans("Dolibarr"),1); From 5dbd45259989f81400f694fe38e6579f8a5826e5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 11:26:17 +0000 Subject: [PATCH 007/310] Setup menu visible by default if admin --- htdocs/includes/menus/init_menu_auguria.sql | 28 ++++++++++----------- htdocs/includes/menus/standard/eldy.lib.php | 26 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index eabed5dfd26..fc98e29aa63 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -1,6 +1,6 @@ -- --- $Id: init_menu_auguria.sql,v 1.120 2011/07/13 11:23:53 eldy Exp $ --- $Revision: 1.120 $ +-- $Id: init_menu_auguria.sql,v 1.121 2011/07/13 11:26:17 eldy Exp $ +-- $Revision: 1.121 $ -- -- Menu base entries -- This file is loaded when a menu handler base is activated (auguria, etc..) @@ -24,18 +24,18 @@ insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', 13__+MAX_llx_menu__, __HANDLER__, 'top', 'members', '', 0, '/adherents/index.php?mainmenu=members&leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 15, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 100__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 0, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 2, 4, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php?leftmenu=setup', 'Modules', 1, 'admin', '', '', 2, 2, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?leftmenu=setup', 'Boxes', 1, 'admin', '', '', 2, 5, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 105__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/menus.php?leftmenu=setup', 'Menus', 1, 'admin', '', '', 2, 3, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 6, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 8, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 9, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin && $conf->global->MAIN_FEATURES_LEVEL', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'Sms', 1, 'admin', '', '', 2, 9, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'DictionnarySetup', 1, 'admin', '', '', 2, 10, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 11, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 2, 4, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php?leftmenu=setup', 'Modules', 1, 'admin', '', '', 2, 2, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?leftmenu=setup', 'Boxes', 1, 'admin', '', '', 2, 5, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 105__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/menus.php?leftmenu=setup', 'Menus', 1, 'admin', '', '', 2, 3, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 6, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 8, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 9, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\' && $conf->global->MAIN_FEATURES_LEVEL', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'Sms', 1, 'admin', '', '', 2, 9, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'DictionnarySetup', 1, 'admin', '', '', 2, 10, __ENTITY__); +insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 11, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 200__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/system/index.php?leftmenu=system', 'SystemInfo', 0, 'admin', '', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'system\'', __HANDLER__, 'left', 201__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/dolibarr.php?leftmenu=system', 'Dolibarr', 1, 'admin', '', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'system\'', __HANDLER__, 'left', 202__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/system/constall.php?leftmenu=system', 'AllParameters', 2, 'admin', '', '', 2, 1, __ENTITY__); diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index a3ccfd9a116..062f1f002a6 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.56 2011/07/13 11:23:52 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.57 2011/07/13 11:26:17 eldy Exp $ */ @@ -629,19 +629,19 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) $langs->load("help"); $newmenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup")); - $newmenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1); - $newmenu->add("/admin/modules.php", $langs->trans("Modules"),1); - $newmenu->add("/admin/menus.php", $langs->trans("Menus"),1); - $newmenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1); - $newmenu->add("/admin/boxes.php", $langs->trans("Boxes"),1); - $newmenu->add("/admin/delais.php",$langs->trans("Alerts"),1); + if ($leftmenu=="setup") $newmenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1); + if ($leftmenu=="setup") $newmenu->add("/admin/modules.php", $langs->trans("Modules"),1); + if ($leftmenu=="setup") $newmenu->add("/admin/menus.php", $langs->trans("Menus"),1); + if ($leftmenu=="setup") $newmenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1); + if ($leftmenu=="setup") $newmenu->add("/admin/boxes.php", $langs->trans("Boxes"),1); + if ($leftmenu=="setup") $newmenu->add("/admin/delais.php",$langs->trans("Alerts"),1); - $newmenu->add("/admin/proxy.php", $langs->trans("Security"),1); - $newmenu->add("/admin/limits.php", $langs->trans("MenuLimits"),1); - $newmenu->add("/admin/mails.php", $langs->trans("Emails"),1); - if ($conf->global->MAIN_FEATURES_LEVEL) $newmenu->add("/admin/sms.php", $langs->trans("Sms"),1); - $newmenu->add("/admin/dict.php", $langs->trans("DictionnarySetup"),1); - $newmenu->add("/admin/const.php", $langs->trans("OtherSetup"),1); + if ($leftmenu=="setup") $newmenu->add("/admin/proxy.php", $langs->trans("Security"),1); + if ($leftmenu=="setup") $newmenu->add("/admin/limits.php", $langs->trans("MenuLimits"),1); + if ($leftmenu=="setup") $newmenu->add("/admin/mails.php", $langs->trans("Emails"),1); + if ($leftmenu=="setup" && $conf->global->MAIN_FEATURES_LEVEL) $newmenu->add("/admin/sms.php", $langs->trans("Sms"),1); + if ($leftmenu=="setup") $newmenu->add("/admin/dict.php", $langs->trans("DictionnarySetup"),1); + if ($leftmenu=="setup") $newmenu->add("/admin/const.php", $langs->trans("OtherSetup"),1); $newmenu->add("/admin/system/index.php?leftmenu=system", $langs->trans("SystemInfo")); if ($leftmenu=="system") $newmenu->add("/admin/system/dolibarr.php", $langs->trans("Dolibarr"),1); From f3bcffef94df0299c9c2aa83912fff7305335a03 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 11:42:39 +0000 Subject: [PATCH 008/310] Fix: Direct payment from autosubscribe form was showing wrong text. --- htdocs/langs/en_US/members.lang | 1 + htdocs/langs/fr_FR/members.lang | 1 + htdocs/public/paybox/newpayment.php | 11 ++++++++--- htdocs/public/paypal/newpayment.php | 11 ++++++++--- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 3e03924e697..935d02f67b4 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -193,3 +193,4 @@ Associations=Foundations Collectivités=Organizations Particuliers=Personal Entreprises=Companies +DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.

diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang index 95531c67c0e..4712ca76959 100644 --- a/htdocs/langs/fr_FR/members.lang +++ b/htdocs/langs/fr_FR/members.lang @@ -197,3 +197,4 @@ Associations=Associations Collectivités=Collectivités Particuliers=Particuliers Entreprises=Entreprises +DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page http://wiki.dolibarr.org/index.php/Adhérer.
Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.

diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index fdec201c31d..e27a2493369 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -23,7 +23,7 @@ * \ingroup paybox * \brief File to offer a way to make a payment for a particular Dolibarr entity * \author Laurent Destailleur - * \version $Id: newpayment.php,v 1.57 2011/07/13 11:14:43 eldy Exp $ + * \version $Id: newpayment.php,v 1.58 2011/07/13 11:42:39 eldy Exp $ */ define("NOLOGIN",1); // This means this output page does not require to be logged. @@ -188,7 +188,12 @@ if ($urllogo) // Output introduction text $text=''; -if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYBOX_NEWMEMBER_TEXT)."
\n"; +if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT)) +{ + $langs->load("members"); + if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."
\n"; + else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."
\n"; +} if (empty($text)) { $text.=''."\n"; @@ -723,5 +728,5 @@ html_print_paybox_footer($mysoc,$langs); $db->close(); -llxFooterPayBox('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.57 $'); +llxFooterPayBox('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.58 $'); ?> diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index 82fd23583a6..30001659341 100755 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -23,7 +23,7 @@ * \ingroup paypal * \brief File to offer a way to make a payment for a particular Dolibarr entity * \author Laurent Destailleur - * \version $Id: newpayment.php,v 1.22 2011/07/13 11:14:43 eldy Exp $ + * \version $Id: newpayment.php,v 1.23 2011/07/13 11:42:39 eldy Exp $ */ define("NOLOGIN",1); // This means this output page does not require to be logged. @@ -282,7 +282,12 @@ if ($urllogo) // Output introduction text $text=''; -if (! empty($conf->global->PAYPAL_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYPAL_NEWMEMBER_TEXT)."
\n"; +if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT)) +{ + $langs->load("members"); + if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."
\n"; + else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."
\n"; +} if (empty($text)) { $text.=''."\n"; @@ -941,5 +946,5 @@ html_print_paypal_footer($mysoc,$langs); $db->close(); -llxFooterPaypal('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.22 $'); +llxFooterPaypal('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.23 $'); ?> From 0309ffd2330121a8bcab9d2e965ce0c217443c5e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 11:50:33 +0000 Subject: [PATCH 009/310] Fix: Direct payment from autosubscribe form was showing wrong text. From 26667021c738020f148c30c265578a826f31da08 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 11:56:36 +0000 Subject: [PATCH 010/310] Fix: Message for payment forms --- htdocs/public/members/new.php | 8 ++++---- htdocs/public/paybox/newpayment.php | 10 +++++----- htdocs/public/paypal/newpayment.php | 11 ++++++----- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index d461137eaf6..f4d349046b0 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -22,7 +22,7 @@ * \file htdocs/public/members/new.php * \ingroup member * \brief Example of form to add a new member - * \version $Id: new.php,v 1.41 2011/07/13 11:14:43 eldy Exp $ + * \version $Id: new.php,v 1.42 2011/07/13 11:56:36 eldy Exp $ * * Note that you can add following constant to change behaviour of page * MEMBER_NEWFORM_AMOUNT Default amount for autosubscribe form @@ -184,7 +184,7 @@ if ($action == 'add') } if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) { - if (GETPOST('budget') <= 0) + if (GETPOST("morphy") == 'mor' && GETPOST('budget') <= 0) { $error+=1; $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."
\n"; @@ -289,7 +289,7 @@ if ($action == 'added') print $langs->trans("NewMemberbyWeb"); print ''; - llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $'); + llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $'); exit; } @@ -537,5 +537,5 @@ print "
\n"; $db->close(); -llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $'); +llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $'); ?> diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index e27a2493369..d87a7ed1051 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -23,7 +23,7 @@ * \ingroup paybox * \brief File to offer a way to make a payment for a particular Dolibarr entity * \author Laurent Destailleur - * \version $Id: newpayment.php,v 1.58 2011/07/13 11:42:39 eldy Exp $ + * \version $Id: newpayment.php,v 1.59 2011/07/13 12:00:18 eldy Exp $ */ define("NOLOGIN",1); // This means this output page does not require to be logged. @@ -188,11 +188,11 @@ if ($urllogo) // Output introduction text $text=''; -if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT)) +if (! empty($conf->global->PAYBOX_NEWFORM_TEXT)) { $langs->load("members"); - if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."
\n"; - else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."
\n"; + if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."
\n"; + else $text.=$conf->global->PAYBOX_NEWFORM_TEXT."
\n"; } if (empty($text)) { @@ -728,5 +728,5 @@ html_print_paybox_footer($mysoc,$langs); $db->close(); -llxFooterPayBox('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.58 $'); +llxFooterPayBox('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.59 $'); ?> diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index 30001659341..4b96c8075ea 100755 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -23,7 +23,7 @@ * \ingroup paypal * \brief File to offer a way to make a payment for a particular Dolibarr entity * \author Laurent Destailleur - * \version $Id: newpayment.php,v 1.23 2011/07/13 11:42:39 eldy Exp $ + * \version $Id: newpayment.php,v 1.25 2011/07/13 12:03:29 eldy Exp $ */ define("NOLOGIN",1); // This means this output page does not require to be logged. @@ -282,11 +282,12 @@ if ($urllogo) // Output introduction text $text=''; -if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT)) +if (! empty($conf->global->PAYPAL_NEWFORM_TEXT)) { $langs->load("members"); - if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."
\n"; - else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."
\n"; + if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."
\n"; + else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."
\n"; + $text=''."\n"; } if (empty($text)) { @@ -946,5 +947,5 @@ html_print_paypal_footer($mysoc,$langs); $db->close(); -llxFooterPaypal('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.23 $'); +llxFooterPaypal('$Date: 2011/07/13 12:03:29 $ - $Revision: 1.25 $'); ?> From f75a2b91f5f6de0a7c0f4c3959795ccab1b56dee Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 12:00:18 +0000 Subject: [PATCH 011/310] Fix: Message for payment forms --- htdocs/public/paypal/newpayment.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index 4b96c8075ea..5215b3f9924 100755 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -23,7 +23,7 @@ * \ingroup paypal * \brief File to offer a way to make a payment for a particular Dolibarr entity * \author Laurent Destailleur - * \version $Id: newpayment.php,v 1.25 2011/07/13 12:03:29 eldy Exp $ + * \version $Id: newpayment.php,v 1.24 2011/07/13 12:00:18 eldy Exp $ */ define("NOLOGIN",1); // This means this output page does not require to be logged. @@ -287,7 +287,6 @@ if (! empty($conf->global->PAYPAL_NEWFORM_TEXT)) $langs->load("members"); if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."
\n"; else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."
\n"; - $text=''."\n"; } if (empty($text)) { @@ -947,5 +946,5 @@ html_print_paypal_footer($mysoc,$langs); $db->close(); -llxFooterPaypal('$Date: 2011/07/13 12:03:29 $ - $Revision: 1.25 $'); +llxFooterPaypal('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.24 $'); ?> From a200750e74ce8d806d40aacb8ffcaa5bc028068b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 12:03:30 +0000 Subject: [PATCH 012/310] Fix: Message for payment forms --- htdocs/langs/en_US/members.lang | 2 +- htdocs/langs/fr_FR/members.lang | 2 +- htdocs/public/paybox/newpayment.php | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 935d02f67b4..9a38ecb5f11 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -193,4 +193,4 @@ Associations=Foundations Collectivités=Organizations Particuliers=Personal Entreprises=Companies -DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.

+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang index 4712ca76959..6d55546256d 100644 --- a/htdocs/langs/fr_FR/members.lang +++ b/htdocs/langs/fr_FR/members.lang @@ -197,4 +197,4 @@ Associations=Associations Collectivités=Collectivités Particuliers=Particuliers Entreprises=Entreprises -DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page http://wiki.dolibarr.org/index.php/Adhérer.
Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.

+DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page http://wiki.dolibarr.org/index.php/Adhérer.
Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index d87a7ed1051..9d405438673 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -23,7 +23,7 @@ * \ingroup paybox * \brief File to offer a way to make a payment for a particular Dolibarr entity * \author Laurent Destailleur - * \version $Id: newpayment.php,v 1.59 2011/07/13 12:00:18 eldy Exp $ + * \version $Id: newpayment.php,v 1.60 2011/07/13 12:03:30 eldy Exp $ */ define("NOLOGIN",1); // This means this output page does not require to be logged. @@ -193,6 +193,7 @@ if (! empty($conf->global->PAYBOX_NEWFORM_TEXT)) $langs->load("members"); if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."
\n"; else $text.=$conf->global->PAYBOX_NEWFORM_TEXT."
\n"; + $text=''."\n"; } if (empty($text)) { @@ -728,5 +729,5 @@ html_print_paybox_footer($mysoc,$langs); $db->close(); -llxFooterPayBox('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.59 $'); +llxFooterPayBox('$Date: 2011/07/13 12:03:30 $ - $Revision: 1.60 $'); ?> From e69957c88c814afef2f9ef2cf32365fbb169745b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 13:10:51 +0000 Subject: [PATCH 013/310] Fix: Trans From 2df7ac4460ece30226e24568332d085a506955a8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 13:15:17 +0000 Subject: [PATCH 014/310] Fix: No duplicate alt From 67d7b5d4eb31d15136d628dfed05671b6abee3f7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 14:03:15 +0000 Subject: [PATCH 015/310] Fix: Missing global From 0d309b5ce89a96c04cfe7a18bf65ed2314bbdf3f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 14:09:35 +0000 Subject: [PATCH 016/310] Fix: Bad var From 9365bea5691e87efe40794faabab89a0b3b3438f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 14:16:39 +0000 Subject: [PATCH 017/310] Doc From 0e11fd8e272caec353a10cbb9e94f02439df5a00 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 14:25:49 +0000 Subject: [PATCH 018/310] Fix: Cash account should be alos used to pay taxes From 8961767354bcdbde1654b9ff1016828b35d030f1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 14:41:02 +0000 Subject: [PATCH 019/310] Fix: No check box if no PDF --- htdocs/core/class/html.formfile.class.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index cfd46212a10..ab274743513 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -22,7 +22,7 @@ * \file htdocs/core/class/html.formfile.class.php * \ingroup core * \brief File of class to offer components to list and upload files - * \version $Id: html.formfile.class.php,v 1.48 2011/07/13 07:38:11 hregis Exp $ + * \version $Id: html.formfile.class.php,v 1.49 2011/07/13 14:41:03 eldy Exp $ */ @@ -152,6 +152,7 @@ class FormFile */ function show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hooks='') { + $this->numoffiles=0; print $this->showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$maxfilenamelength,$noform,$param,$title,$buttonlabel,$codelang,$hooks); return $this->numoffiles; } @@ -845,12 +846,12 @@ class FormFile print ''; print ''; print ''; - + print ''; - + print '
'; print '
'; - + print '
'.$langs->trans("Documents2").'
'.$langs->trans("TurnoverOrBudget").' *'; + print '
'.$langs->trans("TurnoverOrBudget").''; print $html->select_array('budget', $arraybudget, GETPOST('budget'), 1); print ' € or $'; @@ -537,5 +528,5 @@ print "
\n"; $db->close(); -llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $'); +llxFooterVierge('$Date: 2011/07/13 10:22:54 $ - $Revision: 1.40 $'); ?> From 691a4b4ef124b608845a387e656d81283a586414 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 10:23:05 +0000 Subject: [PATCH 004/310] Fix: Missing email --- htdocs/langs/en_US/members.lang | 1 - htdocs/langs/fr_FR/members.lang | 1 - 2 files changed, 2 deletions(-) diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 9a38ecb5f11..3e03924e697 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -193,4 +193,3 @@ Associations=Foundations Collectivités=Organizations Particuliers=Personal Entreprises=Companies -DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang index 6d55546256d..95531c67c0e 100644 --- a/htdocs/langs/fr_FR/members.lang +++ b/htdocs/langs/fr_FR/members.lang @@ -197,4 +197,3 @@ Associations=Associations Collectivités=Collectivités Particuliers=Particuliers Entreprises=Entreprises -DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page http://wiki.dolibarr.org/index.php/Adhérer.
Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.
From ccfffe672f330d6b03772ec2e6bf42bd33d11176 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 11:14:43 +0000 Subject: [PATCH 005/310] Fix: Message for payment forms --- htdocs/public/members/new.php | 31 +++++++++++++++++++---------- htdocs/public/paybox/newpayment.php | 12 +++-------- htdocs/public/paypal/newpayment.php | 11 +++------- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 035e8848da4..d461137eaf6 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -22,7 +22,7 @@ * \file htdocs/public/members/new.php * \ingroup member * \brief Example of form to add a new member - * \version $Id: new.php,v 1.40 2011/07/13 10:22:54 eldy Exp $ + * \version $Id: new.php,v 1.41 2011/07/13 11:14:43 eldy Exp $ * * Note that you can add following constant to change behaviour of page * MEMBER_NEWFORM_AMOUNT Default amount for autosubscribe form @@ -182,13 +182,18 @@ if ($action == 'add') $langs->load("errors"); $errmsg .= $langs->trans("ErrorBadDateFormat")."
\n"; } - if (isset($public)) + if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) { - $public=1; - }else{ - $public=0; + if (GETPOST('budget') <= 0) + { + $error+=1; + $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."
\n"; + } } + if (isset($public)) $public=1; + else $public=0; + if (! $error) { // email a peu pres correct et le login n'existe pas @@ -232,20 +237,24 @@ if ($action == 'add') } if ($backtopage) $urlback=$backtopage; - else if ($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION) $urlback=$conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION; + else if ($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION) + { + $urlback=$conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION; + // TODO Make replacement of __AMOUNT__, etc... + } else $urlback=$_SERVER["PHP_SELF"]."?action=added"; if (! empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) { if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox') { - $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?source=membersubscription&ref='.$adh->ref; + $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref; if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount')); if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email')); } else if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal') { - $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=membersubscription&ref='.$adh->ref; + $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref; if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount')); if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email')); } @@ -280,7 +289,7 @@ if ($action == 'added') print $langs->trans("NewMemberbyWeb"); print ''; - llxFooterVierge('$Date: 2011/07/13 10:22:54 $ - $Revision: 1.40 $'); + llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $'); exit; } @@ -450,7 +459,7 @@ print '
'.$langs->trans("TurnoverOrBudget").''; + print '
'.$langs->trans("TurnoverOrBudget").' *'; print $html->select_array('budget', $arraybudget, GETPOST('budget'), 1); print ' € or $'; @@ -528,5 +537,5 @@ print "
\n"; $db->close(); -llxFooterVierge('$Date: 2011/07/13 10:22:54 $ - $Revision: 1.40 $'); +llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $'); ?> diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index 9d405438673..fdec201c31d 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -23,7 +23,7 @@ * \ingroup paybox * \brief File to offer a way to make a payment for a particular Dolibarr entity * \author Laurent Destailleur - * \version $Id: newpayment.php,v 1.60 2011/07/13 12:03:30 eldy Exp $ + * \version $Id: newpayment.php,v 1.57 2011/07/13 11:14:43 eldy Exp $ */ define("NOLOGIN",1); // This means this output page does not require to be logged. @@ -188,13 +188,7 @@ if ($urllogo) // Output introduction text $text=''; -if (! empty($conf->global->PAYBOX_NEWFORM_TEXT)) -{ - $langs->load("members"); - if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."
\n"; - else $text.=$conf->global->PAYBOX_NEWFORM_TEXT."
\n"; - $text='

'.$text.'

'.$langs->trans("WelcomeOnPaymentPage").'

'.$langs->trans("WelcomeOnPaymentPage").'

'.$langs->trans("WelcomeOnPaymentPage").'

'.$langs->trans("WelcomeOnPaymentPage").'

'.$text.'

'.$text.'

'.$text.'
'; /*print ''; print ''; From ac464523ceb6c81fe31966d378430a41cf2726da Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 15:25:21 +0000 Subject: [PATCH 020/310] Doc From 378973f9f6e085b26c595434cb3adccf392ab91f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 16:24:57 +0000 Subject: [PATCH 021/310] New: Add cancel button on note edit From 1ed0cd24638d771ee62f8812fbb4df862c95a880 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 16:55:25 +0000 Subject: [PATCH 022/310] Fix: Avoid conflict with other payment modules functions New: EMail topics can be forced by external modules --- htdocs/core/class/html.formmail.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 4b32e65ea54..6ca8f1e007f 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -22,7 +22,7 @@ * \file htdocs/core/class/html.formmail.class.php * \ingroup core * \brief Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire - * \version $Id: html.formmail.class.php,v 1.33 2011/07/13 22:18:12 eldy Exp $ + * \version $Id: html.formmail.class.php,v 1.32 2011/07/13 16:55:25 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php"); @@ -505,7 +505,7 @@ class FormMail $out.= ''; $out.= ''; $out.= '
'.$langs->trans("Documents2").'
'.$langs->trans("MailFile").''; - // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript + // FIXME Trick to have param removedfile containing nb of image to delete. But this does not works without javascript $out.= ''."\n"; $out.= '