lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8353 from frederic34/patch-8

Browse Source 
Update ticketsup.php
This commit is contained in:
Laurent Destailleur 2018-03-11 23:03:45 +01:00 committed by GitHub
commit b965240439
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/ticketsup.php
View File

@ -235,9 +235,9 @@ $head = ticketsupAdminPrepareHead();
dol_fiche_head(
$head,
'settings',
$langs->trans("Module110120Name"),
$langs->trans("Module56000Name"),
0,
"ticketsup@ticketsup"
"ticketsup"
);
print '<div class="info"><p>' . $langs->trans("TicketsupSetupDictionaries") . ' : <a href="' . dol_buildpath('/admin/dict.php', 1) . '" >' . dol_buildpath('/admin/dict.php', 2) . '</a></p></div>';
@ -546,7 +546,7 @@ if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
// Email d'envoi des notifications
print '<tr class="pair"><td>' . $langs->trans("TicketEmailNotificationFrom") . '</td>';
print '<td align="left">';
print '<input type="text" name="TICKETS_NOTIFICATION_EMAIL_FROM" value="' . $conf->global->TICKETS_NOTIFICATION_EMAIL_FROM . '" size="20" ></td>';
print '<input type="text" name="TICKETS_NOTIFICATION_EMAIL_FROM" value="' . $conf->global->TICKETS_NOTIFICATION_EMAIL_FROM . '" size="20" ></td>';
print '<td align="center">';
print $form->textwithpicto('', $langs->trans("TicketEmailNotificationFromHelp"), 1, 'help');
print '</td>';

12
htdocs/admin/ticketsup_extrafields.php
View File

@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/ticketsup.lib.php";
require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
$langs->load("ticketsup@ticketsup");
$langs->load("ticketsup");
$langs->load("admin");
$extrafields = new ExtraFields($db);
@ -50,11 +50,7 @@ if (!$user->admin) {
/*
* Actions
*/
if (versioncompare(versiondolibarrarray(), array(3, 5, 0)) > 0) {
include DOL_DOCUMENT_ROOT . '/core/actions_extrafields.inc.php';
} elseif (versioncompare(versiondolibarrarray(), array(3, 4, 0)) > 0) {
include DOL_DOCUMENT_ROOT . '/core/admin_extrafields.inc.php';
}
include DOL_DOCUMENT_ROOT . '/core/actions_extrafields.inc.php';
/*
* View
@ -74,9 +70,9 @@ $head = ticketsupAdminPrepareHead();
dol_fiche_head(
$head,
'attributes',
$langs->trans("Module110120Name"),
$langs->trans("Module56000Name"),
0,
"ticketsup@ticketsup"
"ticketsup"
);
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';