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

fix: refactor

Browse Source
This commit is contained in:
Afshan
2020-10-27 14:33:43 +05:30
parent 7eac48b102
commit eca0e17d11
4 changed files with 14 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,7 +144,6 @@ frappe.ui.form.on('Employee Advance', {
employee: function (frm) { employee: function (frm) {
if (frm.doc.employee) { if (frm.doc.employee) {
frm.trigger('get_pending_amount'); frm.trigger('get_pending_amount');
// frm.trigger('get_employee_currency');
} }
}, },
@@ -163,21 +162,6 @@ frappe.ui.form.on('Employee Advance', {
}); });
}, },
// get_employee_currency: function(frm) {
// frappe.call({
// method: "erpnext.payroll.doctype.salary_structure_assignment.salary_structure_assignment.get_employee_currency",
// args: {
// employee: frm.doc.employee,
// },
// callback: function(r) {
// if(r.message) {
// frm.set_value('currency', r.message);
// frm.refresh_fields();
// }
// }
// });
// },
currency: function(frm) { currency: function(frm) {
var from_currency = frm.doc.currency; var from_currency = frm.doc.currency;
var company_currency; var company_currency;

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

@@ -3,7 +3,6 @@
frappe.ui.form.on('Employee Benefit Application', { frappe.ui.form.on('Employee Benefit Application', {
employee: function(frm) { employee: function(frm) {
// frm.trigger('get_employee_currency');
frm.trigger('set_earning_component'); frm.trigger('set_earning_component');
var method, args; var method, args;
if(frm.doc.employee && frm.doc.date && frm.doc.payroll_period){ if(frm.doc.employee && frm.doc.date && frm.doc.payroll_period){

28
erpnext/payroll/doctype/employee_incentive/employee_incentive.js
View File

@@ -23,40 +23,22 @@ frappe.ui.form.on('Employee Incentive', {
employee: function(frm) { employee: function(frm) {
if (frm.doc.employee) { if (frm.doc.employee) {
frm.trigger('set_company'); frm.trigger('get_employee_details');
frm.trigger('get_employee_currency');
} else { } else {
frm.set_value("company", null); frm.set_value("company", null);
} }
}, },
set_company: function(frm) { get_employee_details: function(frm) {
frappe.call({ frappe.call({
method: "frappe.client.get_value", method: "get_employee_details",
args:{
doctype: "Employee",
fieldname: "company",
filters:{
name: frm.doc.employee
}
},
callback: function(data) {
if(data.message){
frm.set_value("company", data.message.company);
}
}
});
},
get_employee_currency: function(frm) {
frappe.call({
method: "erpnext.payroll.doctype.salary_structure_assignment.salary_structure_assignment.get_employee_currency",
args: { args: {
employee: frm.doc.employee, employee: frm.doc.employee,
}, },
callback: function(r) { callback: function(r) {
if(r.message) { if(r.message) {
frm.set_value('currency', r.message); frm.set_value('currency', r.message['currency']);
frm.set_value('company', r.message['company']);
frm.refresh_fields(); frm.refresh_fields();
} }
} }

9
erpnext/payroll/doctype/employee_incentive/employee_incentive.py
View File

@@ -6,6 +6,7 @@ from __future__ import unicode_literals
import frappe import frappe
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
from erpnext.payroll.doctype.salary_structure_assignment.salary_structure_assignment import get_employee_currency
class EmployeeIncentive(Document): class EmployeeIncentive(Document):
def validate(self): def validate(self):
@@ -29,3 +30,11 @@ class EmployeeIncentive(Document):
additional_salary.ref_doctype = self.doctype additional_salary.ref_doctype = self.doctype
additional_salary.ref_docname = self.name additional_salary.ref_docname = self.name
additional_salary.submit() additional_salary.submit()
def get_employee_details(self, employee):
employee_currency = get_employee_currency(employee)
company = frappe.db.get_value('Employee', employee, 'company')
return {
'currency': employee_currency,
'company': company
}