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

Merge pull request #3222 from nabinhait/v4.x.x

Browse Source 
V4 fix
This commit is contained in:
Nabin Hait 2015-05-07 15:39:02 +05:30
commit d1cdde1c77
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe import msgprint, _ from frappe import msgprint, _
from frappe.utils import flt
from erpnext.accounts.report.accounts_receivable.accounts_receivable import get_ageing_data from erpnext.accounts.report.accounts_receivable.accounts_receivable import get_ageing_data
def execute(filters=None): def execute(filters=None):
@ -19,10 +20,10 @@ def execute(filters=None):
for d in entries: for d in entries:
if d.against_voucher: if d.against_voucher:
against_date = d.against_voucher and invoice_posting_date_map[d.against_voucher] or "" 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: else:
against_date = d.against_invoice and invoice_posting_date_map[d.against_invoice] or "" 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, 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] against_date, d.debit, d.credit, d.cheque_no, d.cheque_date, d.remark]

4
erpnext/config/stock.py
View File

@ -140,13 +140,13 @@ def get_data():
"type": "report", "type": "report",
"is_query_report": True, "is_query_report": True,
"name": "Stock Ledger", "name": "Stock Ledger",
"doctype": "Item", "doctype": "Stock Ledger Entry",
}, },
{ {
"type": "report", "type": "report",
"is_query_report": True, "is_query_report": True,
"name": "Stock Balance", "name": "Stock Balance",
"doctype": "Warehouse" "doctype": "Stock Ledger Entry"
}, },
{ {
"type": "report", "type": "report",