From 4bc0a6db2d0bcf68b6d99d341aa38f1f238ee237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 16 Oct 2019 22:56:29 +0200 Subject: [PATCH 1/6] Update html.formticket.class.php --- htdocs/core/class/html.formticket.class.php | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php index 8d0c45bbb41..87b9d1fcb99 100644 --- a/htdocs/core/class/html.formticket.class.php +++ b/htdocs/core/class/html.formticket.class.php @@ -67,6 +67,7 @@ class FormTicket public $withsubstit; public $withfile; + public $withfilereadonly; public $ispublic; // To show information or not into public form @@ -374,7 +375,7 @@ class FormTicket $listofmimes = explode(';', $_SESSION["listofmimes"]); } - $out .= ''; + $out = ''; $out .= '' . $langs->trans("MailFile") . ''; $out .= ''; // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript @@ -409,7 +410,8 @@ class FormTicket } // Other attributes - $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $ticketstat, $action); // Note that $action and $object may have been modified by hook + $parameters = array(); + $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $ticketstat, $this->action); // Note that $action and $object may have been modified by hook if (empty($reshook)) { print $ticketstat->showOptionals($extrafields, 'edit'); @@ -504,23 +506,18 @@ class FormTicket } print '>'; + $value = ' '; if ($format == 0) { $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']); - } - - if ($format == 1) { + } elseif ($format == 1) { $value = $arraytypes['code']; - } - - if ($format == 2) { + } elseif ($format == 2) { $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']); - } - - if ($format == 3) { + } elseif ($format == 3) { $value = $arraytypes['code']; } - print $value ? $value : ' '; + print $value; print ''; } } From 701afc99e9c6710ba2f22425e86f9d6f654f75a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 16 Oct 2019 23:03:59 +0200 Subject: [PATCH 2/6] Update html.formticket.class.php --- htdocs/core/class/html.formticket.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php index 87b9d1fcb99..c46f6ed0f7c 100644 --- a/htdocs/core/class/html.formticket.class.php +++ b/htdocs/core/class/html.formticket.class.php @@ -76,6 +76,7 @@ class FormTicket public $withfromsocid; public $withfromcontactid; public $withnotnotifytiersatcreate; + public $withnotifytiersatcreate; public $withusercreate; // Show name of creating user in form public $withcreatereadonly; From 219a4b437412e1f5d2596dab12cf2f13e17ea2a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 16 Oct 2019 23:08:04 +0200 Subject: [PATCH 3/6] Update html.formticket.class.php --- htdocs/core/class/html.formticket.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php index c46f6ed0f7c..87b9d1fcb99 100644 --- a/htdocs/core/class/html.formticket.class.php +++ b/htdocs/core/class/html.formticket.class.php @@ -76,7 +76,6 @@ class FormTicket public $withfromsocid; public $withfromcontactid; public $withnotnotifytiersatcreate; - public $withnotifytiersatcreate; public $withusercreate; // Show name of creating user in form public $withcreatereadonly; From be72b90aa9b0956ad2b7c81d33bcc07f693deb97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 16 Oct 2019 23:09:17 +0200 Subject: [PATCH 4/6] Update card.php --- htdocs/ticket/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index eec2c813d26..cfbdf5ee4e1 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -625,7 +625,7 @@ if ($action == 'create' || $action == 'presend') $formticket->withfromsocid = $socid ? $socid : $user->societe_id; $formticket->withfromcontactid = $contactid ? $contactid : ''; $formticket->withtitletopic = 1; - $formticket->withnotifytiersatcreate = ($notifyTiers?1:0); + $formticket->withnotnotifytiersatcreate = ($notifyTiers?1:0); $formticket->withusercreate = 1; $formticket->withref = 1; $formticket->fk_user_create = $user->id; From d0e5c8cb3519d9cbbe1699b818b31c8f8b018e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 16 Oct 2019 23:16:59 +0200 Subject: [PATCH 5/6] Update card.php --- htdocs/ticket/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index cfbdf5ee4e1..eec2c813d26 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -625,7 +625,7 @@ if ($action == 'create' || $action == 'presend') $formticket->withfromsocid = $socid ? $socid : $user->societe_id; $formticket->withfromcontactid = $contactid ? $contactid : ''; $formticket->withtitletopic = 1; - $formticket->withnotnotifytiersatcreate = ($notifyTiers?1:0); + $formticket->withnotifytiersatcreate = ($notifyTiers?1:0); $formticket->withusercreate = 1; $formticket->withref = 1; $formticket->fk_user_create = $user->id; From 46d2bf331724980b8f60a35b910cdecd232b0a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 16 Oct 2019 23:18:14 +0200 Subject: [PATCH 6/6] Update html.formticket.class.php --- htdocs/core/class/html.formticket.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php index 87b9d1fcb99..b83da89e277 100644 --- a/htdocs/core/class/html.formticket.class.php +++ b/htdocs/core/class/html.formticket.class.php @@ -75,7 +75,7 @@ class FormTicket public $withcompany; // affiche liste déroulante company public $withfromsocid; public $withfromcontactid; - public $withnotnotifytiersatcreate; + public $withnotifytiersatcreate; public $withusercreate; // Show name of creating user in form public $withcreatereadonly; @@ -112,7 +112,7 @@ class FormTicket $this->withfromcontactid = 0; //$this->withthreadid=0; //$this->withtitletopic=''; - $this->withnotnotifytiersatcreate = 0; + $this->withnotifytiersatcreate = 0; $this->withusercreate = 1; $this->withcreatereadonly = 1; $this->withemail = 0;