diff --git a/ChangeLog b/ChangeLog index 790883386d4..41af2f8ab27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ The following changes may create regressions for some external modules, but were * The deprecated variable $trigger_name (duplicate of variable $triggersendname) has been removed. You must use $triggersendname everywhere now. * The behavior of constant STOCK_ALLOW_NEGATIVE_TRANSFER has been reversed. It has been renamed to STOCK_DISALLOW_NEGATIVE_TRANSFER. * Method Categoie->getObjectsInCateg() is deprecated. Try by using instead getListForItem() or containing(). +* Global variable $bctag and $conffiletoshowshort has been removed. ***** ChangeLog for 21.0.0 compared to 20.0 ***** diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php index 84d706f57b4..e577d87c365 100644 --- a/htdocs/admin/mailing.php +++ b/htdocs/admin/mailing.php @@ -210,25 +210,18 @@ print ''; print ''; // Limit number for each mailing batch, displayed only if this value is not defined in the conf.php file +print ''; +$help = img_help(1, $langs->trans("MailingNumberOfEmailsPerBatchHelp")); +print '' . $langs->trans("MailingNumberOfEmailsPerBatch") . ' ' . $help . ''; +print ''; if (empty($conf->file->mailing_limit_sendbyweb)) { - print ''; - $help = img_help(1, $langs->trans("MailingNumberOfEmailsPerBatchHelp")); - print '' . $langs->trans("MailingNumberOfEmailsPerBatch") . ' ' . $help . ''; - print ''; - print ''; - print ''; - print ''; - print ''; -} - -if (!empty($conf->use_javascript_ajax) && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1) { - print ''; - print $langs->trans("MailAdvTargetRecipients") . ''; - print ajax_constantonoff('EMAILING_USE_ADVANCED_SELECTOR'); - print ''; - print ''; - print ''; + print ''; +} else { + print $conf->file->mailing_limit_sendbyweb; } +print ''; +print ''; +print ''; print ''; diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index f64332ba50a..d4bbfec2321 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -37,16 +37,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; -' -@phan-var-force array{0:string,1:string} $bctag From main.inc -'; /** * @var Conf $conf * @var DoliDB $db * @var HookManager $hookmanager * @var Translate $langs * @var User $user - * @var array{0:string,1:string} $bctag From main.inc */ // Load translation files required by the page @@ -591,15 +587,13 @@ if ($object->fetch($id) >= 0) { // If module is qualified if ($qualified) { - $var = !$var; - if ($allowaddtarget) { - print '
'; + print ''; print ''; print ''; print ''; } else { - print '
'; + print '
'; } print '
'; diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 8c283e44236..6131b4414ce 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -1294,6 +1294,10 @@ class Conf extends stdClass $this->global->MAIL_SMTP_USE_FROM_FOR_HELO = 2; // Use the domain in $dolibarr_main_url_root (mydomain.com) } + if (!empty($this->use_javascript_ajax) && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1) { + $this->global->EMAILING_USE_ADVANCED_SELECTOR = 1; + } + // Security if (!defined('MAIN_ANTIVIRUS_BYPASS_COMMAND_AND_PARAM')) { if (defined('MAIN_ANTIVIRUS_COMMAND')) { diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 9121b7e2008..636d1bd4354 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1247,7 +1247,6 @@ if (!defined('NOREQUIRETRAN')) { $bc = array(0 => 'class="impair"', 1 => 'class="pair"'); $bcdd = array(0 => 'class="drag drop oddeven"', 1 => 'class="drag drop oddeven"'); $bcnd = array(0 => 'class="nodrag nodrop nohover"', 1 => 'class="nodrag nodrop nohoverpair"'); // Used for tr to add new lines -$bctag = array(0 => 'class="impair tagtr"', 1 => 'class="pair tagtr"'); // Define messages variables $mesg = ''; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index a6187c229e0..75b107f8438 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -4814,9 +4814,6 @@ tr.pair td, tr.impair td, form.impair div.tagtd, form.pair div.tagtd, div.impair padding: 7px 8px 7px 8px; border-bottom: 1px solid #ddd; } -form.pair, form.impair { - font-weight: normal; -} form.tagtr:last-of-type div.tagtd, tr.pair:last-of-type td, tr.impair:last-of-type td { border-bottom: 0px !important; }