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

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

Browse Source 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/ticket.lang
This commit is contained in:
Laurent Destailleur 2019-11-26 11:54:42 +01:00
commit 4ef6c9cc13
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/html.formticket.class.php
View File

@ -421,14 +421,13 @@ class FormTicket
if ($withdolfichehead) dol_fiche_end(); if ($withdolfichehead) dol_fiche_end();
print '<br><center>'; print '<div class="center">';
print '<input class="button" type="submit" name="add" value="'.$langs->trans(($this->withthreadid > 0 ? "SendResponse" : "NewTicket")).'" />'; print '<input class="button" type="submit" name="add" value="'.$langs->trans(($this->withthreadid > 0 ? "SendResponse" : "NewTicket")).'" />';
if ($this->withcancel) { if ($this->withcancel) {
print " &nbsp; &nbsp; "; print " &nbsp; &nbsp; &nbsp;";
print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"".$langs->trans("Cancel")."\">"; print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"".$langs->trans("Cancel")."\">";
} }
print "</center>\n"; print '</div>';
print "</form>\n"; print "</form>\n";
print "<!-- End form TICKET -->\n"; print "<!-- End form TICKET -->\n";

1
htdocs/langs/en_US/ticket.lang
View File

@ -33,6 +33,7 @@ TicketDictSeverity=Ticket - Severities
TicketTypeShortBUGSOFT=Dysfonctionnement logiciel TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
TicketTypeShortBUGHARD=Dysfonctionnement matériel TicketTypeShortBUGHARD=Dysfonctionnement matériel
TicketTypeShortCOM=Commercial question TicketTypeShortCOM=Commercial question
TicketTypeShortHELP=Request for functionnal help TicketTypeShortHELP=Request for functionnal help
TicketTypeShortISSUE=Issue, bug or problem TicketTypeShortISSUE=Issue, bug or problem
TicketTypeShortREQUEST=Change or enhancement request TicketTypeShortREQUEST=Change or enhancement request

3
htdocs/public/ticket/create_ticket.php
View File

@ -53,7 +53,6 @@ $extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($object->table_element); $extrafields->fetch_name_optionals_label($object->table_element);
/* /*
* Actions * Actions
*/ */
@ -358,7 +357,7 @@ if ($action != "infos_success") {
$formticket->withfile = 2; $formticket->withfile = 2;
$formticket->action = 'create_ticket'; $formticket->action = 'create_ticket';
$formticket->param = array('returnurl' => $_SERVER['PHP_SELF']); $formticket->param = array('returnurl' => $_SERVER['PHP_SELF'].($conf->entity > 1 ? '?entity='.$conf->entity : ''));
if (empty($defaultref)) { if (empty($defaultref)) {
$defaultref = ''; $defaultref = '';