From 3ea51f5680a98517d0708053b818dfa8004ead6a Mon Sep 17 00:00:00 2001
From: ccheng <c.cheng@metaways.de>
Date: Tue, 25 Feb 2025 09:48:13 +0100
Subject: [PATCH] fix(HumanResources/Export): export empployee with custom
 fields

---
 tine20/HumanResources/Export/Xls.php          |  32 ----
 .../Export/definitions/hr_default_newcsv.xml  | 163 ++++++++++++++++++
 .../Export/definitions/hr_default_xls.xml     |  55 ------
 .../definitions/hr_xls_current_columns.xml    |  14 --
 tine20/HumanResources/translations/de.po      |   6 +-
 tine20/HumanResources/translations/en.po      |   3 -
 .../HumanResources/translations/template.pot  |   3 -
 tine20/Tinebase/Export/CsvNew.php             |  21 +++
 8 files changed, 187 insertions(+), 110 deletions(-)
 delete mode 100644 tine20/HumanResources/Export/Xls.php
 create mode 100644 tine20/HumanResources/Export/definitions/hr_default_newcsv.xml
 delete mode 100644 tine20/HumanResources/Export/definitions/hr_default_xls.xml
 delete mode 100644 tine20/HumanResources/Export/definitions/hr_xls_current_columns.xml

