nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2020-04-06 11:16:31 +05:30
parent 31fbafe16f 22a069d4b0
commit 322660c644
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/doctype/expense_claim/expense_claim.json
View File

@@ -278,6 +278,7 @@
"label": "More Details"
},
{
"allow_on_submit": 1,
"default": "Draft",
"fieldname": "status",
"fieldtype": "Select",
@@ -366,7 +367,8 @@
"icon": "fa fa-money",
"idx": 1,
"is_submittable": 1,
"modified": "2019-11-08 14:13:08.964547",
"links": [],
"modified": "2020-03-16 18:11:07.861985",
"modified_by": "Administrator",
"module": "HR",
"name": "Expense Claim",

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

@@ -45,7 +45,7 @@ class ExpenseClaim(AccountsController):
paid_amount = flt(self.total_amount_reimbursed) + flt(self.total_advance_amount)
precision = self.precision("grand_total")
if (self.is_paid or (flt(self.total_sanctioned_amount) > 0
and flt(self.grand_total, precision) == flt(paid_amount, precision))) \
and flt(self.total_sanctioned_amount, precision) == flt(paid_amount, precision))) \
and self.docstatus == 1 and self.approval_status == 'Approved':
self.status = "Paid"
elif flt(self.total_sanctioned_amount) > 0 and self.docstatus == 1 and self.approval_status == 'Approved':