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

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2016-12-13 14:30:32 +05:30
parent 403bab07a0 3bfe01d1e0
commit 201af80706
17 changed files with 209 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/hr/doctype/salary_slip/salary_slip.py
View File

@@ -222,7 +222,6 @@ class SalarySlip(TransactionBase):
["date_of_joining", "relieving_date"])
holidays = self.get_holidays_for_employee(self.start_date, self.end_date)
working_days = date_diff(self.end_date, self.start_date) + 1
if not cint(frappe.db.get_value("HR Settings", None, "include_holidays_in_total_working_days")):
working_days -= len(holidays)

9
erpnext/hr/doctype/salary_structure/test_salary_structure.py
View File

@@ -6,12 +6,15 @@ import frappe
import unittest
import erpnext
from frappe.utils.make_random import get_random
from frappe.utils import nowdate, add_days, add_years
from frappe.utils import nowdate, add_days, add_years, getdate
from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
from erpnext.hr.doctype.salary_slip.test_salary_slip import make_earning_salary_component, make_deduction_salary_component
from erpnext.hr.doctype.salary_slip.test_salary_slip \
import make_earning_salary_component, make_deduction_salary_component
test_dependencies = ["Fiscal Year"]
class TestSalaryStructure(unittest.TestCase):
def test_setup(self):
def setUp(self):
self.make_holiday_list()
frappe.db.set_value("Company", erpnext.get_default_company(), "default_holiday_list", "Salary Structure Test Holiday List")
make_earning_salary_component(["Basic Salary", "Allowance", "HRA"])