From 772394b95aef049852361ab1b62712c40a1a576a Mon Sep 17 00:00:00 2001 From: Raffael Meyer Date: Thu, 13 Feb 2020 20:58:59 +0100 Subject: [PATCH] fix header --- erpnext/regional/report/datev/datev.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/erpnext/regional/report/datev/datev.py b/erpnext/regional/report/datev/datev.py index d4f480196c..7ceaf50134 100644 --- a/erpnext/regional/report/datev/datev.py +++ b/erpnext/regional/report/datev/datev.py @@ -239,8 +239,6 @@ def get_datev_csv(data, filters, csv_class): filters -- dict csv_class -- defines DATA_CATEGORY, FORMAT_NAME and COLUMNS """ - header = get_header(filters, csv_class) - empty_df = pd.DataFrame(columns=csv_class.COLUMNS) data_df = pd.DataFrame.from_records(data) @@ -252,7 +250,6 @@ def get_datev_csv(data, filters, csv_class): if csv_class.DATA_CATEGORY == DataCategory.ACCOUNT_NAMES: result['Sprach-ID'] = 'de-DE' - header = ';'.join(header).encode('latin_1') data = result.to_csv( # Reason for str(';'): https://github.com/pandas-dev/pandas/issues/6035 sep=str(';'), @@ -273,10 +270,13 @@ def get_datev_csv(data, filters, csv_class): if not six.PY2: data = data.encode('latin_1') + header = get_header(filters, csv_class) + header = ';'.join(header).encode('latin_1') + # 1st Row: Header with meta data - # 2nd Row: Data heading (Überschrift der Nutzdaten) - # 3rd Row: – n: Data (Nutzdaten) - return header + b'\r\n\r\n' + data + # 2nd Row: Data heading (Überschrift der Nutzdaten), included in `data` here. + # 3rd - nth Row: Data (Nutzdaten) + return header + b'\r\n' + data def get_header(filters, csv_class):