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

fix: Updated filters for process statement of accounts

Browse Source
This commit is contained in:
Deepesh Garg 2021-04-19 12:19:31 +05:30
parent dcdd3bebbe
commit bb746fcbe4
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html
View File

@ -19,7 +19,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for row in data %} {% for row in data %}
<tr> <tr>
{% if(row.posting_date) %} {% if(row.posting_date) %}
<td>{{ frappe.format(row.posting_date, 'Date') }}</td> <td>{{ frappe.format(row.posting_date, 'Date') }}</td>
@ -78,10 +78,10 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>{{ aging.range1 }}</td> <td>{{ frappe.utils.fmt_money(aging.range1, currency=filters.presentation_currency) }}</td>
<td>{{ aging.range2 }}</td> <td>{{ frappe.utils.fmt_money(aging.range2, currency=filters.presentation_currency) }}</td>
<td>{{ aging.range3 }}</td> <td>{{ frappe.utils.fmt_money(aging.range3, currency=filters.presentation_currency) }}</td>
<td>{{ aging.range4 }}</td> <td>{{ frappe.utils.fmt_money(aging.range4, currency=filters.presentation_currency) }}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

7
erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
View File

@ -7,8 +7,9 @@ import frappe
from frappe.model.document import Document from frappe.model.document import Document
from erpnext.accounts.report.general_ledger.general_ledger import execute as get_soa from erpnext.accounts.report.general_ledger.general_ledger import execute as get_soa
from erpnext.accounts.report.accounts_receivable_summary.accounts_receivable_summary import execute as get_ageing from erpnext.accounts.report.accounts_receivable_summary.accounts_receivable_summary import execute as get_ageing
from frappe.core.doctype.communication.email import make from erpnext import get_company_currency
from frappe.core.doctype.communication.email import make
from frappe.utils.print_format import report_to_pdf from frappe.utils.print_format import report_to_pdf
from frappe.utils.pdf import get_pdf from frappe.utils.pdf import get_pdf
from frappe.utils import today, add_days, add_months, getdate, format_date from frappe.utils import today, add_days, add_months, getdate, format_date
@ -64,16 +65,16 @@ def get_report_pdf(doc, consolidated=True):
'to_date': doc.to_date, 'to_date': doc.to_date,
'company': doc.company, 'company': doc.company,
'finance_book': doc.finance_book if doc.finance_book else None, 'finance_book': doc.finance_book if doc.finance_book else None,
"account": doc.account if doc.account else None, 'account': doc.account if doc.account else None,
'party_type': 'Customer', 'party_type': 'Customer',
'party': [entry.customer], 'party': [entry.customer],
'presentation_currency': doc.currency or get_company_currency(doc.company),
'group_by': doc.group_by, 'group_by': doc.group_by,
'currency': doc.currency, 'currency': doc.currency,
'cost_center': [cc.cost_center_name for cc in doc.cost_center], 'cost_center': [cc.cost_center_name for cc in doc.cost_center],
'project': [p.project_name for p in doc.project], 'project': [p.project_name for p in doc.project],
'show_opening_entries': 0, 'show_opening_entries': 0,
'include_default_book_entries': 0, 'include_default_book_entries': 0,
'show_cancelled_entries': 1,
'tax_id': tax_id if tax_id else None 'tax_id': tax_id if tax_id else None
}) })
col, res = get_soa(filters) col, res = get_soa(filters)