From 583fbea046aea5760fa11ac264b2a4aa96427ef9 Mon Sep 17 00:00:00 2001 From: nathangray Date: Wed, 21 Apr 2021 10:33:31 -0600 Subject: [PATCH] Use Merge number formatting instead of export formatting. It takes export file type into consideration. --- timesheet/inc/class.timesheet_merge.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/timesheet/inc/class.timesheet_merge.inc.php b/timesheet/inc/class.timesheet_merge.inc.php index 975799e58c..4a1d52aeb1 100644 --- a/timesheet/inc/class.timesheet_merge.inc.php +++ b/timesheet/inc/class.timesheet_merge.inc.php @@ -110,6 +110,9 @@ class timesheet_merge extends Api\Storage\Merge // Convert to human friendly values $types = timesheet_egw_record::$types; + // We have specific requirements for floats, we'll do them in Merge + unset($types['float']); + $_selects = array('status' => $this->bo->status_labels); foreach($_selects['status'] as &$status) {