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

chore: rename method get_salary_component_account method to set

Browse Source 
- since it doesn't return any value
This commit is contained in:
Rucha Mahabal
2022-05-30 12:47:26 +05:30
parent 7d4872aedd
commit de55157997
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py
View File

@@ -22,10 +22,10 @@ from erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_
from erpnext.payroll.doctype.payroll_entry.payroll_entry import get_end_date, get_start_end_dates from erpnext.payroll.doctype.payroll_entry.payroll_entry import get_end_date, get_start_end_dates
from erpnext.payroll.doctype.salary_slip.test_salary_slip import ( from erpnext.payroll.doctype.salary_slip.test_salary_slip import (
create_account, create_account,
get_salary_component_account,
make_deduction_salary_component, make_deduction_salary_component,
make_earning_salary_component, make_earning_salary_component,
make_employee_salary_slip, make_employee_salary_slip,
set_salary_component_account,
) )
from erpnext.payroll.doctype.salary_structure.test_salary_structure import ( from erpnext.payroll.doctype.salary_structure.test_salary_structure import (
create_salary_structure_assignment, create_salary_structure_assignment,
@@ -66,7 +66,7 @@ class TestPayrollEntry(unittest.TestCase):
if not frappe.db.get_value( if not frappe.db.get_value(
"Salary Component Account", {"parent": data.name, "company": company}, "name" "Salary Component Account", {"parent": data.name, "company": company}, "name"
): ):
get_salary_component_account(data.name) set_salary_component_account(data.name)
employee = frappe.db.get_value("Employee", {"company": company}) employee = frappe.db.get_value("Employee", {"company": company})
company_doc = frappe.get_doc("Company", company) company_doc = frappe.get_doc("Company", company)
@@ -95,7 +95,7 @@ class TestPayrollEntry(unittest.TestCase):
if not frappe.db.get_value( if not frappe.db.get_value(
"Salary Component Account", {"parent": data.name, "company": company}, "name" "Salary Component Account", {"parent": data.name, "company": company}, "name"
): ):
get_salary_component_account(data.name) set_salary_component_account(data.name)
company_doc = frappe.get_doc("Company", company) company_doc = frappe.get_doc("Company", company)
salary_structure = make_salary_structure( salary_structure = make_salary_structure(
@@ -148,7 +148,7 @@ class TestPayrollEntry(unittest.TestCase):
if not frappe.db.get_value( if not frappe.db.get_value(
"Salary Component Account", {"parent": data.name, "company": "_Test Company"}, "name" "Salary Component Account", {"parent": data.name, "company": "_Test Company"}, "name"
): ):
get_salary_component_account(data.name) set_salary_component_account(data.name)
if not frappe.db.exists("Department", "cc - _TC"): if not frappe.db.exists("Department", "cc - _TC"):
frappe.get_doc( frappe.get_doc(

4
erpnext/payroll/doctype/salary_slip/test_salary_slip.py
View File

@@ -1046,10 +1046,10 @@ def make_salary_component(salary_components, test_tax, company_list=None):
doc.update(salary_component) doc.update(salary_component)
doc.insert() doc.insert()
get_salary_component_account(doc, company_list) set_salary_component_account(doc, company_list)
def get_salary_component_account(sal_comp, company_list=None): def set_salary_component_account(sal_comp, company_list=None):
company = erpnext.get_default_company() company = erpnext.get_default_company()
if company_list and company not in company_list: if company_list and company not in company_list: