nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 21:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-fixes

Browse Source
This commit is contained in:
Frappe Bot
2018-11-15 09:12:04 +00:00
parent cc907559d0 0b697c5298
commit 98b4a1bc81
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.1.71' __version__ = '10.1.72'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/hr/doctype/employee_advance/employee_advance.py
View File

@@ -67,7 +67,7 @@ class EmployeeAdvance(Document):
select sum(ifnull(allocated_amount, 0)) select sum(ifnull(allocated_amount, 0))
from `tabExpense Claim Advance` from `tabExpense Claim Advance`
where employee_advance = %s and docstatus=1 and allocated_amount > 0 where employee_advance = %s and docstatus=1 and allocated_amount > 0
""", self.name)[0][0] """, self.name)[0][0] or 0
if claimed_amount: if claimed_amount:
frappe.db.set_value("Employee Advance", self.name, "claimed_amount", flt(claimed_amount)) frappe.db.set_value("Employee Advance", self.name, "claimed_amount", flt(claimed_amount))