Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: customer and supplier data

Browse Source 
(cherry picked from commit 53445aa25adc664d5eac55ba9e16a1eb4365ea38)
This commit is contained in:
barredterra 2020-05-11 19:15:49 +02:00 committed by mergify-bot
parent 6adb617ede
commit 8f7d214853
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,8 +131,10 @@ def get_customers(filters):
SELECT SELECT
acc.account_number as 'Konto', acc.account_number as 'Konto',
cus.customer_name as 'Name (Adressatentyp Unternehmen)', CASE cus.customer_type WHEN 'Company' THEN cus.customer_name ELSE null END as 'Name (Adressatentyp Unternehmen)',
case cus.customer_type when 'Individual' then 1 when 'Company' then 2 else 0 end as 'Adressatentyp', CASE cus.customer_type WHEN 'Individual' THEN con.last_name ELSE null END as 'Name (Adressatentyp natürl. Person)',
CASE cus.customer_type WHEN 'Individual' THEN con.first_name ELSE null END as 'Vorname (Adressatentyp natürl. Person)',
CASE cus.customer_type WHEN 'Individual' THEN '1' WHEN 'Company' THEN '2' ELSE '0' end as 'Adressatentyp',
adr.address_line1 as 'Straße', adr.address_line1 as 'Straße',
adr.pincode as 'Postleitzahl', adr.pincode as 'Postleitzahl',
adr.city as 'Ort', adr.city as 'Ort',
@ -141,8 +143,7 @@ def get_customers(filters):
con.email_id as 'E-Mail', con.email_id as 'E-Mail',
coalesce(con.mobile_no, con.phone) as 'Telefon', coalesce(con.mobile_no, con.phone) as 'Telefon',
cus.website as 'Internet', cus.website as 'Internet',
cus.tax_id as 'Steuernummer', cus.tax_id as 'Steuernummer'
ccl.credit_limit as 'Kreditlimit (Debitor)'
FROM `tabParty Account` par FROM `tabParty Account` par
@ -161,10 +162,6 @@ def get_customers(filters):
left join `tabContact` con left join `tabContact` con
on con.name = cus.customer_primary_contact on con.name = cus.customer_primary_contact
left join `tabCustomer Credit Limit` ccl
on ccl.parent = cus.name
and ccl.company = par.company
WHERE par.company = %(company)s WHERE par.company = %(company)s
AND par.parenttype = 'Customer'""", filters, as_dict=1) AND par.parenttype = 'Customer'""", filters, as_dict=1)
@ -180,8 +177,10 @@ def get_suppliers(filters):
SELECT SELECT
acc.account_number as 'Konto', acc.account_number as 'Konto',
sup.supplier_name as 'Name (Adressatentyp Unternehmen)', CASE sup.supplier_type WHEN 'Company' THEN sup.supplier_name ELSE null END as 'Name (Adressatentyp Unternehmen)',
case sup.supplier_type when 'Individual' then '1' when 'Company' then '2' else '0' end as 'Adressatentyp', CASE sup.supplier_type WHEN 'Individual' THEN con.last_name ELSE null END as 'Name (Adressatentyp natürl. Person)',
CASE sup.supplier_type WHEN 'Individual' THEN con.first_name ELSE null END as 'Vorname (Adressatentyp natürl. Person)',
CASE sup.supplier_type WHEN 'Individual' THEN '1' WHEN 'Company' THEN '2' ELSE '0' end as 'Adressatentyp',
adr.address_line1 as 'Straße', adr.address_line1 as 'Straße',
adr.pincode as 'Postleitzahl', adr.pincode as 'Postleitzahl',
adr.city as 'Ort', adr.city as 'Ort',