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

Merge pull request #3920 from nabinhait/advances

Browse Source 
[fix] Fetch advances in Sales/Purchase Invoice
This commit is contained in:
Anand Doshi 2015-08-21 13:01:39 +05:30
commit 9b02aa722c
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/controllers/accounts_controller.py
View File

@ -215,14 +215,15 @@ class AccountsController(TransactionBase):
"""Returns list of advances against Account, Party, Reference""" """Returns list of advances against Account, Party, Reference"""
order_list = list(set([d.get(against_order_field) for d in self.get("items") if d.get(against_order_field)])) order_list = list(set([d.get(against_order_field) for d in self.get("items") if d.get(against_order_field)]))
if not order_list:
return
in_placeholder = ', '.join(['%s'] * len(order_list))
# conver sales_order to "Sales Order" # conver sales_order to "Sales Order"
reference_type = against_order_field.replace("_", " ").title() reference_type = against_order_field.replace("_", " ").title()
condition = ""
if order_list:
in_placeholder = ', '.join(['%s'] * len(order_list))
condition = "or (t2.reference_type = '{0}' and ifnull(t2.reference_name, '') in ({1}))"\
.format(reference_type, in_placeholder)
res = frappe.db.sql(""" res = frappe.db.sql("""
select select
t1.name as jv_no, t1.remark, t2.{0} as amount, t2.name as jv_detail_no, t1.name as jv_no, t1.remark, t2.{0} as amount, t2.name as jv_detail_no,
@ -233,11 +234,9 @@ class AccountsController(TransactionBase):
t1.name = t2.parent and t2.account = %s t1.name = t2.parent and t2.account = %s
and t2.party_type = %s and t2.party = %s and t2.party_type = %s and t2.party = %s
and t2.is_advance = 'Yes' and t1.docstatus = 1 and t2.is_advance = 'Yes' and t1.docstatus = 1
and ( and (ifnull(t2.reference_type, '')='' {1})
ifnull(t2.reference_type, '')='' order by t1.posting_date""".format(dr_or_cr, condition),
or (t2.reference_type = %s and ifnull(t2.reference_name, '') in ({1}))) [account_head, party_type, party] + order_list, as_dict=1)
order by t1.posting_date""".format(dr_or_cr, in_placeholder),
[account_head, party_type, party, reference_type] + order_list, as_dict=1)
self.set(parentfield, []) self.set(parentfield, [])
for d in res: for d in res: