From 1502b254ebbe974d22d4f7a1e66fc25de1715f64 Mon Sep 17 00:00:00 2001 From: Christian Foellmann Date: Thu, 12 Nov 2020 13:58:59 +0100 Subject: [PATCH 1/8] fix not able to delete time entry from task --- htdocs/projet/tasks/time.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 28bb941c687..7329c18cdd8 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -1471,7 +1471,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) print ''; print ' '; - print 'rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">'; + print 'rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">'; print img_delete('default', 'class="pictodelete paddingleft"'); print ''; From 2061d0f85863c92893aa62a60bb3c59794a55330 Mon Sep 17 00:00:00 2001 From: Christian Foellmann Date: Thu, 12 Nov 2020 14:03:18 +0100 Subject: [PATCH 2/8] fix new company in contacts template file --- htdocs/core/tpl/contacts.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index 012c39c126d..98be97ac5bb 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -145,7 +145,7 @@ if ($permission) $newcardbutton = ''; if (!empty($object->socid) && $object->socid > 1 && $user->rights->societe->creer) { - $newcardbutton .= ''; + $newcardbutton .= ''; } print $newcardbutton; ?> From 2da8fb75a8da2e65ce3b95214ca6a5f1a7fc2f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Lukas?= Date: Thu, 12 Nov 2020 15:59:42 +0100 Subject: [PATCH 3/8] Fix #15371 Extrafields from type "select" depending on other fields not working in Safari & jquery select2 #15371 --- htdocs/core/class/commonobject.class.php | 55 +++++++++++++----------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 8518d232115..d8b5a9eff7a 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -6976,34 +6976,37 @@ abstract class CommonObject if (!empty($conf->use_javascript_ajax)) { $out .= ' '."\n"; } From 47fe1b4fd19fa9357c643c15bc06548a1243c855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien?= Date: Fri, 13 Nov 2020 00:25:12 +0100 Subject: [PATCH 4/8] Fix ticket/index.php Warning: mysqli_result::free_result(): Couldn't fetch mysqli_result in /var/www/html/core/db/mysqli.class.php on line 390 --- htdocs/ticket/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php index ed304c43976..52e10f78454 100644 --- a/htdocs/ticket/index.php +++ b/htdocs/ticket/index.php @@ -387,7 +387,7 @@ if ($result) { $i++; } - $db->free(); + $db->free($result); } else { print ''.$langs->trans('NoUnreadTicketsFound').''; } From 283645ae129ee5ff60320cbcaefb185adf592e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien?= Date: Fri, 13 Nov 2020 00:27:57 +0100 Subject: [PATCH 5/8] Fix ticket/list.php Warning: Cannot modify header information - headers already sent by (output started at /var/www/html/core/tpl/extrafields_list_array_fields.tpl.php:3) in /var/www/html/main.inc.php on line 1152 --- htdocs/core/tpl/extrafields_list_array_fields.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php index 54cb8cbc93b..1e98952ae71 100644 --- a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php +++ b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php @@ -1,6 +1,6 @@ '."\n"; +// print ''."\n"; // Protection to avoid direct call of template if (empty($conf) || !is_object($conf)) From d9d32524f7712300c9e943b933cf1f221234b8fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien?= Date: Fri, 13 Nov 2020 00:36:25 +0100 Subject: [PATCH 6/8] Fix #14460 --- htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 2 ++ htdocs/install/mysql/tables/llx_c_ticket_severity.sql | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql index d52257c4157..e7e3378a5af 100644 --- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql +++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql @@ -362,6 +362,8 @@ ALTER TABLE llx_facturedet ADD COLUMN ref_ext varchar(255) AFTER multicurrency_t ALTER TABLE llx_c_ticket_category ADD COLUMN fk_parent integer DEFAULT 0 NOT NULL; ALTER TABLE llx_c_ticket_category ADD COLUMN force_severity varchar(32) NULL; +ALTER TABLE llx_c_ticket_severity CHANGE color color VARCHAR(10) NULL; + ALTER TABLE llx_expensereport ADD COLUMN fk_user_creat integer NULL; ALTER TABLE llx_expensereport_ik ADD COLUMN ikoffset double DEFAULT 0 NOT NULL; diff --git a/htdocs/install/mysql/tables/llx_c_ticket_severity.sql b/htdocs/install/mysql/tables/llx_c_ticket_severity.sql index bb8a75abaa9..b9f565c4395 100644 --- a/htdocs/install/mysql/tables/llx_c_ticket_severity.sql +++ b/htdocs/install/mysql/tables/llx_c_ticket_severity.sql @@ -22,7 +22,7 @@ create table llx_c_ticket_severity code varchar(32) NOT NULL, pos varchar(32) NOT NULL, label varchar(128) NOT NULL, - color varchar(10) NOT NULL, + color varchar(10) NULL, active integer DEFAULT 1, use_default integer DEFAULT 1, description varchar(255) From b8e8ba0c97db13c58a67c744e4335bad73e2238b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Nov 2020 09:58:47 +0100 Subject: [PATCH 7/8] Update extrafields_list_array_fields.tpl.php --- htdocs/core/tpl/extrafields_list_array_fields.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php index 1e98952ae71..54cb8cbc93b 100644 --- a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php +++ b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php @@ -1,6 +1,6 @@ '."\n"; +print ''."\n"; // Protection to avoid direct call of template if (empty($conf) || !is_object($conf)) From 5498800ad607a162d8c15476a8032622a2ee6f32 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Nov 2020 10:02:34 +0100 Subject: [PATCH 8/8] Update commonobject.class.php --- htdocs/core/class/commonobject.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index d8b5a9eff7a..221c69b659a 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -6995,12 +6995,12 @@ abstract class CommonObject jQuery("select option[parent]").parent().each(function() { var orig_select = {}; var child_list = $(this).attr("name"); - orig_select [child_list] = $(this).clone(); + orig_select[child_list] = $(this).clone(); var parent = $(this).find("option[parent]:first").attr("parent"); var infos = parent.split(":"); var parent_list = infos[0]; $("select[name=\""+parent_list+"\"]").change(function() { - showOptions(child_list, parent_list, orig_select [child_list]); + showOptions(child_list, parent_list, orig_select[child_list]); }); }); }