From fcc4021e44ccaf7f7abe68988e113d412443b563 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 29 Jul 2015 17:30:57 +0530 Subject: [PATCH 1/2] minor fix in payment reconciliation --- .../doctype/payment_reconciliation/payment_reconciliation.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py index 05c1bc4886..ecbf78ce37 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py @@ -190,8 +190,9 @@ class PaymentReconciliation(Document): if flt(p.allocated_amount) > flt(p.amount): frappe.throw(_("Row {0}: Allocated amount {1} must be less than or equals to JV amount {2}") .format(p.idx, p.allocated_amount, p.amount)) - - if flt(p.allocated_amount) > unreconciled_invoices.get(p.invoice_type, {}).get(p.invoice_number): + + invoice_outstanding = unreconciled_invoices.get(p.invoice_type, {}).get(p.invoice_number) + if abs(flt(p.allocated_amount) - invoice_outstanding) > 0.009: frappe.throw(_("Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2}") .format(p.idx, p.allocated_amount, unreconciled_invoices.get(p.invoice_type, {}).get(p.invoice_number))) From f33787a70638ab880fb16844752334262b9facf6 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 29 Jul 2015 18:08:10 +0530 Subject: [PATCH 2/2] [fix] Get serial nos using FIFO in Return Delivery Note --- erpnext/stock/get_item_details.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 82446ed420..faf3d98c0f 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -300,7 +300,7 @@ def get_serial_nos_by_fifo(args, item_doc): order by timestamp(purchase_date, purchase_time) asc limit %(qty)s""", { "item_code": args.item_code, "warehouse": args.warehouse, - "qty": cint(args.qty) + "qty": abs(cint(args.qty)) })) def get_actual_batch_qty(batch_no,warehouse,item_code):