Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: fix test for Gratuity

Browse Source
This commit is contained in:
Anurag Mishra 2020-11-03 12:33:00 +05:30
parent 550e60a69d
commit 66b697cd05
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/hr/doctype/employee/test_employee.py
View File

@ -46,6 +46,7 @@ class TestEmployee(unittest.TestCase):
self.assertRaises(EmployeeLeftValidationError, employee1_doc.save) self.assertRaises(EmployeeLeftValidationError, employee1_doc.save)
def make_employee(user, company=None, **kwargs): def make_employee(user, company=None, **kwargs):
""
if not frappe.db.get_value("User", user): if not frappe.db.get_value("User", user):
frappe.get_doc({ frappe.get_doc({
"doctype": "User", "doctype": "User",

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

@ -5,7 +5,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe import _, bold from frappe import _, bold
from frappe.model.document import Document
from frappe.utils import flt, get_datetime, get_link_to_form from frappe.utils import flt, get_datetime, get_link_to_form
from erpnext.accounts.general_ledger import make_gl_entries from erpnext.accounts.general_ledger import make_gl_entries
from erpnext.controllers.accounts_controller import AccountsController from erpnext.controllers.accounts_controller import AccountsController

14
erpnext/payroll/doctype/gratuity/test_gratuity.py
View File

@ -158,7 +158,7 @@ def set_mode_of_payment_account():
mode_of_payment.save() mode_of_payment.save()
def create_employee_and_get_last_salary_slip(): def create_employee_and_get_last_salary_slip():
employee = make_employee("test_employee@salary.com") employee = make_employee("test_employee@salary.com", company='_Test Company')
frappe.db.set_value("Employee", employee, "relieving_date", getdate()) frappe.db.set_value("Employee", employee, "relieving_date", getdate())
frappe.db.set_value("Employee", employee, "date_of_joining", add_days(getdate(), - (6*365))) frappe.db.set_value("Employee", employee, "date_of_joining", add_days(getdate(), - (6*365)))
if not frappe.db.exists("Salary Slip", {"employee":employee}): if not frappe.db.exists("Salary Slip", {"employee":employee}):
@ -168,5 +168,15 @@ def create_employee_and_get_last_salary_slip():
else: else:
salary_slip = get_last_salary_slip(employee) salary_slip = get_last_salary_slip(employee)
return employee, salary_slip #just to see what going on travis will remove this
print(frappe.db.get_value("Employee", "test_employee@salary.com", "company"))
print(frappe.db.get_value("Employee", "test_employee@salary.com", "holiday_list"))
if not frappe.db.get_value("Employee", "test_employee@salary.com", "holiday_list"):
from erpnext.payroll.doctype.salary_slip.test_salary_slip import make_holiday_list
make_holiday_list()
frappe.db.set_value("Company", '_Test Company', "default_holiday_list", "Salary Slip Test Holiday List")
print(frappe.db.get_value("Employee", "test_employee@salary.com", "holiday_list"))
return employee, salary_slip