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

Merge pull request #31813 from ruchamahabal/fix-claim

Browse Source
This commit is contained in:
Rucha Mahabal
2022-08-09 18:52:22 +05:30
committed by GitHub
parent 0057c10a7d 63cd4349a6
commit 63715bf229
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/hr/doctype/expense_claim/expense_claim.js
View File

@@ -254,9 +254,11 @@ frappe.ui.form.on("Expense Claim", {
}, __("View")); }, __("View"));
} }
if (frm.doc.docstatus===1 && !cint(frm.doc.is_paid) && cint(frm.doc.grand_total) > 0 if (
&& (cint(frm.doc.total_amount_reimbursed) < cint(frm.doc.total_sanctioned_amount)) frm.doc.docstatus === 1
&& frappe.model.can_create("Payment Entry")) { && frm.doc.status !== "Paid"
&& frappe.model.can_create("Payment Entry")
) {
frm.add_custom_button(__('Payment'), frm.add_custom_button(__('Payment'),
function() { frm.events.make_payment_entry(frm); }, __('Create')); function() { frm.events.make_payment_entry(frm); }, __('Create'));
} }

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

@@ -305,8 +305,9 @@ class ExpenseClaim(AccountsController):
if self.total_advance_amount: if self.total_advance_amount:
precision = self.precision("total_advance_amount") precision = self.precision("total_advance_amount")
amount_with_taxes = flt(self.total_sanctioned_amount, precision) + flt( amount_with_taxes = flt(
self.total_taxes_and_charges, precision (flt(self.total_sanctioned_amount, precision) + flt(self.total_taxes_and_charges, precision)),
precision,
) )
if flt(self.total_advance_amount, precision) > amount_with_taxes: if flt(self.total_advance_amount, precision) > amount_with_taxes: