From b3aef891e2788c62155fb0a54449bed5aa724f85 Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Tue, 20 Dec 2022 10:24:43 +0100 Subject: [PATCH 1/3] FIX trigger LINEORDER_DELETE, extrafields should be removed after delete trigger. --- htdocs/commande/class/commande.class.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 73988594e6f..f90fac176dc 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -4331,16 +4331,6 @@ class OrderLine extends CommonOrderLine dol_syslog("OrderLine::delete", LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { - // Remove extrafields - if (!$error) { - $this->id = $this->rowid; - $result = $this->deleteExtraFields(); - if ($result < 0) { - $error++; - dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR); - } - } - if (!$error && !$notrigger) { // Call trigger $result = $this->call_trigger('LINEORDER_DELETE', $user); @@ -4350,6 +4340,15 @@ class OrderLine extends CommonOrderLine // End call triggers } + // Remove extrafields + if (!$error) { + $result = $this->deleteExtraFields(); + if ($result < 0) { + $error++; + dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR); + } + } + if (!$error) { $this->db->commit(); return 1; From a48b738c18b47bea3c5a7888b6847f276288a754 Mon Sep 17 00:00:00 2001 From: daraelmin Date: Wed, 21 Dec 2022 17:58:40 +0100 Subject: [PATCH 2/3] Fix White bg-color badge in darkmode --- htdocs/theme/eldy/badges.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php index 1e6dfb54dbc..aae4e50fb29 100644 --- a/htdocs/theme/eldy/badges.inc.php +++ b/htdocs/theme/eldy/badges.inc.php @@ -246,7 +246,7 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL if (in_array((string) $statusName, $TBadgeBorderOnly)) { $thisBadgeTextColor = '#212529'; - $thisBadgeBackgroundColor = "#fff"; + $thisBadgeBackgroundColor = ""; } if (in_array((string) $statusName, array('0', '5', '9'))) { From d608e3b26b97b1210281a97c3550fae1a1897eb0 Mon Sep 17 00:00:00 2001 From: daraelmin Date: Wed, 21 Dec 2022 21:55:43 +0100 Subject: [PATCH 3/3] Use transparent color for negative color in chart part --- htdocs/core/class/dolgraph.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php index 57f0bca4e36..6ef5b69ba3e 100644 --- a/htdocs/core/class/dolgraph.class.php +++ b/htdocs/core/class/dolgraph.class.php @@ -1211,7 +1211,7 @@ class DolGraph $tmp = str_replace('#', '', $this->datacolor[$i]); if (strpos($tmp, '-') !== false) { $foundnegativecolor++; - $color = '#FFFFFF'; // If $val is '-123' + $color = 'rgba(0,0,0,.0)'; // If $val is '-123' } else { $color = "#" . $tmp; // If $val is '123' or '#123' }