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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2018-03-11 23:08:10 +01:00
commit f1f539d2a7
5 changed files with 31 additions and 43 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( dol_fiche_head(
$head, $head,
'settings', 'settings',
$langs->trans("Module110120Name"), $langs->trans("Module56000Name"),
0, 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>'; 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 // Email d'envoi des notifications
print '<tr class="pair"><td>' . $langs->trans("TicketEmailNotificationFrom") . '</td>'; print '<tr class="pair"><td>' . $langs->trans("TicketEmailNotificationFrom") . '</td>';
print '<td align="left">'; 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 '<td align="center">';
print $form->textwithpicto('', $langs->trans("TicketEmailNotificationFromHelp"), 1, 'help'); print $form->textwithpicto('', $langs->trans("TicketEmailNotificationFromHelp"), 1, 'help');
print '</td>'; 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/class/extrafields.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
$langs->load("ticketsup@ticketsup"); $langs->load("ticketsup");
$langs->load("admin"); $langs->load("admin");
$extrafields = new ExtraFields($db); $extrafields = new ExtraFields($db);
@ -50,11 +50,7 @@ if (!$user->admin) {
/* /*
* Actions * Actions
*/ */
if (versioncompare(versiondolibarrarray(), array(3, 5, 0)) > 0) { include DOL_DOCUMENT_ROOT . '/core/actions_extrafields.inc.php';
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';
}
/* /*
* View * View
@ -74,9 +70,9 @@ $head = ticketsupAdminPrepareHead();
dol_fiche_head( dol_fiche_head(
$head, $head,
'attributes', 'attributes',
$langs->trans("Module110120Name"), $langs->trans("Module56000Name"),
0, 0,
"ticketsup@ticketsup" "ticketsup"
); );
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';

10
htdocs/commande/card.php
View File

@ -56,15 +56,7 @@ if (!empty($conf->variants->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php'; require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
} }
$langs->load('orders'); $langs->loadLangs(array('orders','sendings','companies','bills','propal','deliveries','products','other'));
$langs->load('sendings');
$langs->load('companies');
$langs->load('bills');
$langs->load('propal');
$langs->load('deliveries');
$langs->load('sendings');
$langs->load('products');
$langs->load('other');
if (!empty($conf->incoterm->enabled)) $langs->load('incoterm'); if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
if (! empty($conf->margin->enabled)) $langs->load('margins'); if (! empty($conf->margin->enabled)) $langs->load('margins');
if (! empty($conf->productbatch->enabled)) $langs->load("productbatch"); if (! empty($conf->productbatch->enabled)) $langs->load("productbatch");

6
htdocs/core/class/html.formticketsup.class.php
View File

@ -499,7 +499,7 @@ class FormTicketsup
} }
print '</select>'; print '</select>';
if ($user->admin && !$noadmininfo) { if ($user->admin && !$noadmininfo) {
print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"), 1); print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
} }
} }
@ -597,7 +597,7 @@ class FormTicketsup
} }
print '</select>'; print '</select>';
if ($user->admin && !$noadmininfo) { if ($user->admin && !$noadmininfo) {
print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"), 1); print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
} }
} }
@ -694,7 +694,7 @@ class FormTicketsup
} }
print '</select>'; print '</select>';
if ($user->admin && !$noadmininfo) { if ($user->admin && !$noadmininfo) {
print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"), 1); print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
} }
} }

40
htdocs/langs/en_US/ticketsup.lang
View File

@ -18,14 +18,14 @@
# Generic # Generic
# #
Module110120Name = Tickets Module56000Name=Tickets
Module110120Desc = Ticket system for incident management Module56000Desc=Ticket system for incident management
Permission110121=See tickets Permission56001=See tickets
Permission110122=Modify tickets Permission56002=Modify tickets
Permission110123=Delete tickets Permission56003=Delete tickets
Permission110124=Manage tickets Permission56004=Manage tickets
Permission110125=See tickets of all thirdparties (not effective for external users, always be limited to the thirdparty they depend on) Permission56005=See tickets of all thirdparties (not effective for external users, always be limited to the thirdparty they depend on)
TicketsupDictType=Tickets type TicketsupDictType=Tickets type
TicketsupDictCategory=Tickets categories TicketsupDictCategory=Tickets categories
@ -70,22 +70,22 @@ Category=Category
Severity=Severity Severity=Severity
# Email templates # Email templates
MailToSendTicketsupMessage = To send email from ticket message MailToSendTicketsupMessage=To send email from ticket message
# #
# Admin page # Admin page
# #
TicketsupSetup = Ticket module setup TicketsupSetup=Ticket module setup
TicketSupSettings = Settings TicketSupSettings=Settings
TicketsupSetupPage = TicketsupSetupPage=
TicketsupPublicAccess = A public interface requiring no identification is available at the following url TicketsupPublicAccess=A public interface requiring no identification is available at the following url
TicketsupSetupDictionaries = The type of application categories and severity level are configurable from dictionaries TicketsupSetupDictionaries=The type of application categories and severity level are configurable from dictionaries
TicketParamModule=Module variable setup TicketParamModule=Module variable setup
TicketParamMail=Email setup TicketParamMail=Email setup
TicketEmailNotificationFrom = Notification email from TicketEmailNotificationFrom=Notification email from
TicketEmailNotificationFromHelp = Used into ticket message answer by example TicketEmailNotificationFromHelp=Used into ticket message answer by example
TicketEmailNotificationTo = Notifications email to TicketEmailNotificationTo=Notifications email to
TicketEmailNotificationToHelp = Send email notifications to this address. TicketEmailNotificationToHelp=Send email notifications to this address.
TicketNewEmailBodyLabel=Text message sent after creating a ticket (public interface) TicketNewEmailBodyLabel=Text message sent after creating a ticket (public interface)
TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added. TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
TicketParamPublicInterface=Public interface setup TicketParamPublicInterface=Public interface setup
@ -128,9 +128,9 @@ TicketNotNotifyTiersAtCreate=Do not notify the company to the creation
# #
# About page # About page
# #
About = About About=About
TicketSupAbout = About ticket module TicketSupAbout=About ticket module
TicketSupAboutModule = The development of this module has been initiated by the company Libr&thic. TicketSupAboutModule=The development of this module has been initiated by the company Libr&thic.
TicketSupAboutModuleHelp=You can get help by using the contact form on the website <a href="http://librethic.io">librethic.io</a> TicketSupAboutModuleHelp=You can get help by using the contact form on the website <a href="http://librethic.io">librethic.io</a>
TicketSupAboutModuleImprove=Feel free to suggest improvements! Please visit <a href="https://code.librethic.io/Dolibarr/modules/ticketsup">the project page</a> on Doliforge website to report bugs and add tasks. TicketSupAboutModuleImprove=Feel free to suggest improvements! Please visit <a href="https://code.librethic.io/Dolibarr/modules/ticketsup">the project page</a> on Doliforge website to report bugs and add tasks.
TicketSupAboutModuleThanks=Thanks to <a href="http://sayatnowa.com">nwa</a> who creates icons for this module./ TicketSupAboutModuleThanks=Thanks to <a href="http://sayatnowa.com">nwa</a> who creates icons for this module./