nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 11:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: linter issues

Browse Source
This commit is contained in:
Rucha Mahabal
2021-12-28 08:54:05 +05:30
parent 3c8ed4f737
commit 8226ea65c8
5 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/patches/v14_0/set_payroll_cost_centers.py
View File

@@ -1,5 +1,6 @@
import frappe import frappe
def execute(): def execute():
frappe.reload_doc('payroll', 'doctype', 'employee_cost_center') frappe.reload_doc('payroll', 'doctype', 'employee_cost_center')
frappe.reload_doc('payroll', 'doctype', 'salary_structure_assignment') frappe.reload_doc('payroll', 'doctype', 'salary_structure_assignment')

1
erpnext/payroll/doctype/employee_cost_center/employee_cost_center.py
View File

@@ -4,5 +4,6 @@
# import frappe # import frappe
from frappe.model.document import Document from frappe.model.document import Document
class EmployeeCostCenter(Document): class EmployeeCostCenter(Document):
pass pass

4
erpnext/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py
View File

@@ -5,7 +5,7 @@
import frappe import frappe
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
from frappe.utils import getdate, flt from frappe.utils import flt, getdate
class DuplicateAssignment(frappe.ValidationError): pass class DuplicateAssignment(frappe.ValidationError): pass
@@ -79,7 +79,6 @@ class SalaryStructureAssignment(Document):
frappe.throw(_("Total percentage against cost centers should be 100")) frappe.throw(_("Total percentage against cost centers should be 100"))
def get_assigned_salary_structure(employee, on_date): def get_assigned_salary_structure(employee, on_date):
if not employee or not on_date: if not employee or not on_date:
return None return None
@@ -93,6 +92,7 @@ def get_assigned_salary_structure(employee, on_date):
}) })
return salary_structure[0][0] if salary_structure else None return salary_structure[0][0] if salary_structure else None
@frappe.whitelist() @frappe.whitelist()
def get_employee_currency(employee): def get_employee_currency(employee):
employee_currency = frappe.db.get_value('Salary Structure Assignment', {'employee': employee}, 'currency') employee_currency = frappe.db.get_value('Salary Structure Assignment', {'employee': employee}, 'currency')