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

fixed error in update_outstanding through fiscal year

Browse Source
This commit is contained in:
nabinhait 2011-06-21 16:58:01 +05:30
parent 8b849fedfe
commit 31a73f2a26
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accounts/doctype/fiscal_year/fiscal_year.py
View File

@ -100,7 +100,9 @@ class DocType:
def post_entries(self): def post_entries(self):
sql("LOCK TABLE `tabGL Entry` WRITE") sql("LOCK TABLE `tabGL Entry` WRITE")
# post each gl entry (batch or complete) # post each gl entry (batch or complete)
gle = sql("select name, account, debit, credit, is_opening, posting_date from `tabGL Entry` where fiscal_year=%s and ifnull(is_cancelled,'No')='No' and company=%s", (self.doc.name, self.doc.company)) gle = sql("select name, account, debit, credit, is_opening, posting_date from `tabGL Entry` where fiscal_year=%s and ifnull(is_cancelled,'No')='No' and company=%s
", (self.doc.name, self.doc.company))
account_details = {} account_details = {}
cnt = 0 cnt = 0
@ -163,7 +165,7 @@ class DocType:
# Clear outstanding # Clear outstanding
self.clear_outstanding() self.clear_outstanding()
sql("LOCK TABLE `tabGL Entry` WRITE") sql("LOCK TABLE `tabGL Entry` WRITE")
against_voucher = sql("select against_voucher, against_voucher_type from `tabGL Entry` where fiscal_year=%s and is_cancelled='No' and company=%s group by against_voucher, against_voucher_type for update", (self.doc.name, self.doc.company)) against_voucher = sql("select against_voucher, against_voucher_type from `tabGL Entry` where fiscal_year=%s and is_cancelled='No' and company=%s and ifnull(against_voucher, '') != '' and ifnull(against_voucher_type, '') != '' group by against_voucher, against_voucher_type", (self.doc.name, self.doc.company))
for d in against_voucher: for d in against_voucher:
# get voucher balance # get voucher balance
bal = sql("select sum(debit)-sum(credit) from `tabGL Entry` where against_voucher=%s and against_voucher_type=%s", (d[0], d[1])) bal = sql("select sum(debit)-sum(credit) from `tabGL Entry` where against_voucher=%s and against_voucher_type=%s", (d[0], d[1]))