Merge pull request #8353 from frederic34/patch-8

Update ticketsup.php
Dolibarr · Mar 11, 2018 · b965240 · b965240
2 parents 6d7b7ad + ad05ddf
commit b965240
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/htdocs/admin/ticketsup.php b/htdocs/admin/ticketsup.php
@@ -235,9 +235,9 @@
 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 @@
 // 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>';

diff --git a/htdocs/admin/ticketsup_extrafields.php b/htdocs/admin/ticketsup_extrafields.php
@@ -26,7 +26,7 @@
 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 @@
 /*
  * 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 @@
 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';