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

Merge pull request #23709 from marination/cashier-closing-type-issue

Browse Source 
fix: Cashier Closing Type Issue
This commit is contained in:
Marica 2020-10-23 14:43:18 +05:30 committed by GitHub
commit 99dfbfc365
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/cashier_closing/cashier_closing.py
View File

@ -23,13 +23,13 @@ class CashierClosing(Document):
where posting_date=%s and posting_time>=%s and posting_time<=%s and owner=%s where posting_date=%s and posting_time>=%s and posting_time<=%s and owner=%s
""", (self.date, self.from_time, self.time, self.user)) """, (self.date, self.from_time, self.time, self.user))
self.outstanding_amount = flt(values[0][0] if values else 0) self.outstanding_amount = flt(values[0][0] if values else 0)
def make_calculations(self): def make_calculations(self):
total = 0.00 total = 0.00
for i in self.payments: for i in self.payments:
total += flt(i.amount) total += flt(i.amount)
self.net_amount = total + self.outstanding_amount + self.expense - self.custody + self.returns self.net_amount = total + self.outstanding_amount + flt(self.expense) - flt(self.custody) + flt(self.returns)
def validate_time(self): def validate_time(self):
if self.from_time >= self.time: if self.from_time >= self.time: