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

Refactored accounts receivable report for payment terms

Browse Source
This commit is contained in:
deepeshgarg007 2018-12-07 08:15:05 +05:30
parent e7a91b9526
commit 17544d7ad6
1 changed files with 90 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@ -4,7 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe, erpnext import frappe, erpnext
from frappe import _, scrub from frappe import _, scrub
from frappe.utils import getdate, nowdate, flt, cint from frappe.utils import getdate, nowdate, flt, cint, formatdate, cstr
class ReceivablePayableReport(object): class ReceivablePayableReport(object):
def __init__(self, filters=None): def __init__(self, filters=None):
@ -112,12 +112,12 @@ class ReceivablePayableReport(object):
"options": "Currency", "options": "Currency",
"width": 100 "width": 100
}, },
{ # {
"fieldname": "pdc/lc_date", # "fieldname": "pdc/lc_date",
"label": _("PDC/LC Date"), # "label": _("PDC/LC Date"),
"fieldtype": "Date", # "fieldtype": "Date",
"width": 110 # "width": 110
}, # },
{ {
"fieldname": "pdc/lc_ref", "fieldname": "pdc/lc_ref",
"label": _("PDC/LC Ref"), "label": _("PDC/LC Ref"),
@ -195,40 +195,64 @@ class ReceivablePayableReport(object):
outstanding_amount, credit_note_amount, payment_amount = self.get_outstanding_amount( outstanding_amount, credit_note_amount, payment_amount = self.get_outstanding_amount(
gle,self.filters.report_date, self.dr_or_cr, return_entries) gle,self.filters.report_date, self.dr_or_cr, return_entries)
if abs(outstanding_amount) > 0.1/10**self.currency_precision: if abs(outstanding_amount) > 0.1/10**self.currency_precision:
pdc_list = self.pdc_details.get((gle.voucher_no, gle.party), [])
if self.filters.based_on_payment_terms and self.payment_term_map.get(gle.voucher_no): if self.filters.based_on_payment_terms and self.payment_term_map.get(gle.voucher_no):
pdc_amount = flt(self.pdc_details.get((gle.voucher_no, gle.party), {}).get("pdc_amount"))
for d in self.payment_term_map.get(gle.voucher_no): for d in self.payment_term_map.get(gle.voucher_no):
term_outstanding_amount = 0 payment_amount, d.payment_amount = self.allocate_based_on_fifo(payment_amount, d.payment_term_amount)
if payment_amount >= d[1]:
payment_amount = payment_amount - d[1] term_outstanding_amount = d.payment_term_amount - d.payment_amount
if credit_note_amount: credit_note_amount, d.credit_note_amount = self.allocate_based_on_fifo(credit_note_amount, term_outstanding_amount)
term_outstanding_amount -= credit_note_amount
row = self.prepare_row(party_naming_by, args, gle, term_outstanding_amount, term_outstanding_amount -= d.credit_note_amount
credit_note_amount, d[0], payment_amount , d[1], d[2], 0)
credit_note_amount = 0 row_outstanding = term_outstanding_amount
data.append(row) d.pdc_details = []
else: for pdc in pdc_list:
outstanding_amount = d[1] - payment_amount - credit_note_amount if row_outstanding <= pdc.pdc_amount:
if pdc_amount > outstanding_amount: d.pdc_amount += row_outstanding
pdc = outstanding_amount pdc.pdc_amount -= row_outstanding
pdc_amount -= outstanding_amount if row_outstanding and d.pdc_ref and d.pdc_date:
d.pdc_details.append(cstr(d.pdc_ref) + "/" + formatdate(d.pdc_date))
row_outstanding = 0
else: else:
pdc = pdc_amount d.pdc_amount = pdc.pdc_amount
pdc_amount = 0 if pdc.pdc_amount and d.pdc_ref and d.pdc_date:
if self.filters.get(gle.party_type): d.pdc_details.append(cstr(d.pdc_ref) + "/" + formatdate(d.pdc_date))
d[1] = d[1] * d[3] pdc.pdc_amount = 0
row = self.prepare_row(party_naming_by, args, gle, outstanding_amount, row_outstanding -= d.pdc_amount
credit_note_amount, d[0], payment_amount , d[1], d[2], pdc)
payment_amount = 0 if term_outstanding_amount > 0:
credit_note_amount = 0 row = self.prepare_row(party_naming_by, args, gle, term_outstanding_amount,
d.credit_note_amount, d.due_date, d.payment_amount , d.payment_term_amount,
d.description, d.pdc_amount, d.pdc_details)
data.append(row) data.append(row)
else: else:
row = self.prepare_row(party_naming_by, args, gle, outstanding_amount, credit_note_amount) pdc_amount = 0
pdc_details = []
for d in pdc_list:
pdc_amount += flt(d.pdc_amount)
if pdc_amount and d.pdc_ref and d.pdc_date:
pdc_details.append(cstr(d.pdc_ref) + "/" + formatdate(d.pdc_date))
row = self.prepare_row(party_naming_by, args, gle, outstanding_amount,
credit_note_amount, pdc_amount=pdc_amount, pdc_details=pdc_details)
data.append(row) data.append(row)
return data return data
def allocate_based_on_fifo(self, total_amount, row_amount):
allocated_amount = 0
if row_amount <= total_amount:
allocated_amount = row_amount
total_amount -= row_amount
else:
allocated_amount = total_amount
total_amount = 0
return total_amount, allocated_amount
def prepare_row(self, party_naming_by, args, gle, outstanding_amount, credit_note_amount, def prepare_row(self, party_naming_by, args, gle, outstanding_amount, credit_note_amount,
due_date=None, paid_amt=None, payment_term_amount=None, payment_term=None, pdc_amount=None): due_date=None, paid_amt=None, payment_term_amount=None, payment_term=None, pdc_amount=None, pdc_details=None):
row = [gle.posting_date, gle.party] row = [gle.posting_date, gle.party]
# customer / supplier name # customer / supplier name
@ -257,7 +281,7 @@ class ReceivablePayableReport(object):
if payment_term_amount: if payment_term_amount:
invoiced_amount = payment_term_amount invoiced_amount = payment_term_amount
if paid_amt == None: if not payment_term_amount:
paid_amt = invoiced_amount - outstanding_amount - credit_note_amount paid_amt = invoiced_amount - outstanding_amount - credit_note_amount
row += [invoiced_amount, paid_amt, credit_note_amount, outstanding_amount] row += [invoiced_amount, paid_amt, credit_note_amount, outstanding_amount]
@ -288,16 +312,9 @@ class ReceivablePayableReport(object):
else: else:
row.append(self.company_currency) row.append(self.company_currency)
pdc = self.pdc_details.get((gle.voucher_no, gle.party), {}) remaining_balance = outstanding_amount - flt(pdc_amount)
pdc_details = ", ".join(pdc_details)
if pdc_amount == None: row += [pdc_details, pdc_amount, remaining_balance]
pdc_amount = flt(pdc.get("pdc_amount"))
pdc_date = pdc.get("pdc_date") if pdc_amount else ''
pdc_ref = pdc.get("pdc_ref") if pdc_amount else ''
remaining_balance = outstanding_amount - pdc_amount
row += [pdc_date, pdc_ref, pdc_amount, remaining_balance]
<<<<<<< HEAD <<<<<<< HEAD
# customer territory / supplier group # customer territory / supplier group
@ -506,22 +523,27 @@ class ReceivablePayableReport(object):
def get_payment_term_detail(self, voucher_nos): def get_payment_term_detail(self, voucher_nos):
payment_term_map = frappe._dict() payment_term_map = frappe._dict()
for d in frappe.db.sql(""" select si.name, si.payment_terms_template, payment_terms_details = frappe.db.sql(""" select si.name,
party_account_currency, currency, si.conversion_rate, party_account_currency, currency, si.conversion_rate,
ps.due_date, ps.payment_amount, ps.description ps.due_date, ps.payment_amount, ps.description
from `tabSales Invoice` si, `tabPayment Schedule` ps from `tabSales Invoice` si, `tabPayment Schedule` ps
where si.name = ps.parent and where si.name = ps.parent and
si.docstatus = 1 and si.company = '%s' and si.docstatus = 1 and si.company = '%s' and
si.name in (%s) order by ps.due_date""" si.name in (%s) order by ps.due_date
% (self.filters.company, ','.join(['%s'] *len(voucher_nos))), (tuple(voucher_nos)), as_dict = 1): """ % (self.filters.company, ','.join(['%s'] *len(voucher_nos))),
if d.payment_terms_template: (tuple(voucher_nos)), as_dict = 1)
if self.filters.get("customer") and d.currency == d.party_account_currency:
payment_term_amount = d.payment_amount
else:
payment_term_amount = flt(flt(d.payment_amount) * flt(d.conversion_rate), self.currency_precision)
payment_term_map.setdefault(d.name, []) for d in payment_terms_details:
payment_term_map[d.name].append((d.due_date, payment_term_amount, d.description)) if self.filters.get("customer") and d.currency == d.party_account_currency:
payment_term_amount = d.payment_amount
else:
payment_term_amount = flt(flt(d.payment_amount) * flt(d.conversion_rate), self.currency_precision)
payment_term_map.setdefault(d.name, []).append(frappe._dict({
"due_date": d.due_date,
"payment_term_amount": payment_term_amount,
"description": d.description
}))
return payment_term_map return payment_term_map
def get_chart_data(self, columns, data): def get_chart_data(self, columns, data):
@ -571,12 +593,11 @@ def get_ageing_data(first_range, second_range, third_range, age_as_on, entry_dat
def get_pdc_details(party_type, report_date): def get_pdc_details(party_type, report_date):
pdc_details = frappe._dict() pdc_details = frappe._dict()
pdc_via_pe = frappe.db.sql("""
for pdc in frappe.db.sql("""
select select
pref.reference_name as invoice_no, pent.party, pent.party_type, pref.reference_name as invoice_no, pent.party, pent.party_type,
max(pent.posting_date) as pdc_date, sum(ifnull(pref.allocated_amount,0)) as pdc_amount, pent.posting_date as pdc_date, ifnull(pref.allocated_amount,0) as pdc_amount,
GROUP_CONCAT(pent.reference_no SEPARATOR ', ') as pdc_ref pent.reference_no as pdc_ref
from from
`tabPayment Entry` as pent inner join `tabPayment Entry Reference` as pref `tabPayment Entry` as pent inner join `tabPayment Entry Reference` as pref
on on
@ -584,19 +605,22 @@ def get_pdc_details(party_type, report_date):
where where
pent.docstatus < 2 and pent.posting_date > %s pent.docstatus < 2 and pent.posting_date > %s
and pent.party_type = %s and pent.party_type = %s
group by pent.party, pref.reference_name""", (report_date, party_type), as_dict=1): """, (report_date, party_type), as_dict=1)
pdc_details.setdefault((pdc.invoice_no, pdc.party), pdc)
for pdc in pdc_via_pe:
pdc_details.setdefault((pdc.invoice_no, pdc.party), []).append(pdc)
if scrub(party_type): if scrub(party_type):
amount_field = ("jea.debit_in_account_currency" amount_field = ("jea.debit_in_account_currency"
if party_type == 'Supplier' else "jea.credit_in_account_currency") if party_type == 'Supplier' else "jea.credit_in_account_currency")
else: else:
amount_field = "jea.debit + jea.credit" amount_field = "jea.debit + jea.credit"
for pdc in frappe.db.sql(""" pdc_via_je = frappe.db.sql("""
select select
jea.reference_name as invoice_no, jea.party, jea.party_type, jea.reference_name as invoice_no, jea.party, jea.party_type,
max(je.posting_date) as pdc_date, sum(ifnull({0},0)) as pdc_amount, je.posting_date as pdc_date, ifnull({0},0) as pdc_amount,
GROUP_CONCAT(je.cheque_no SEPARATOR ', ') as pdc_ref je.cheque_no as pdc_ref
from from
`tabJournal Entry` as je inner join `tabJournal Entry Account` as jea `tabJournal Entry` as je inner join `tabJournal Entry Account` as jea
on on
@ -604,16 +628,10 @@ def get_pdc_details(party_type, report_date):
where where
je.docstatus < 2 and je.posting_date > %s je.docstatus < 2 and je.posting_date > %s
and jea.party_type = %s and jea.party_type = %s
group by jea.party, jea.reference_name""".format(amount_field), (report_date, party_type), as_dict=1): """.format(amount_field), (report_date, party_type), as_dict=1)
if (pdc.invoice_no, pdc.party) in pdc_details:
key = (pdc.invoice_no, pdc.party) for pdc in pdc_via_je:
pdc_details[key]["pdc_amount"] += pdc.pdc_amount pdc_details.setdefault((pdc.invoice_no, pdc.party), []).append(pdc)
if pdc.pdc_ref:
pdc_details[key]["pdc_ref"] += ", " + pdc.pdc_ref
if pdc.pdc_date:
pdc_details[key]["pdc_date"] = max(pdc_details[key]["pdc_date"], pdc.pdc_date)
else:
pdc_details.setdefault((pdc.invoice_no, pdc.party), pdc)
return pdc_details return pdc_details