diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index 511528036c5..9c45d29cf79 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -48,7 +48,7 @@ $thirdpartytmp = new Societe($db);
$modBarCodeProduct = '';
$modBarCodeThirdparty = '';
-$maxperinit = 1000;
+$maxperinit = empty($conf->global->BARCODE_INIT_MAX) ? 1000 : $conf->global->BARCODE_INIT_MAX;
// Security check (enable the most restrictive one)
//if ($user->socid > 0) accessforbidden();
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index c7e5706c6fc..329c9473cc7 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -374,7 +374,7 @@ if ($cats < 0) {
dol_print_error($db, $object->error, $object->errors);
} elseif (count($cats) < 1) {
print '
';
- print '| '.$langs->trans("NoSubCat").' | ';
+ print ''.$langs->trans("NoSubCat").' | ';
print '
';
} else {
$categstatic = new Categorie($db);
@@ -461,7 +461,7 @@ if ($cats < 0) {
print '';
print '| '.img_picto_common('', 'treemenu/branchbottom.gif').' | ';
- print ''.$langs->trans("NoCategoryYet").' | ';
+ print ''.$langs->trans("NoCategoryYet").' | ';
print ' | ';
print '
';
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 3dc618c36ab..82b5f9840bf 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -146,9 +146,10 @@ class FormTicket
* @param string $mode Mode ('create' or 'edit')
* @param int $public 1=If we show the form for the public interface
* @param Contact|null $with_contact [=NULL] Contact to link to this ticket if exists
+ * @param string $action [=''] Action in card
* @return void
*/
- public function showForm($withdolfichehead = 0, $mode = 'edit', $public = 0, Contact $with_contact = null)
+ public function showForm($withdolfichehead = 0, $mode = 'edit', $public = 0, Contact $with_contact = null, $action = '')
{
global $conf, $langs, $user, $hookmanager;
@@ -636,7 +637,7 @@ class FormTicket
// Other attributes
$parameters = array();
- $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $ticketstat, $this->action); // Note that $action and $object may have been modified by hook
+ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $ticketstat, $action); // Note that $action and $object may have been modified by hook
if (empty($reshook)) {
print $ticketstat->showOptionals($extrafields, 'create');
}
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 47f793f71ae..c40f8d91da7 100755
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -739,7 +739,7 @@ if ($action == 'create' || $action == 'presend') {
$formticket->withcancel = 1;
- $formticket->showForm(1, 'create', 0);
+ $formticket->showForm(1, 'create', 0, null, $action);
/*} elseif ($action == 'edit' && $user->rights->ticket->write && $object->status < Ticket::STATUS_CLOSED) {
$formticket = new FormTicket($db);