Merge branch 'release-2.3' into dev

emaijala · Nov 22, 2024 · f8990e6 · f8990e6
2 parents 66cc073 + bfa64c2
commit f8990e6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/css/style.css b/css/style.css
diff --git a/css/style.css.map b/css/style.css.map
diff --git a/css/style.scss b/css/style.scss
@@ -392,8 +392,17 @@ td.reportsublabel {
   }
   .medium, .medium_label {
     min-width: 80px;
-    max-width: 180px;
+    max-width: 240px;
   }
+  .currency, .currency_label {
+    min-width: 80px;
+    max-width: 100px;
+  }
+  .count, .count_label {
+    min-width: 60px;
+    max-width: 100px;
+  }
+
   @media only screen and (max-width: $iform-collapse-max-width) {
     .tiny, .tiny_label {
       width: 40px;

diff --git a/miscfuncs.php b/miscfuncs.php
@@ -60,7 +60,7 @@ function condUtf8Encode($str)
 /**
  * Round a value to given decimals
  *
- * @param float  $value             Value
+ * @param ?float $value             Value
  * @param int    $decimals          Number of decimals
  * @param string $decimalSeparator  Decimal separator
  * @param string $thousandSeparator Thousand separator
@@ -71,7 +71,7 @@ function miscRound2Decim($value, $decimals = 2, $decimalSeparator = null,
     $thousandSeparator = null
 ) {
     return number_format(
-        $value, $decimals,
+        $value ?? 0, $decimals,
         $decimalSeparator ?? Translator::translate('DecimalSeparator'),
         $thousandSeparator ?? Translator::translate('ThousandSeparator')
     );