nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 12:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix header

Browse Source
This commit is contained in:
Raffael Meyer
2020-02-13 20:58:59 +01:00
parent 54717fa993
commit 772394b95a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/regional/report/datev/datev.py
View File

@@ -239,8 +239,6 @@ def get_datev_csv(data, filters, csv_class):
filters -- dict filters -- dict
csv_class -- defines DATA_CATEGORY, FORMAT_NAME and COLUMNS csv_class -- defines DATA_CATEGORY, FORMAT_NAME and COLUMNS
""" """
header = get_header(filters, csv_class)
empty_df = pd.DataFrame(columns=csv_class.COLUMNS) empty_df = pd.DataFrame(columns=csv_class.COLUMNS)
data_df = pd.DataFrame.from_records(data) 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: if csv_class.DATA_CATEGORY == DataCategory.ACCOUNT_NAMES:
result['Sprach-ID'] = 'de-DE' result['Sprach-ID'] = 'de-DE'
header = ';'.join(header).encode('latin_1')
data = result.to_csv( data = result.to_csv(
# Reason for str(';'): https://github.com/pandas-dev/pandas/issues/6035 # Reason for str(';'): https://github.com/pandas-dev/pandas/issues/6035
sep=str(';'), sep=str(';'),
@@ -273,10 +270,13 @@ def get_datev_csv(data, filters, csv_class):
if not six.PY2: if not six.PY2:
data = data.encode('latin_1') data = data.encode('latin_1')
header = get_header(filters, csv_class)
header = ';'.join(header).encode('latin_1')
# 1st Row: Header with meta data # 1st Row: Header with meta data
# 2nd Row: Data heading (Überschrift der Nutzdaten) # 2nd Row: Data heading (Überschrift der Nutzdaten), included in `data` here.
# 3rd Row: – n: Data (Nutzdaten) # 3rd - nth Row: Data (Nutzdaten)
return header + b'\r\n\r\n' + data return header + b'\r\n' + data
def get_header(filters, csv_class): def get_header(filters, csv_class):