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

fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (#28497) (#28505)

Browse Source 
* fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim

* fix: Expense Claim Advance form labels

(cherry picked from commit e7eef9601d)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
This commit is contained in:
mergify[bot]
2021-11-23 08:52:31 +05:30
committed by GitHub
parent fe94ec6036
commit 294de89b9b
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -389,7 +389,9 @@ frappe.ui.form.on("Expense Claim Detail", {
sanctioned_amount: function(frm, cdt, cdn) { sanctioned_amount: function(frm, cdt, cdn) {
cur_frm.cscript.calculate_total(frm.doc, cdt, cdn); cur_frm.cscript.calculate_total(frm.doc, cdt, cdn);
frm.trigger("get_taxes"); frm.trigger("get_taxes");
frm.trigger("calculate_grand_total");
}, },
cost_center: function(frm, cdt, cdn) { cost_center: function(frm, cdt, cdn) {
erpnext.utils.copy_value_in_all_rows(frm.doc, cdt, cdn, "expenses", "cost_center"); erpnext.utils.copy_value_in_all_rows(frm.doc, cdt, cdn, "expenses", "cost_center");
} }

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

@@ -379,11 +379,12 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2021-05-04 05:35:12.040199", "modified": "2021-11-22 16:26:57.787838",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Expense Claim", "name": "Expense Claim",
"name_case": "Title Case", "name_case": "Title Case",
"naming_rule": "By \"Naming Series\" field",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {

7
erpnext/hr/doctype/expense_claim_advance/expense_claim_advance.json
View File

@@ -1,4 +1,5 @@
{ {
"actions": [],
"creation": "2017-10-09 16:53:26.410762", "creation": "2017-10-09 16:53:26.410762",
"doctype": "DocType", "doctype": "DocType",
"document_type": "Document", "document_type": "Document",
@@ -50,7 +51,7 @@
"fieldname": "unclaimed_amount", "fieldname": "unclaimed_amount",
"fieldtype": "Currency", "fieldtype": "Currency",
"in_list_view": 1, "in_list_view": 1,
"label": "Unclaimed amount", "label": "Unclaimed Amount",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "advance_amount", "oldfieldname": "advance_amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -65,7 +66,7 @@
"fieldname": "allocated_amount", "fieldname": "allocated_amount",
"fieldtype": "Currency", "fieldtype": "Currency",
"in_list_view": 1, "in_list_view": 1,
"label": "Allocated amount", "label": "Allocated Amount",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "allocated_amount", "oldfieldname": "allocated_amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -87,7 +88,7 @@
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2019-12-17 13:53:22.111766", "modified": "2021-11-22 16:33:58.515819",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Expense Claim Advance", "name": "Expense Claim Advance",