CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-15 08:17:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: create invoices list without if else

Browse Source 
(cherry picked from commit a4b8d67323)
This commit is contained in:
ruthra kumar
2022-02-15 12:20:41 +05:30
committed by mergify-bot
parent 63c73e6eaf
commit 07c094152e
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py
View File

@@ -157,25 +157,20 @@ def set_payment_terms_statuses(sales_orders, invoices, filters):
for so in sales_orders:
so.currency = frappe.get_cached_value('Company', filters.get('company'), 'default_currency')
so.invoices = ""
for inv in [x for x in invoices if x.sales_order == so.name and x.invoice_amount > 0]:
if so.base_payment_amount - so.paid_amount > 0:
amount = so.base_payment_amount - so.paid_amount
if inv.invoice_amount >= amount:
inv.invoice_amount -= amount
so.paid_amount += amount
if so.invoices:
so.invoices = so.invoices + "," + inv.invoice
else:
so.invoices = inv.invoice
so.invoices += "," + inv.invoice
so.status = "Completed"
break
else:
so.paid_amount += inv.invoice_amount
inv.invoice_amount = 0
if so.invoices:
so.invoices = so.invoices + "," + inv.invoice
else:
so.invoices = inv.invoice
so.invoices += "," + inv.invoice
so.status = "Partly Paid"
return sales_orders, invoices