Log - a1bb94e59d538d1072ff8b45036084e520df727b - Clicks/Forks/ERPNext

a1bb94e Pro-rata component consistency for monthly Salary slip (#14595) by Jamsheer · 6 years ago
05d0039 Update tax calculation (#14564) by Ranjith Kurungadam · 6 years ago
4f9744a HRA fix (#14589) by Ranjith Kurungadam · 6 years ago
55a2f4d Employee Benefit (#14571) by Jamsheer · 6 years ago
c526cad [Fix] Additional Salary Component and tax calculation (#14581) by Jamsheer · 6 years ago
0cb0c0b [Tests] Staffing Plan (#14585) by Shreya Shah · 6 years ago
f972e7b Staffing Plan - remove department filter, query by dates (#14590) by Ranjith Kurungadam · 6 years ago
b057526 Test case for Attendance Request (#14566) by Shreya Shah · 6 years ago
cbff30f7 [Tests] Shift Planning (#14570) by Shreya Shah · 6 years ago
6cca031 fix- Salary Structure filter (#14558) by Ranjith Kurungadam · 6 years ago
22c2f47 Merge branch 'master' into develop by Ameya Shenoy · 6 years ago
380a747 salary structure related test case fixes by Nabin Hait · 6 years ago
2f89a04 create user permissions on save of employee by Nabin Hait · 6 years ago
fcaeea7 Update employee.py by Nabin Hait · 6 years ago
5bc533f Test case fixes by Nabin Hait · 6 years ago
0e5c828 Salary Slip - update period factor for tax calc (#14527) by Ranjith Kurungadam · 6 years ago
a8e047a HRA tax exemption Indian regional (#14520) by Ranjith Kurungadam · 6 years ago
b2d3c0f Update ordered qty in blanket order by Nabin Hait · 6 years ago
1198d94 [rename] Email Alert -> Notification by Rushabh Mehta · 6 years ago
6ffdf94 [Fixes] Defaults and User-Permission based fixes in treeview (#14501) by Zarrar · 6 years ago
06ef427 Merge pull request #14447 from zerodhatech/loan_application by Shreya Shah · 6 years ago
c774393 [Fix] HR Fixes (#14511) by Jamsheer · 6 years ago
8e74df0 [fix] On deletion of salary slip decrease the series count (#14508) by Saurabh · 6 years ago
a2056a3 Fix patch (#14503) by Shreya Shah · 6 years ago
aa17294 Update utils.py by Manas Solanki · 6 years ago
30f37b2 Payroll Entry - Separate JE for flexi salary component (#14502) by Jamsheer · 6 years ago
cc25eb0 Employee benefit application depends on lwp (#14494) by Jamsheer · 6 years ago
93e8bba [Fix] Travis for employee_tax_exemption_declaration (#14500) by rohitwaghchaure · 6 years ago
4fe2a91 Remove docstatus=1 to show pending leaves as well (#14498) by Shreya Shah · 6 years ago
f6d7b5d Salary slip - additional salary - deductions (#14476) by Jamsheer · 6 years ago
176e7c5 fix the test case for the payroll (#14480) by Manas Solanki · 6 years ago
76c51b3 minor ux fix by Nabin Hait · 6 years ago
138e6ab Salary Slip - update tax calculation, deduct tax for unsubmitted exemption proof (#14428) by Ranjith Kurungadam · 6 years ago
e06ecd2 Check if user permission for employee exists (#14474) by Suraj Shetty · 6 years ago
8d66f1e Employee benefit - Late employee benefit application (#14465) by Jamsheer · 6 years ago
65b55a5 Update test_leave_application.py by Manas Solanki · 6 years ago
d7f6d45 Merge pull request #14468 from manassolanki/fix-travis-1 by Manas Solanki · 6 years ago
f226b50 fix the salary slip test cases by Manas Solanki · 6 years ago
c3f5849 typo fixed by Shridhar Patil · 6 years ago
e832aa4 Merge pull request #14436 from shreyashah115/fix-trav by Manas Solanki · 6 years ago
6a00a17 toggle required fields on select of repayment option in loan application by Shridhar Patil · 6 years ago
e46639f Employee Transfer allow same company, update internal work history (#14430) by Ranjith Kurungadam · 6 years ago
83d5dc1 Fix Employee tax declaration test case by Shreya · 6 years ago
956277b Fix tests by Shreya · 6 years ago
ebb5303 Add Employee Status Temporary Leave (#14423) by Doridel Cahanap · 6 years ago
7ab70ca [ Fixes ] v11 Tree based doctype testing (#14419) by Zarrar · 6 years ago
b9399d8 Cancel attendance if leave application is cancelled (#14372) by Shreya Shah · 6 years ago
2704bef Merge pull request #14368 from shreyashah115/fix-trav by rohitwaghchaure · 6 years ago
8859131 Fix Leave Application test cases by Shreya · 6 years ago
88fe0d5 Fix daily work summary test by Shreya · 6 years ago
eb579a1 Fix demo (#14365) by Saurabh · 6 years ago
cff1479 Salary Structure, Slip - make fields readonly (#14358) by Ranjith Kurungadam · 6 years ago
873e28d Merge branch 'master' into develop by Ameya Shenoy · 6 years ago
2f273e7 minor fixes by Nabin Hait · 6 years ago
e0a2ea6 Merge branch 'develop' of https://github.com/mnaim-cloude8/erpnext into mnaim-cloude8-develop by Nabin Hait · 6 years ago
630721a Travis (#14354) by Shreya Shah · 6 years ago
d580c92 Staffing Plan (#14346) by Ranjith Kurungadam · 6 years ago
c4eec99 minor fix by Nabin Hait · 6 years ago
f576c57 Salary Slip - fix when no pyroll period found for tax calc (#14335) by Ranjith Kurungadam · 6 years ago
8c7af49 Fixed merge conflict by Nabin Hait · 6 years ago
ed4e49c Salary Slip - Deduct Tax (#14255) by Ranjith Kurungadam · 6 years ago
a55090d Fixed merge conflict by Nabin Hait · 6 years ago
398f157 Rename - Additional Salary Component to Additional Salary (#14302) by Jamsheer · 6 years ago
953ea93 Update leave_type.json by Nabin Hait · 6 years ago
375db61 Earned Leave (#14143) by Ranjith Kurungadam · 6 years ago
2fa057e [Fix] Expense claim showing status as Unpaid even if Total Advance Amount and Total Sanctioned Amount is same (#14311) by rohitwaghchaure · 6 years ago
590bf4c codacy fixes by Ranjith · 6 years ago
0cb2684 Tax Exemption Proof Submission - validations, eligible hra calc by Ranjith · 6 years ago
793f8e8 Tax Exemption Declaration - update fields, move generic methods to utils by Ranjith · 6 years ago
806cd93 Merge remote-tracking branch 'frappe/develop' into dev_hra by Ranjith · 6 years ago
155ecc1 Tax Exemption Declaration - HRA Calculation by Ranjith · 6 years ago
348a6a8 patch fixes by Nabin Hait · 6 years ago
13d4391 Fixed SQL syntax error in Get Loan Details (#14265) by Vladyslav Baidak · 6 years ago
7bb621d Tax Exemption Declaration, Proof Submission HRA fields by Ranjith · 6 years ago
3aa205f Fixes related to department tree by Nabin Hait · 6 years ago
81302a8 [Fix] Leave application, leave approver not fetching by Rohit Waghchaure · 6 years ago
64d02f9 [ADD] Department Analytics Bar Chart Feature (#14217) by Solufyin · 6 years ago
084b0b3 Treeview permission (#14232) by Suraj Shetty · 6 years ago
aadfaa4 Minor fixes (#14231) by Suraj Shetty · 6 years ago
33df0b4 Test case fixes (#14219) by Nabin Hait · 6 years ago
e6eef30 Remove unused imports by Jamsheer · 6 years ago
9416ac4 Leave Priod - fix - grant leave allocation filter by grade by Jamsheer · 6 years ago
730cb3b Update employee.py by Manas Solanki · 6 years ago
fca88a6 Employee benefits - get_assigned_salary_structure by Jamsheer · 6 years ago
79a6b42 Salary Slip - options to fetch from migration by Jamsheer · 6 years ago
ce89199 taxable salary slabs remove from Salary Component and add to Payroll Period by Jamsheer · 6 years ago
f1d10bf Salary Component - remove flexi_default by Jamsheer · 6 years ago
620c3a8 Employee Benefit Claim - non pro-rata claim validation updated by Jamsheer · 6 years ago
dc698a8 options to fetch from migration by Jamsheer · 6 years ago
8eec40c Employee Benefits in Salary Slip - Application and Claim by Jamsheer · 6 years ago
16e9243 get payroll period days - fix by Jamsheer · 6 years ago
47d865b Calculate remaining benefit amount in Employee Benefit Application by Jamsheer · 6 years ago
8a953ba Validate remaining benefit amount in Employee Benefit Application by Jamsheer · 6 years ago
772f257 Employee Benefit Claim - date default to Today by Jamsheer · 6 years ago
eacaad3 Max benefit amount in Employee Benefit Application Detail by Jamsheer · 6 years ago
c1ae88b Employee Benefit Calim - earning component filter updated by Jamsheer · 6 years ago
c5629ef Employee Benefit Application - refactor validation by Jamsheer · 6 years ago
9d5d328 Salary Structure - validate flexi with max benefit by Jamsheer · 6 years ago
65a5e47 Payroll Period - validate dates and overlap by Jamsheer · 6 years ago
cf414cc Payroll Period - fields refactor by Jamsheer · 6 years ago