Jamsheer
|
236be22648
|
Payroll entry - get employee fix
|
2018-05-14 13:32:50 +05:30 |
|
Jamsheer
|
d0b0c87f40
|
get additional salary component in salary slip
|
2018-05-14 12:16:46 +05:30 |
|
Jamsheer
|
08b60a1a62
|
New Doctype - Additional Salary Component
|
2018-05-14 12:16:46 +05:30 |
|
Jamsheer
|
a5028c8e54
|
Salary Structure - filter updated, Salary Component - fields re-arranged
|
2018-05-14 12:16:45 +05:30 |
|
Jamsheer
|
b5c5c471b4
|
Formula on Salary Component Master
|
2018-05-14 12:16:45 +05:30 |
|
Jamsheer
|
4bd7cdb018
|
Salary Structure Assignment - filters applied
|
2018-05-14 12:13:47 +05:30 |
|
Saurabh
|
c1acbdfb69
|
[fix] overlapping dates
|
2018-05-12 17:45:39 +05:30 |
|
Saurabh
|
a35dad7610
|
add get leave period method
|
2018-05-12 17:45:39 +05:30 |
|
Jamsheer
|
46b23f8e6e
|
Salary Structure Refactor, Formula on Salary Component Master (#13967)
* 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
|
2018-05-11 21:05:24 +05:30 |
|
Pawan Mehta
|
c53e35368d
|
Shift Management - Documentation and Tests (#13997)
* [fix] #13996
* codacy fix
|
2018-05-11 21:03:50 +05:30 |
|
Ranjith
|
ded636097e
|
Tax Declaration, Proof Submission tests
|
2018-05-10 15:42:04 +05:30 |
|
Ranjith
|
5a8e6427f4
|
Tax Declaration, Proof Submission, validation
|
2018-05-10 15:06:49 +05:30 |
|
Ranjith
|
85d2d571c5
|
update hr menu, field subcategory in child table
|
2018-05-10 15:04:32 +05:30 |
|
Ranjith
|
e1c556b7e0
|
Doctype Employee Tax Exemption Sub Category
|
2018-05-10 15:02:57 +05:30 |
|
Ranjith
|
96121c598e
|
Tax Declaration, Proof Submission, field company
|
2018-05-10 15:02:00 +05:30 |
|
Nabin Hait
|
3881e98000
|
Staffing plan for group company
|
2018-05-08 18:36:14 +05:30 |
|
Jamsheer
|
4573e6609f
|
Leave Type - remove field is_parental_leave
|
2018-05-08 18:33:49 +05:30 |
|
Nabin Hait
|
247bd94824
|
Merge branch 'staffing' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-staffing
|
2018-05-08 16:30:18 +05:30 |
|
Nabin Hait
|
3e47fbb2f0
|
assign salary structure custom button
|
2018-05-08 16:05:04 +05:30 |
|
Jamsheer
|
bec950428c
|
HR Utils - Trailing whitespace
|
2018-05-08 12:50:14 +05:30 |
|
Jamsheer
|
fe882bc68a
|
Leave Application - Test - Leave allowed, applicable after, maximum continuos days
|
2018-05-08 12:36:51 +05:30 |
|
Jamsheer
|
3153734e7e
|
Leave Application - validate applicable after for leave type
|
2018-05-08 12:36:51 +05:30 |
|
Jamsheer
|
62a93533fc
|
Leave Policy - Validate Annual alloction for leave type
|
2018-05-08 12:36:51 +05:30 |
|
Jamsheer
|
d7bfa2303f
|
Leave allocation - validate max leave allocation days for a leave type
|
2018-05-08 12:36:51 +05:30 |
|
Jamsheer
|
b42f3d41ab
|
Compensatory Leave Request - Validate and Create leave allocation for compnsatory leave type
|
2018-05-08 12:36:51 +05:30 |
|
Jamsheer
|
b408b158dd
|
Leave allocation - link to leave period and compensatory leave request
|
2018-05-08 12:35:40 +05:30 |
|
Jamsheer
|
8c4386f016
|
Leave Type - new field is_compensatory
|
2018-05-08 12:35:40 +05:30 |
|
Jamsheer
|
c7aaf0ba67
|
Leave Period - Validate and Create Leave Allocation
|
2018-05-08 12:35:40 +05:30 |
|
Jamsheer
|
0e2cc5574d
|
HR Util methods
|
2018-05-08 12:35:40 +05:30 |
|
Jamsheer
|
9d857579af
|
Attendance Request - validate and create attendance
|
2018-05-08 12:35:40 +05:30 |
|
Jamsheer
|
b41baa228c
|
Attendance Request - link to company
|
2018-05-08 12:35:40 +05:30 |
|
Jamsheer
|
a9c82b6464
|
Attendance - link to attendance request
|
2018-05-08 12:35:40 +05:30 |
|
Shreya Shah
|
204c3bc37e
|
Remove Production Planning Tool docs (#13946)
* Remove Production Planning Tool docs
* Remove Offer Letter Occurrences
* Rename Employee Loan Occurrences
|
2018-05-07 18:21:03 +05:30 |
|
Nabin Hait
|
b7613af73c
|
Merge branch 'enterprise_sprint' of https://github.com/frappe/erpnext into enterprise_sprint
|
2018-05-07 16:13:33 +05:30 |
|
Nabin Hait
|
330fae8652
|
minor fixes
|
2018-05-07 16:11:35 +05:30 |
|
Ranjith
|
c36578e8d3
|
Job Opening - display vacancies only on staffing plan
|
2018-05-07 14:19:40 +05:30 |
|
Ranjith
|
f220e89d9f
|
Job Opening - get planned opening, validate vacancies by Staffing Plan
|
2018-05-07 13:58:54 +05:30 |
|
Ranjith
|
e4cda0380a
|
Staffing Plan - validations, get employee count on designation change, calc estimated cost
|
2018-05-07 13:54:49 +05:30 |
|
Nabin Hait
|
fdc67a577f
|
Merge branch 'multi-company-transations' of https://github.com/shreyashah115/erpnext into shreyashah115-multi-company-transations
|
2018-05-07 13:12:16 +05:30 |
|
Ranjith Kurungadam
|
95c5c055f8
|
Optional leave (#13931)
* Optional Holiday - move holiday list from leave type to leave period
* Optional Leave - validate on Leave Application
* test Optional Leaves
|
2018-05-07 12:43:08 +05:30 |
|
Nabin Hait
|
d5220c0ff4
|
minor fix
|
2018-05-07 12:22:57 +05:30 |
|
Ranjith
|
86b81e99e5
|
codacy fixes
|
2018-05-05 16:49:51 +05:30 |
|
Ranjith
|
9505ea93cf
|
codacy fixes
|
2018-05-05 14:32:42 +05:30 |
|
Ranjith
|
a68a108234
|
Employee Promotion, Transfer - test submit before date, create new employee
|
2018-05-05 13:43:15 +05:30 |
|
Ranjith
|
56b58017d1
|
Employee Promotion, Transfer - validate, submit, cancel workflow
|
2018-05-05 13:41:48 +05:30 |
|
Ranjith
|
fddfffd3e6
|
Employee Promotion, Transfer - modal to add details to child table
|
2018-05-05 13:27:26 +05:30 |
|
Ranjith
|
ea60225760
|
Employee Promotion, Transfer - update child table, added fields
|
2018-05-05 13:25:46 +05:30 |
|
Nabin Hait
|
abd0325acd
|
Fixed merge conflict
|
2018-05-05 12:19:14 +05:30 |
|
mnaim-cloude8
|
c3b4464df8
|
Remove unnecessary field.
|
2018-05-04 22:06:35 +08:00 |
|
Pawan Mehta
|
5e7b2eb338
|
Add Calendar View to Attendance doctype (#13919)
* [fix] #13917
* codacy fixes
* remove company
* add status
* fix date issue
* code optimizations
* change sql
|
2018-05-04 18:12:35 +05:30 |
|