extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 17:04:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use Merge number formatting instead of export formatting. It takes export file type into consideration.

Browse Source
This commit is contained in:
nathangray 2021-04-21 13:29:09 -06:00
parent 583fbea046
commit 74a7d6ee8b
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infolog/inc/class.infolog_merge.inc.php
View File

@ -86,6 +86,9 @@ class infolog_merge extends Api\Storage\Merge
// Convert to human friendly values // Convert to human friendly values
$types = infolog_egw_record::$types; $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]); $_selects = $this->bo->enums + array('status' => $this->bo->status[$record->info_type]);
foreach($_selects as $name => $value) foreach($_selects as $name => $value)
{ {
@ -101,6 +104,10 @@ class infolog_merge extends Api\Storage\Merge
importexport_export_csv::convert($record, $types, 'infolog', $selects); importexport_export_csv::convert($record, $types, 'infolog', $selects);
$array = $record->get_record_array(); $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) if($record->info_contact)
{ {
$array['info_contact'] = $array['info_link']['title']; $array['info_contact'] = $array['info_link']['title'];