From bc8b20ae3c539600fc91a075793e691816e91e0f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 13 Oct 2014 10:47:14 +0530 Subject: [PATCH] Allocate entire advance amount if advance against SO/PO --- erpnext/controllers/accounts_controller.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 9a62fc299e2..af0a96ef67c 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -387,7 +387,7 @@ class AccountsController(TransactionBase): res = frappe.db.sql(""" select - t1.name as jv_no, t1.remark, t2.%s as amount, t2.name as jv_detail_no + t1.name as jv_no, t1.remark, t2.%s as amount, t2.name as jv_detail_no, `against_%s` as against_order from `tabJournal Voucher` t1, `tabJournal Voucher Detail` t2 where @@ -400,7 +400,7 @@ class AccountsController(TransactionBase): and ifnull(t2.against_purchase_order, '') = '' ) %s) order by t1.posting_date""" % - (dr_or_cr, '%s', cond), + (dr_or_cr, against_order_field, '%s', cond), tuple([account_head] + so_list), as_dict= True) self.set(parentfield, []) @@ -411,7 +411,7 @@ class AccountsController(TransactionBase): "jv_detail_no": d.jv_detail_no, "remarks": d.remark, "advance_amount": flt(d.amount), - "allocate_amount": 0 + "allocated_amount": flt(d.amount) if d.against_order else 0 }) def validate_advance_jv(self, advance_table_fieldname, against_order_field):