Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: remove transaction section head

Browse Source
This commit is contained in:
Mangesh-Khairnar 2019-06-13 18:09:23 +05:30
parent 0a3ed374cd
commit f8bf57c956
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,7 +275,7 @@ frappe.ui.form.on("Expense Claim", {
frappe.call({ frappe.call({
method: "calculate_taxes", method: "calculate_taxes",
doc: frm.doc, doc: frm.doc,
callback: (r) => { callback: () => {
refresh_field("taxes"); refresh_field("taxes");
} }
}); });
@ -386,7 +386,7 @@ frappe.ui.form.on("Expense Taxes and Charges", {
(frm.doc.taxes || []).forEach(function(d) { (frm.doc.taxes || []).forEach(function(d) {
frm.doc.total_taxes_and_charges += d.tax_amount; frm.doc.total_taxes_and_charges += d.tax_amount;
}); });
frm.trigger("calculate_grand_total") frm.trigger("calculate_grand_total");
}, },
rate: function(frm, cdt, cdn) { rate: function(frm, cdt, cdn) {
@ -398,7 +398,7 @@ frappe.ui.form.on("Expense Taxes and Charges", {
}, },
tax_amount: function(frm, cdt, cdn) { tax_amount: function(frm, cdt, cdn) {
frm.trigger("calculate_total_tax", cdt, cdn) frm.trigger("calculate_total_tax", cdt, cdn);
} }
}); });

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

@ -334,8 +334,7 @@
}, },
{ {
"fieldname": "transactions_section", "fieldname": "transactions_section",
"fieldtype": "Section Break", "fieldtype": "Section Break"
"label": "Transactions"
}, },
{ {
"fieldname": "grand_total", "fieldname": "grand_total",
@ -360,7 +359,7 @@
"icon": "fa fa-money", "icon": "fa fa-money",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2019-06-12 20:00:25.734108", "modified": "2019-06-13 18:05:52.530462",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Expense Claim", "name": "Expense Claim",