nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-18 02:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fixes] accounts, stock changes

Browse Source
This commit is contained in:
Rushabh Mehta
2015-02-18 20:22:59 +05:30
parent 614e7ab757
commit 8bb6e530c7
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/taxes_and_totals.py
View File

@@ -371,14 +371,14 @@ class calculate_taxes_and_totals(object):
return grand_total_for_discount_amount
def calculate_total_advance(self, parenttype, advance_parentfield):
if self.docstatus < 2:
def calculate_total_advance(self):
if self.doc.docstatus < 2:
sum_of_allocated_amount = sum([flt(adv.allocated_amount, self.doc.precision("allocated_amount", adv))
for adv in self.doc.get("advances")])
self.doc.total_advance = flt(sum_of_allocated_amount, self.doc.precision("total_advance"))
if self.docstatus == 0:
if self.doc.docstatus == 0:
self.calculate_outstanding_amount()
def calculate_outstanding_amount(self):