nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3317 from vedusha/patch-5

Browse Source 
Update payment_period_based_on_invoice_date.py
This commit is contained in:
Nabin Hait
2015-05-25 17:18:47 +05:30
parent 8e261d2da7 093a3ecb43
commit 8320f758be
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@ from erpnext.accounts.report.accounts_receivable.accounts_receivable import get_
def execute(filters=None): def execute(filters=None):
if not filters: filters = {} if not filters: filters = {}
columns = get_columns() columns = get_columns(filters)
entries = get_entries(filters) entries = get_entries(filters)
invoice_posting_date_map = get_invoice_posting_date_map(filters) invoice_posting_date_map = get_invoice_posting_date_map(filters)
against_date = "" against_date = ""
@@ -37,13 +37,19 @@ def execute(filters=None):
return columns, data return columns, data
def get_columns(): def get_columns(filters):
return [_("Journal Voucher") + ":Link/Journal Voucher:140", _("Account") + ":Link/Account:140", linkType = ""
_("Posting Date") + ":Date:100", _("Against Invoice") + ":Link/Purchase Invoice:130", if filters.get("payment_type") == "Incoming":
_("Against Invoice Posting Date") + ":Date:130", _("Debit") + ":Currency:120", _("Credit") + ":Currency:120", linkType = "Sales Invoice"
_("Reference No") + "::100", _("Reference Date") + ":Date:100", _("Remarks") + "::150", _("Age") +":Int:40", else:
"0-30:Currency:100", "30-60:Currency:100", "60-90:Currency:100", _("90-Above") + ":Currency:100" linkType = "Purchase Invoice"
]
return [_("Journal Voucher") + ":Link/Journal Voucher:140", _("Account") + ":Link/Account:140",
_("Posting Date") + ":Date:100", _("Against Invoice") + ":Link/"+linkType+":130",
_("Against Invoice Posting Date") + ":Date:130", _("Debit") + ":Currency:120", _("Credit") + ":Currency:120",
_("Reference No") + "::100", _("Reference Date") + ":Date:100", _("Remarks") + "::150", _("Age") + ":Int:40",
"0-30:Currency:100", "30-60:Currency:100", "60-90:Currency:100", _("90-Above") + ":Currency:100"
]
def get_conditions(filters): def get_conditions(filters):
conditions = "" conditions = ""