From 74a7d6ee8bd6b84da0a92c4abea2598cd041d18e Mon Sep 17 00:00:00 2001 From: nathangray Date: Wed, 21 Apr 2021 13:29:09 -0600 Subject: [PATCH] Use Merge number formatting instead of export formatting. It takes export file type into consideration. --- infolog/inc/class.infolog_merge.inc.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/infolog/inc/class.infolog_merge.inc.php b/infolog/inc/class.infolog_merge.inc.php index dab6a067fb..3a073e3bb7 100644 --- a/infolog/inc/class.infolog_merge.inc.php +++ b/infolog/inc/class.infolog_merge.inc.php @@ -86,6 +86,9 @@ class infolog_merge extends Api\Storage\Merge // Convert to human friendly values $types = infolog_egw_record::$types; + // We have specific requirements for floats, we'll do them in Merge + unset($types['float']); + $_selects = $this->bo->enums + array('status' => $this->bo->status[$record->info_type]); foreach($_selects as $name => $value) { @@ -101,6 +104,10 @@ class infolog_merge extends Api\Storage\Merge importexport_export_csv::convert($record, $types, 'infolog', $selects); $array = $record->get_record_array(); + foreach(array('info_price') as $key) + { + $array[$key] = self::number_format($array[$key],2,$this->mimetype); + } if($record->info_contact) { $array['info_contact'] = $array['info_link']['title'];