From 5cac54b2e1bdcca80f912ea54b2b8825e1b9c514 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 20 Jan 2020 18:46:13 +0100 Subject: [PATCH] Doc --- ChangeLog | 1 + htdocs/admin/mails.php | 2 +- htdocs/core/lib/admin.lib.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49bb05ea2c0..6980edf4e6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ NEW: Add button "Save and Stay" in website editor of pages. NEW: Accountancy - Can add specific widget in this accountancy area. NEW: Accountancy - Add export model LDCompta V9 & higher NEW: Accountancy - Add permission on export, delete operations in ledger +NEW: Can defined alternative profiles (email and signatures) for users. NEW: add ability to edit price without tax before adding a line of a predefined product. NEW: Add a tab to setup "Opening hours" of company (information only). NEW: Add attendee to ical export + cleanup. diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 5d80d5d9ec2..2e03eed937c 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2007-2020 Laurent Destailleur * Copyright (C) 2009-2012 Regis Houssin * Copyright (C) 2013 Juanjo Menent * Copyright (C) 2016 Jonathan TISSEAU diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index 96ae3bc667e..2433f284a2c 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -1818,7 +1818,7 @@ function email_admin_prepare_head() $head[$h][2] = 'templates'; $h++; - if ($conf->global->MAIN_FEATURES_LEVEL >= 1 && !empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) + if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) { $head[$h][0] = DOL_URL_ROOT."/admin/mails_senderprofile_list.php"; $head[$h][1] = $langs->trans("EmailSenderProfiles");