diff --git a/erpnext/regional/doctype/datev_settings/datev_settings.json b/erpnext/regional/doctype/datev_settings/datev_settings.json index caed7367dc1..d319324a68e 100644 --- a/erpnext/regional/doctype/datev_settings/datev_settings.json +++ b/erpnext/regional/doctype/datev_settings/datev_settings.json @@ -6,6 +6,7 @@ "engine": "InnoDB", "field_order": [ "client", + "account_number_length", "column_break_2", "client_number", "section_break_4", @@ -57,9 +58,16 @@ { "fieldname": "column_break_6", "fieldtype": "Column Break" + }, + { + "default": "4", + "fieldname": "account_number_length", + "fieldtype": "Int", + "label": "Account Number Length", + "reqd": 1 } ], - "modified": "2020-04-15 12:59:57.786506", + "modified": "2020-10-03 16:52:35.903867", "modified_by": "Administrator", "module": "Regional", "name": "DATEV Settings", diff --git a/erpnext/regional/report/datev/datev.py b/erpnext/regional/report/datev/datev.py index 815b5ed4d29..9f2e86bab36 100644 --- a/erpnext/regional/report/datev/datev.py +++ b/erpnext/regional/report/datev/datev.py @@ -247,7 +247,7 @@ def get_datev_csv(data, filters): # M = Start of the fiscal year (Wirtschaftsjahresbeginn) frappe.utils.formatdate(filters.get("fiscal_year_start"), "yyyyMMdd"), # N = Length of account numbers (Sachkontenlänge) - "4", + str(filters.get('account_number_length', 4)), # O = Transaction batch start date (YYYYMMDD) frappe.utils.formatdate(filters.get('from_date'), "yyyyMMdd"), # P = Transaction batch end date (YYYYMMDD) @@ -521,6 +521,9 @@ def download_datev_csv(filters=None): filters = json.loads(filters) validate(filters) + + filters['account_number_length'] = frappe.get_value('DATEV Settings', filters.get('company'), 'account_number_length') + fiscal_year = get_fiscal_year(date=filters.get('from_date'), company=filters.get('company')) filters['fiscal_year_start'] = fiscal_year[1]