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

feat: change the claim amount in expenses to amount

Browse Source
This commit is contained in:
Mangesh-Khairnar
2019-06-12 12:52:02 +05:30
parent ac9a4fe03c
commit 444313bdfc
8 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/demo/user/hr.py
View File

@@ -97,7 +97,7 @@ def get_expenses():
"expense_date": frappe.flags.current_date,
"expense_type": expense_type.name,
"default_account": expense_type.default_account or "Miscellaneous Expenses - WPL",
"claim_amount": claim_amount,
"amount": claim_amount,
"sanctioned_amount": claim_amount
})
@@ -107,7 +107,7 @@ def update_sanctioned_amount(expense_claim):
for expense in expense_claim.expenses:
sanctioned_amount = random.randint(1,20)*10
if sanctioned_amount < expense.claim_amount:
if sanctioned_amount < expense.amount:
expense.sanctioned_amount = sanctioned_amount
def get_timesheet_based_salary_slip_employee():