schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: remove debit and credit

Browse Source 
(cherry picked from commit 014b542cf3)
This commit is contained in:
ruthra kumar
2024-05-23 11:59:57 +05:30
committed by Mergify
parent 0dc2f78a2e
commit 3512f7d528
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
View File

@@ -23,11 +23,7 @@ def execute(filters=None):
data = [] data = []
for d in entries: for d in entries:
invoice = invoice_details.get(d.against_voucher) or frappe._dict() invoice = invoice_details.get(d.against_voucher) or frappe._dict()
payment_amount = d.amount
if d.reference_type == "Purchase Invoice":
payment_amount = flt(d.debit) or -1 * flt(d.credit)
else:
payment_amount = flt(d.credit) or -1 * flt(d.debit)
d.update({"range1": 0, "range2": 0, "range3": 0, "range4": 0, "outstanding": payment_amount}) d.update({"range1": 0, "range2": 0, "range3": 0, "range4": 0, "outstanding": payment_amount})
@@ -43,8 +39,7 @@ def execute(filters=None):
d.against_voucher, d.against_voucher,
invoice.posting_date, invoice.posting_date,
invoice.due_date, invoice.due_date,
d.debit, d.amount,
d.credit,
d.remarks, d.remarks,
d.age, d.age,
d.range1, d.range1,
@@ -112,8 +107,7 @@ def get_columns(filters):
"width": 100, "width": 100,
}, },
{"fieldname": "due_date", "label": _("Payment Due Date"), "fieldtype": "Date", "width": 100}, {"fieldname": "due_date", "label": _("Payment Due Date"), "fieldtype": "Date", "width": 100},
{"fieldname": "debit", "label": _("Debit"), "fieldtype": "Currency", "width": 140}, {"fieldname": "amount", "label": _("Amount"), "fieldtype": "Currency", "width": 140},
{"fieldname": "credit", "label": _("Credit"), "fieldtype": "Currency", "width": 140},
{"fieldname": "remarks", "label": _("Remarks"), "fieldtype": "Data", "width": 200}, {"fieldname": "remarks", "label": _("Remarks"), "fieldtype": "Data", "width": 200},
{"fieldname": "age", "label": _("Age"), "fieldtype": "Int", "width": 50}, {"fieldname": "age", "label": _("Age"), "fieldtype": "Int", "width": 50},
{"fieldname": "range1", "label": _("0-30"), "fieldtype": "Currency", "width": 140}, {"fieldname": "range1", "label": _("0-30"), "fieldtype": "Currency", "width": 140},