diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 359d30865b7..5600f51f5e2 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1274,7 +1274,7 @@ class FormTicket
if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
if (!empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit'])) {
foreach ($this->param['fileinit'] as $file) {
- $this->add_attached_files($file, basename($file), dol_mimetype($file));
+ $formmail->add_attached_files($file, basename($file), dol_mimetype($file));
}
}
}
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index a9488e30672..ce791613bcb 100755
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -205,7 +205,7 @@ if (empty($reshook)) {
$fk_user_assign = GETPOST("fk_user_assign", 'int');
if ($fk_user_assign > 0) {
$object->fk_user_assign = $fk_user_assign;
- $object->fk_statut = $object::STATUS_ASSIGNED;
+ $object->fk_status = $object::STATUS_ASSIGNED;
}
$object->fk_project = $projectid;
@@ -285,7 +285,7 @@ if (empty($reshook)) {
}
}
- if ($action == 'update' && $user->rights->ticket->write && $object->fk_statut < Ticket::STATUS_CLOSED) {
+ if ($action == 'update' && $user->rights->ticket->write && $object->fk_status < Ticket::STATUS_CLOSED) {
$error = 0;
$ret = $object->fetch(GETPOST('id', 'int'), GETPOST('ref', 'alpha'), GETPOST('track_id', 'alpha'));
@@ -543,7 +543,7 @@ if (empty($reshook)) {
if ($action == 'confirm_reopen' && $user->rights->ticket->manage && !GETPOST('cancel')) {
if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
// prevent browser refresh from reopening ticket several times
- if ($object->fk_statut == Ticket::STATUS_CLOSED || $object->fk_statut == Ticket::STATUS_CANCELED) {
+ if ($object->fk_status == Ticket::STATUS_CLOSED || $object->fk_status == Ticket::STATUS_CANCELED) {
$res = $object->setStatut(Ticket::STATUS_ASSIGNED);
if ($res) {
// Log action in ticket logs table
@@ -602,7 +602,7 @@ if (empty($reshook)) {
// Reopen ticket
if ($object->fetch(GETPOST('id', 'int'), GETPOST('track_id', 'alpha')) >= 0) {
$new_status = GETPOST('new_status', 'int');
- $old_status = $object->fk_statut;
+ $old_status = $object->fk_status;
$res = $object->setStatut($new_status);
if ($res) {
// Log action in ticket logs table
@@ -721,7 +721,7 @@ if ($action == 'create' || $action == 'presend') {
$formticket->withcancel = 1;
$formticket->showForm(1, 'create', 0);
- /*} elseif ($action == 'edit' && $user->rights->ticket->write && $object->fk_statut < Ticket::STATUS_CLOSED) {
+ /*} elseif ($action == 'edit' && $user->rights->ticket->write && $object->fk_status < Ticket::STATUS_CLOSED) {
$formticket = new FormTicket($db);
$head = ticket_prepare_head($object);
@@ -934,7 +934,7 @@ if ($action == 'create' || $action == 'presend') {
// Thirdparty
if (!empty($conf->societe->enabled)) {
$morehtmlref .= '
'.$langs->trans('ThirdParty').' ';
- if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
+ if ($action != 'editcustomer' && $object->fk_status < 8 && !$user->socid && $user->rights->ticket->write) {
$morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('Edit'), 0).' : ';
}
if ($action == 'editcustomer') {
@@ -1034,7 +1034,7 @@ if ($action == 'create' || $action == 'presend') {
print '
| '; print $langs->trans("AssignedTo"); - if ($object->fk_statut < $object::STATUS_CLOSED && GETPOST('set', 'alpha') != "assign_ticket" && $user->rights->ticket->manage) { + if ($object->fk_status < $object::STATUS_CLOSED && GETPOST('set', 'alpha') != "assign_ticket" && $user->rights->ticket->manage) { print ' | '.img_edit($langs->trans('Modify'), '').''; } print ' |