diff --git a/tine20/HumanResources/Export/Xls.php b/tine20/HumanResources/Export/Xls.php
deleted file mode 100644
index 07626bf447d..00000000000
--- a/tine20/HumanResources/Export/Xls.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * HumanResources xls generation class
- *
- * @package     HumanResources
- * @subpackage  Export
- * @license     http://www.gnu.org/licenses/agpl.html AGPL Version 3
- * @author      Alexander Stintzing <a.stintzing@metaways.de>
- * @copyright   Copyright (c) 2013 Metaways Infosystems GmbH (http://www.metaways.de)
- * 
- */
-
-/**
- * HumanResources xls generation class
- * 
- * @package     HumanResources
- * @subpackage  Export
- */
-class HumanResources_Export_Xls extends Tinebase_Export_Spreadsheet_Xls
-{
-    /**
-     * @var string $_applicationName
-     */
-    protected $_applicationName = 'HumanResources';
-    
-    /**
-     * default export definition name
-     * 
-     * @var string
-     */
-    protected $_defaultExportname = 'hr_default_xls';
-}
diff --git a/tine20/HumanResources/Export/definitions/hr_default_newcsv.xml b/tine20/HumanResources/Export/definitions/hr_default_newcsv.xml
new file mode 100644
index 00000000000..4f19e90c542
--- /dev/null
+++ b/tine20/HumanResources/Export/definitions/hr_default_newcsv.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+    <model>HumanResources_Model_Employee</model>
+    <name>hr_default_newcsv</name>
+    <label>CSV list with custom fields</label>
+    <type>export</type>
+    <plugin>Tinebase_Export_CsvNew</plugin>
+    <description>default csv employee export definition with custom fields</description>
+    <favorite>true</favorite>
+    <customFields>1</customFields>
+    <header>1</header>
+    <sort>
+        <field>number</field>
+        <direction>ASC</direction>
+    </sort>
+    <columns>
+        <column>
+            <identifier>number</identifier>
+            <header>Number</header>
+        </column>
+        <column>
+            <identifier>account_id</identifier>
+            <header>Account</header>
+        </column>
+        <column>
+            <identifier>description</identifier>
+            <header>Description</header>
+        </column>
+        <column>
+            <identifier>countryname</identifier>
+            <header>Country</header>
+        </column>
+        <column>
+            <identifier>locality</identifier>
+            <header>Locality</header>
+        </column>
+        <column>
+            <identifier>postalcode</identifier>
+            <header>Postalcode</header>
+        </column>
+        <column>
+            <identifier>region</identifier>
+            <header>Region</header>
+        </column>
+        <column>
+            <identifier>street</identifier>
+            <header>Street</header>
+        </column>
+        <column>
+            <identifier>street2</identifier>
+            <header>Street 2</header>
+        </column>
+        <column>
+            <identifier>email</identifier>
+            <header>E-Mail</header>
+        </column>
+        <column>
+            <identifier>tel_home</identifier>
+            <header>Telephone Number</header>
+        </column>
+        <column>
+            <identifier>tel_cell</identifier>
+            <header>Cell Phone Number</header>
+        </column>
+        <column>
+            <identifier>title</identifier>
+            <header>Title</header>
+        </column>
+        <column>
+            <identifier>salutation</identifier>
+            <header>Salutation</header>
+        </column>
+        <column>
+            <identifier>n_family</identifier>
+            <header>Last Name</header>
+        </column>
+        <column>
+            <identifier>n_given</identifier>
+            <header>First Name</header>
+        </column>
+        <column>
+            <identifier>n_fn</identifier>
+            <header>Employee name</header>
+        </column>
+        <column>
+            <identifier>bday</identifier>
+            <header>Birthday</header>
+        </column>
+        <column>
+            <identifier>bank_account_holder</identifier>
+            <header>Account Holder</header>
+        </column>
+        <column>
+            <identifier>bank_account_number</identifier>
+            <header>Account Number</header>
+        </column>
+        <column>
+            <identifier>iban</identifier>
+            <header>IBAN</header>
+        </column>
+        <column>
+            <identifier>bic</identifier>
+            <header>BIC</header>
+        </column>
+        <column>
+            <identifier>bank_name</identifier>
+            <header>Bank Name</header>
+        </column>
+        <column>
+            <identifier>bank_code_number</identifier>
+            <header>Code Number</header>
+        </column>
+        <column>
+            <identifier>employment_begin</identifier>
+            <header>Employment begin</header>
+        </column>
+        <column>
+            <identifier>employment_end</identifier>
+            <header>Employment end</header>
+        </column>
+        <column>
+            <identifier>supervisor_id</identifier>
+            <header>Supervisor</header>
+        </column>
+        <column>
+            <identifier>division_id</identifier>
+            <header>Division</header>
+        </column>
+        <column>
+            <identifier>health_insurance</identifier>
+            <header>Health Insurance</header>
+        </column>
+        <column>
+            <identifier>profession</identifier>
+            <header>Profession</header>
+        </column>
+        <column>
+            <identifier>position</identifier>
+            <header>Position</header>
+        </column>
+        <column>
+            <identifier>created_by</identifier>
+            <header>Created By</header>
+        </column>
+        <column>
+            <identifier>creation_time</identifier>
+            <header>Creation Time</header>
+        </column>
+        <column>
+            <identifier>last_modified_by</identifier>
+            <header>Last Modified By</header>
+        </column>
+        <column>
+            <identifier>last_modified_time</identifier>
+            <header>Last Modified Time</header>
+        </column>
+        <column>
+            <identifier>tags</identifier>
+            <header>Tags</header>
+            <type>tags</type>
+        </column>
+    </columns>
+</config>
diff --git a/tine20/HumanResources/Export/definitions/hr_default_xls.xml b/tine20/HumanResources/Export/definitions/hr_default_xls.xml
deleted file mode 100644
index dc08311ef3b..00000000000
--- a/tine20/HumanResources/Export/definitions/hr_default_xls.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config>
-    <model>HumanResources_Model_Employee</model>
-    <name>hr_default_xls</name>
-    <type>export</type>
-    <plugin>HumanResources_Export_Xls</plugin>
-    <description>default xls employee export definition</description>
-    <header>1</header>
-    <columns>
-        <column><identifier>number</identifier></column>
-        <column><identifier>account_id</identifier></column>
-        <column><identifier>description</identifier></column>
-        <column><identifier>countryname</identifier></column>
-        <column><identifier>locality</identifier></column>
-        <column><identifier>postalcode</identifier></column>
-        <column><identifier>region</identifier></column>
-        <column><identifier>street</identifier></column>
-        <column><identifier>street2</identifier></column>
-        <column><identifier>email</identifier></column>
-        <column><identifier>tel_home</identifier></column>
-        <column><identifier>tel_cell</identifier></column>
-        <column><identifier>title</identifier></column>
-        <column><identifier>salutation</identifier></column>
-        <column><identifier>n_family</identifier></column>
-        <column><identifier>n_given</identifier></column>
-        <column><identifier>n_fn</identifier></column>
-        <column><identifier>bday</identifier></column>
-        <column><identifier>bank_account_holder</identifier></column>
-        <column><identifier>bank_account_number</identifier></column>
-        <column><identifier>bank_name</identifier></column>
-        <column><identifier>bank_code_number</identifier></column>
-        <column><identifier>employment_begin</identifier></column>
-        <column><identifier>employment_end</identifier></column>
-        <column><identifier>supervisor_id</identifier></column>
-        <column><identifier>division_id</identifier></column>
-        <column><identifier>health_insurance</identifier></column>
-        <column><identifier>profession</identifier></column>
-        <column>
-            <identifier>created_by</identifier>
-        </column>
-        <column>
-            <identifier>creation_time</identifier>
-        </column>
-        <column>
-            <identifier>last_modified_by</identifier>
-        </column>
-        <column>
-            <identifier>last_modified_time</identifier>
-        </column>
-        <column>
-            <identifier>tags</identifier>
-            <type>tags</type>
-        </column>
-    </columns>
-</config>
diff --git a/tine20/HumanResources/Export/definitions/hr_xls_current_columns.xml b/tine20/HumanResources/Export/definitions/hr_xls_current_columns.xml
deleted file mode 100644
index ae1dbaeeac6..00000000000
--- a/tine20/HumanResources/Export/definitions/hr_xls_current_columns.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config>
-    <model>HumanResources_Model_Employee</model>
-    <name>hr_xls_current_columns</name>
-    <!-- _('Excel current columns') -->
-    <label>Excel current columns</label>
-    <type>export</type>
-    <plugin>HumanResources_Export_Xls</plugin>
-    <icon_class>tinebase-action-export-xls</icon_class>
-    <favorite>true</favorite>
-    <order>600</order>
-    <scope>multi</scope>
-    <use_current_columns>true</use_current_columns>
-</config>
diff --git a/tine20/HumanResources/translations/de.po b/tine20/HumanResources/translations/de.po
index e5e417ea54b..464af019810 100644
--- a/tine20/HumanResources/translations/de.po
+++ b/tine20/HumanResources/translations/de.po
@@ -260,9 +260,6 @@ msgstr "Nicht erlaubt!"
 msgid "It's only allowed to book remaining vacation days from years in the past!"
 msgstr "Es ist nur erlaubt, Resturlaub aus vergangenen Jahren zu buchen!"
 
-msgid "Excel current columns"
-msgstr "Excel angezeigte Spalten"
-
 msgid "Monthly Report (Clock Times)"
 msgstr "Monatsbericht (Stempelzeiten)"
 
@@ -1288,3 +1285,6 @@ msgstr "Sonderzahlung"
 
 msgid "[H] Short Business trip"
 msgstr "[Z] Kurze Dienstreise"
+
+#~ msgid "Excel current columns"
+#~ msgstr "Excel angezeigte Spalten"
diff --git a/tine20/HumanResources/translations/en.po b/tine20/HumanResources/translations/en.po
index b2eb02cd59b..2e874b8106f 100644
--- a/tine20/HumanResources/translations/en.po
+++ b/tine20/HumanResources/translations/en.po
@@ -245,9 +245,6 @@ msgstr "Not allowed!"
 msgid "It's only allowed to book remaining vacation days from years in the past!"
 msgstr "It's only allowed to book remaining vacation days from years in the past!"
 
-msgid "Excel current columns"
-msgstr "Excel current columns"
-
 msgid "Monthly Report (Clock Times)"
 msgstr "Monthly Report (Clock Times)"
 
diff --git a/tine20/HumanResources/translations/template.pot b/tine20/HumanResources/translations/template.pot
index b1626e59cb8..40f4d71cc05 100644
--- a/tine20/HumanResources/translations/template.pot
+++ b/tine20/HumanResources/translations/template.pot
@@ -245,9 +245,6 @@ msgstr ""
 msgid "It's only allowed to book remaining vacation days from years in the past!"
 msgstr ""
 
-msgid "Excel current columns"
-msgstr ""
-
 msgid "Monthly Report (Clock Times)"
 msgstr ""
 
diff --git a/tine20/Tinebase/Export/CsvNew.php b/tine20/Tinebase/Export/CsvNew.php
index 8847d295606..eb34329a0e1 100644
--- a/tine20/Tinebase/Export/CsvNew.php
+++ b/tine20/Tinebase/Export/CsvNew.php
@@ -152,6 +152,27 @@ protected function _startRow()
 
     protected function _endRow()
     {
+        if ($this->_config->columns && $this->_config->customFields) {
+            $record = new $this->_modelName(array(), true);
+
+            $this->_fields = $record->getFields();
+            $this->_fields = array_unique(array_merge(
+                array_diff($this->_fields, ['customfields']),
+                array_keys($this->_expandCustomFields)
+            ));
+
+            foreach ($this->_expandCustomFields as $key => $value) {
+                if ($this->_currentRowType === self::ROW_TYPE_GENERIC_HEADER) {
+                    $name = $this->_translate->_($value);
+                    $this->_writeValue($name);
+                }
+                if ($this->_currentRowType === self::ROW_TYPE_RECORD) {
+                    $record = $this->_currentRecord;
+                    $this->_writeValue($this->_convertToString($record->{$key}));
+                }
+            }
+        }
+
         if (false === self::fputcsv($this->_filehandle, $this->_currentRow, $this->_delimiter, $this->_enclosure,
                 $this->_escape_char, $this->_charset)) {
             throw new Tinebase_Exception_Backend('could not write current row to csv stream');