From a0b1124d6fc4f5f58d58901a7f0dbd8a16aabb25 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 6 May 2015 11:59:23 +0530 Subject: [PATCH 1/2] minor fix in report --- .../payment_period_based_on_invoice_date.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py index b1d74373fc..88e823dbd5 100644 --- a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +++ b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals import frappe from frappe import msgprint, _ +from frappe.utils import flt from erpnext.accounts.report.accounts_receivable.accounts_receivable import get_ageing_data def execute(filters=None): @@ -19,10 +20,10 @@ def execute(filters=None): for d in entries: if d.against_voucher: against_date = d.against_voucher and invoice_posting_date_map[d.against_voucher] or "" - outstanding_amount = d.debit or -1*d.credit + outstanding_amount = flt(d.debit) or -1*flt(d.credit) else: against_date = d.against_invoice and invoice_posting_date_map[d.against_invoice] or "" - outstanding_amount = d.credit or -1*d.debit + outstanding_amount = flt(d.credit) or -1*flt(d.debit) row = [d.name, d.account, d.posting_date, d.against_voucher or d.against_invoice, against_date, d.debit, d.credit, d.cheque_no, d.cheque_date, d.remark] From d5e2788cb4effb7701f603dc93b2a09460d1773e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 7 May 2015 15:28:21 +0530 Subject: [PATCH 2/2] Permission for Stock ledger and balance report --- erpnext/config/stock.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py index fbf7d7ce92..d9e75592e7 100644 --- a/erpnext/config/stock.py +++ b/erpnext/config/stock.py @@ -140,13 +140,13 @@ def get_data(): "type": "report", "is_query_report": True, "name": "Stock Ledger", - "doctype": "Item", + "doctype": "Stock Ledger Entry", }, { "type": "report", "is_query_report": True, "name": "Stock Balance", - "doctype": "Warehouse" + "doctype": "Stock Ledger Entry" }, { "type": "report",