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

Salary Structure Refactor, Formula on Salary Component Master (#13967)

Browse Source 
* Salary structure refactor

* Salary Structure Assignment - filters applied

* Formula on Salary Component Master

* Salary Structure - filter updated, Salary Component - fields re-arranged

* Payroll Entry - get_employee_list fix

* Salary Structure Assignment - Validate Duplicate Assignment

* Salary Structure Assignment - filters for salary structure
This commit is contained in:
Jamsheer
2018-05-11 21:05:24 +05:30
committed by Nabin Hait
parent c53e35368d
commit 46b23f8e6e
8 changed files with 430 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/projects/doctype/timesheet/test_timesheet.py
View File

@@ -118,30 +118,21 @@ class TestTimesheet(unittest.TestCase):
def make_salary_structure(employee):
name = frappe.db.get_value('Salary Structure Employee', {'employee': employee}, 'parent')
name = frappe.db.get_value('Salary Structure Assignment', {'employee': employee}, 'salary_structure')
if name:
salary_structure = frappe.get_doc('Salary Structure', name)
else:
salary_structure = frappe.new_doc("Salary Structure")
salary_structure.name = "Timesheet Salary Structure Test"
salary_structure.salary_slip_based_on_timesheet = 1
salary_structure.from_date = add_days(nowdate(), -30)
salary_structure.salary_component = "Basic"
salary_structure.hour_rate = 50.0
salary_structure.company = "_Test Company"
salary_structure.payment_account = get_random("Account")
salary_structure.set('employees', [])
salary_structure.set('earnings', [])
salary_structure.set('deductions', [])
es = salary_structure.append('employees', {
"employee": employee,
"base": 1200,
"from_date": add_months(nowdate(),-1)
})
es = salary_structure.append('earnings', {
"salary_component": "_Test Allowance",
"amount": 100
@@ -154,6 +145,14 @@ def make_salary_structure(employee):
salary_structure.save(ignore_permissions=True)
salary_structure_assignment = frappe.new_doc("Salary Structure Assignment")
salary_structure_assignment.employee = employee
salary_structure_assignment.base = 1200
salary_structure_assignment.from_date = add_months(nowdate(), -1)
salary_structure_assignment.salary_structure = salary_structure.name
salary_structure_assignment.company = "_Test Company"
salary_structure_assignment.save(ignore_permissions=True)
return salary_structure
def make_timesheet(employee, simulate=False, billable = 0, activity_type="_Test Activity Type", project=None, task=None, company=None):