nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 00:44:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

update cloumn names

Browse Source
This commit is contained in:
Raffael Meyer
2020-02-13 20:58:44 +01:00
parent 3bacdf1f4b
commit 54717fa993
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,17 +72,16 @@ def get_transactions(filters, as_dict=1):
case gl.debit when 0 then 'H' else 'S' end as 'Soll/Haben-Kennzeichen', case gl.debit when 0 then 'H' else 'S' end as 'Soll/Haben-Kennzeichen',
/* account number or, if empty, party account number */ /* account number or, if empty, party account number */
coalesce(acc.account_number, acc_pa.account_number) as 'Kontonummer', coalesce(acc.account_number, acc_pa.account_number) as 'Konto',
/* against number or, if empty, party against number */ /* against number or, if empty, party against number */
coalesce(acc_against.account_number, acc_against_pa.account_number) as 'Gegenkonto (ohne BU-Schlüssel)', coalesce(acc_against.account_number, acc_against_pa.account_number) as 'Gegenkonto (ohne BU-Schlüssel)',
gl.posting_date as 'Belegdatum', gl.posting_date as 'Belegdatum',
gl.voucher_no as 'Belegfeld 1',
gl.remarks as 'Buchungstext', gl.remarks as 'Buchungstext',
gl.voucher_type as 'Beleginfo - Art 1', gl.against_voucher_type as 'Beleginfo - Art 1',
gl.voucher_no as 'Beleginfo - Inhalt 1', gl.against_voucher as 'Beleginfo - Inhalt 1'
gl.against_voucher_type as 'Beleginfo - Art 2',
gl.against_voucher as 'Beleginfo - Inhalt 2'
FROM `tabGL Entry` gl FROM `tabGL Entry` gl

21
erpnext/regional/report/datev/datev_constants.py
View File

@@ -472,8 +472,8 @@ QUERY_REPORT_COLUMNS = [
"fieldtype": "Data", "fieldtype": "Data",
}, },
{ {
"label": "Kontonummer", "label": "Konto",
"fieldname": "Kontonummer", "fieldname": "Konto",
"fieldtype": "Data", "fieldtype": "Data",
}, },
{ {
@@ -486,6 +486,11 @@ QUERY_REPORT_COLUMNS = [
"fieldname": "Belegdatum", "fieldname": "Belegdatum",
"fieldtype": "Date", "fieldtype": "Date",
}, },
{
"label": "Belegfeld 1",
"fieldname": "Belegfeld 1",
"fieldtype": "Data",
},
{ {
"label": "Buchungstext", "label": "Buchungstext",
"fieldname": "Buchungstext", "fieldname": "Buchungstext",
@@ -493,21 +498,11 @@ QUERY_REPORT_COLUMNS = [
}, },
{ {
"label": "Beleginfo - Art 1", "label": "Beleginfo - Art 1",
"fieldname": "Beleginfo - Art 1",
"fieldtype": "Data",
},
{
"label": "Beleginfo - Inhalt 1",
"fieldname": "Beleginfo - Inhalt 1",
"fieldtype": "Data",
},
{
"label": "Beleginfo - Art 2",
"fieldname": "Beleginfo - Art 2", "fieldname": "Beleginfo - Art 2",
"fieldtype": "Data", "fieldtype": "Data",
}, },
{ {
"label": "Beleginfo - Inhalt 2", "label": "Beleginfo - Inhalt 1",
"fieldname": "Beleginfo - Inhalt 2", "fieldname": "Beleginfo - Inhalt 2",
"fieldtype": "Data", "fieldtype": "Data",
} }