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

style: removed comments

Browse Source
This commit is contained in:
Afshan
2020-10-22 16:19:32 +05:30
parent 47978da2a7
commit 3a454ff67b
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,7 @@ frappe.ui.form.on('Employee Advance', {
frm.add_custom_button( frm.add_custom_button(
__("Expense Claim"), __("Expense Claim"),
function() { function() {
frm.events.make_expense_claim(frm); //Change this frm.events.make_expense_claim(frm);
}, },
__('Create') __('Create')
); );
@@ -64,11 +64,11 @@ frappe.ui.form.on('Employee Advance', {
if (frm.doc.repay_unclaimed_amount_from_salary == 0 && frappe.model.can_create("Journal Entry")){ if (frm.doc.repay_unclaimed_amount_from_salary == 0 && frappe.model.can_create("Journal Entry")){
frm.add_custom_button(__("Return"), function() { frm.add_custom_button(__("Return"), function() {
frm.trigger('make_return_entry'); //Change this frm.trigger('make_return_entry');
}, __('Create')); }, __('Create'));
}else if (frm.doc.repay_unclaimed_amount_from_salary == 1 && frappe.model.can_create("Additional Salary")){ }else if (frm.doc.repay_unclaimed_amount_from_salary == 1 && frappe.model.can_create("Additional Salary")){
frm.add_custom_button(__("Deduction from salary"), function() { frm.add_custom_button(__("Deduction from salary"), function() {
frm.events.make_deduction_via_additional_salary(frm) //Change this frm.events.make_deduction_via_additional_salary(frm);
}, __('Create')); }, __('Create'));
} }
} }

1
erpnext/payroll/doctype/salary_slip/salary_slip.js
View File

@@ -84,7 +84,6 @@ frappe.ui.form.on("Salary Slip", {
set_dynamic_labels: function(frm) { set_dynamic_labels: function(frm) {
var company_currency = frm.doc.company? erpnext.get_currency(frm.doc.company): frappe.defaults.get_default("currency"); var company_currency = frm.doc.company? erpnext.get_currency(frm.doc.company): frappe.defaults.get_default("currency");
// frm.events.set_exchange_rate(frm, company_currency);
if (frm.doc.currency && company_currency!=frm.doc.currency) { if (frm.doc.currency && company_currency!=frm.doc.currency) {
frm.events.hide_loan_section(frm); frm.events.hide_loan_section(frm);
} }