mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-02 19:59:12 +00:00
[Fix] Not able to submit the expense claim (#15057)
This commit is contained in:
committed by
Nabin Hait
parent
dc7004e083
commit
0452b405f4
@@ -30,7 +30,7 @@ class ExpenseClaim(AccountsController):
|
|||||||
self.validate_expense_approver()
|
self.validate_expense_approver()
|
||||||
self.calculate_total_amount()
|
self.calculate_total_amount()
|
||||||
set_employee_name(self)
|
set_employee_name(self)
|
||||||
self.set_expense_account()
|
self.set_expense_account(validate=True)
|
||||||
self.set_payable_account()
|
self.set_payable_account()
|
||||||
self.set_cost_center()
|
self.set_cost_center()
|
||||||
self.set_status()
|
self.set_status()
|
||||||
@@ -235,9 +235,9 @@ class ExpenseClaim(AccountsController):
|
|||||||
if flt(d.sanctioned_amount) > flt(d.claim_amount):
|
if flt(d.sanctioned_amount) > flt(d.claim_amount):
|
||||||
frappe.throw(_("Sanctioned Amount cannot be greater than Claim Amount in Row {0}.").format(d.idx))
|
frappe.throw(_("Sanctioned Amount cannot be greater than Claim Amount in Row {0}.").format(d.idx))
|
||||||
|
|
||||||
def set_expense_account(self):
|
def set_expense_account(self, validate=False):
|
||||||
for expense in self.expenses:
|
for expense in self.expenses:
|
||||||
if not expense.default_account:
|
if not expense.default_account or not validate:
|
||||||
expense.default_account = get_expense_claim_account(expense.expense_type, self.company)["account"]
|
expense.default_account = get_expense_claim_account(expense.expense_type, self.company)["account"]
|
||||||
|
|
||||||
def update_reimbursed_amount(doc):
|
def update_reimbursed_amount(doc):
|
||||||
|
|||||||
Reference in New Issue
Block a user