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

[Fix] Alignment and date issue in PDC report

Browse Source
This commit is contained in:
Rohit Waghchaure 2018-03-28 15:25:12 +05:30
parent a6746407e5
commit ace68cd283
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/accounts/report/accounts_receivable/accounts_receivable.html
View File

@ -4,12 +4,21 @@
.print-format { .print-format {
padding: 8mm; padding: 8mm;
margin:4mm; margin:4mm;
font-size:10px; font-size: 10.0pt !important;
font-family: Tahoma, sans-serif; font-family: Tahoma, sans-serif;
} }
} }
</style> </style>
{% } %} {% } %}
<style>
.print-format {
padding: 8mm;
margin:4mm;
font-size: 10.0pt !important;
font-family: Tahoma, sans-serif;
}
</style>
<h2 class="text-center">{%= __(report.report_name) %}</h2> <h2 class="text-center">{%= __(report.report_name) %}</h2>
<h4 class="text-center">{%= filters.customer || filters.supplier %} </h4> <h4 class="text-center">{%= filters.customer || filters.supplier %} </h4>
@ -126,9 +135,14 @@
{% if(report.report_name === "Accounts Receivable" || report.report_name === "Accounts Payable") { %} {% if(report.report_name === "Accounts Receivable" || report.report_name === "Accounts Payable") { %}
{% if(data[i][__("Customer")] || data[i][__("Supplier")]) { %} {% if(data[i][__("Customer")] || data[i][__("Supplier")]) { %}
<td>{%= dateutil.str_to_user(data[i]["posting_date"]) %}</td> <td>{%= dateutil.str_to_user(data[i]["posting_date"]) %}</td>
<td>{%= data[i]["voucher_type"] %} <td>
<br>{%= data[i]["voucher_no"] %}</td> {% if(!filters.show_pdc_in_print) { %}
{% if(!filters.show_pdc_in_print) { %} {%= data[i]["voucher_type"] %}
<br>
{% } %}
{%= data[i]["voucher_no"] %}
</td>
{% if(!filters.show_pdc_in_print) { %}
<td> <td>
{% if(!(filters.customer || filters.supplier)) { %} {% if(!(filters.customer || filters.supplier)) { %}
{%= data[i][__("Customer")] || data[i][__("Supplier")] %} {%= data[i][__("Customer")] || data[i][__("Supplier")] %}

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

@ -136,7 +136,7 @@ class ReceivablePayableReport(object):
return_entries = self.get_return_entries(args.get("party_type")) return_entries = self.get_return_entries(args.get("party_type"))
data = [] data = []
pdc_details = get_pdc_details(args.get("party_type")) pdc_details = get_pdc_details(args.get("party_type"), self.filters.report_date)
for gle in self.get_entries_till(self.filters.report_date, args.get("party_type")): for gle in self.get_entries_till(self.filters.report_date, args.get("party_type")):
if self.is_receivable_or_payable(gle, dr_or_cr, future_vouchers): if self.is_receivable_or_payable(gle, dr_or_cr, future_vouchers):
@ -182,6 +182,7 @@ class ReceivablePayableReport(object):
row.append(company_currency) row.append(company_currency)
pdc = pdc_details.get((gle.voucher_no, gle.party), {}) pdc = pdc_details.get((gle.voucher_no, gle.party), {})
remaining_balance = outstanding_amount - flt(pdc.get("pdc_amount")) remaining_balance = outstanding_amount - flt(pdc.get("pdc_amount"))
row += [pdc.get("pdc_date"), pdc.get("pdc_ref"), row += [pdc.get("pdc_date"), pdc.get("pdc_ref"),
flt(pdc.get("pdc_amount")), remaining_balance] flt(pdc.get("pdc_amount")), remaining_balance]
@ -398,7 +399,7 @@ def get_ageing_data(first_range, second_range, third_range, age_as_on, entry_dat
return [age] + outstanding_range return [age] + outstanding_range
def get_pdc_details(party_type): def get_pdc_details(party_type, report_date):
pdc_details = frappe._dict() pdc_details = frappe._dict()
for pdc in frappe.db.sql(""" for pdc in frappe.db.sql("""
@ -411,13 +412,14 @@ def get_pdc_details(party_type):
on on
(pref.parent = pent.name) (pref.parent = pent.name)
where where
pent.docstatus < 2 and pent.reference_date >= pent.posting_date pent.docstatus < 2 and pent.reference_date >= %s
and pent.party_type = %s and pent.party_type = %s
group by pent.party, pref.reference_name""", party_type, as_dict=1): group by pent.party, pref.reference_name""", (report_date, party_type), as_dict=1):
pdc_details.setdefault((pdc.invoice_no, pdc.party), pdc) pdc_details.setdefault((pdc.invoice_no, pdc.party), pdc)
if scrub(party_type): if scrub(party_type):
amount_field = "jea.debit_in_account_currency + jea.credit_in_account_currency" amount_field = ("jea.debit_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"
@ -431,9 +433,9 @@ def get_pdc_details(party_type):
on on
(jea.parent = je.name) (jea.parent = je.name)
where where
je.docstatus < 2 and je.cheque_date >= je.posting_date je.docstatus < 2 and je.cheque_date >= %s
and jea.party_type = %s and jea.party_type = %s
group by jea.party, jea.reference_name""".format(amount_field), party_type, as_dict=1): group by jea.party, jea.reference_name""".format(amount_field), (report_date, party_type), as_dict=1):
if (pdc.invoice_no, pdc.party) in pdc_details: if (pdc.invoice_no, pdc.party) in pdc_details:
pdc_details[(pdc.invoice_no, pdc.party)]["pdc_amount"] += pdc.pdc_amount pdc_details[(pdc.invoice_no, pdc.party)]["pdc_amount"] += pdc.pdc_amount
else: else: