Ranjith
c60c6981a5
Merge remote-tracking branch 'frappe/develop' into encash
2018-05-15 20:00:26 +05:30
Manas Solanki
70899f5a60
Update utils.py
2018-05-15 18:52:14 +05:30
Zlash65
b8bd6644fd
remove unused module import and error classes
2018-05-15 18:23:41 +05:30
anoop
504855e1a0
on submit: create additional salary component, revert on cancel
2018-05-15 18:11:49 +05:30
Ranjith
4c721cbe0f
Leave Encashment - submit, cancel Additional Salary Component
2018-05-15 16:39:20 +05:30
Rohit Waghchaure
e0b515066e
[Fix] Employee mandatory validation issue
2018-05-15 16:18:05 +05:30
rohitwaghchaure
66ece67d41
Merge pull request #14044 from shreyashah115/fix-promotion-doc
...
[Fix] Updation of new values in Employee Property History
2018-05-15 15:27:16 +05:30
Shreya
14069c9395
Fix updation of new values
...
While changing the property of an employee, if the new value is selected from the available values in the link field, it worked properly but on creation of a new linked field value, the new value didn't get updated in the child table.
2018-05-15 15:19:24 +05:30
Manas Solanki
183dc731c2
Update employee_onboarding.py
2018-05-15 14:32:37 +05:30
Zlash65
99e72af089
skip abbr, reload doc, disable edit for root department node'
2018-05-15 13:53:40 +05:30
Saurabh
62a59301ef
[fix] resolved merge conflicts
2018-05-15 13:02:40 +05:30
Rohit Waghchaure
4a126947f5
Code cleaup
2018-05-15 12:43:21 +05:30
anoop
6119b7337c
updated get_leave_balance_on to consider encashed leaves by default.
2018-05-15 12:36:43 +05:30
anoop
1e1b7fc74f
13615 - Leave Encashment, creating Additional Salary Component on submit and validations pending
2018-05-15 12:36:43 +05:30
anoop
0780fd1e0b
helper method to get employees assigned salary structure
2018-05-15 12:36:42 +05:30
anoop
161b3b2979
added field Total Leaves Encashed
2018-05-15 12:35:51 +05:30
anoop
067b5574ce
duplicate field is_encash removed, fixed in install fixtures
2018-05-15 12:27:23 +05:30
Rohit Waghchaure
3f02820384
[Fix] Global name 'Approved' is not defined
2018-05-15 10:30:06 +05:30
Shreya
dbb67fb4fd
Clear leave balance on changing leave type
2018-05-14 23:02:09 +05:30
Rohit Waghchaure
9ba72f7897
[Fix] get_approved_leaves_for_period module import failed
2018-05-14 21:37:55 +05:30
Saurabh
2ca83d61ea
Resolve merge conflicts from enterprise_sprint branch
2018-05-14 21:15:46 +05:30
Saurabh
1f1dd96f57
Merge branch 'enterprise_sprint' into jam_enterprise_sprint
2018-05-14 20:57:40 +05:30
rohitwaghchaure
3f0c735e53
Merge branch 'enterprise_sprint' into tax_exemption
2018-05-14 20:47:35 +05:30
Saurabh
2d8a7ee81f
Bootstrap 'TDS' via fixture
2018-05-14 20:41:38 +05:30
rohitwaghchaure
8137f0402a
Merge pull request #13984 from manassolanki/employee-boarding
...
[feature] added the employee onboarding and separation doctype
2018-05-14 20:35:49 +05:30
Manas Solanki
094e1841e0
minor changes and fixed the conflicts
2018-05-14 20:33:28 +05:30
rohitwaghchaure
3282191aae
Merge pull request #14025 from shreyashah115/html-table
...
Show pending leaves as an HTML table in leave application
2018-05-14 20:32:26 +05:30
Manas Solanki
b698846c30
[feature] added the employee onboarding and separation doctype
2018-05-14 20:27:00 +05:30
rohitwaghchaure
8d626e6888
Merge pull request #14024 from ESS-LLP/jam_additional_sal_comp
...
Additional Salary Component
2018-05-14 20:24:10 +05:30
Shreya
4bd5583e11
Make Available Leave HTML Table
2018-05-14 19:32:59 +05:30
Jamsheer
75c53e5022
Fix - missing semicolon
2018-05-14 19:17:16 +05:30
Jamsheer
47039e801e
Remove unused import
2018-05-14 18:54:10 +05:30
Jamsheer
70a998d428
Remove unused variable
2018-05-14 18:51:04 +05:30
Jamsheer
f5e67213fd
Attendance Request - half day check is enabled
2018-05-14 18:34:34 +05:30
Jamsheer
ead858b4de
Compensatory Leave Request - fix
2018-05-14 18:08:31 +05:30
Jamsheer
b848c51592
Compensatory Leave Request - leave allocation create and update - fix
2018-05-14 17:56:22 +05:30
Zlash65
03ad0f2f4a
set query for department based on company
2018-05-14 16:07:28 +05:30
Zlash65
9a8f5bd6c7
set department name with company abbr
2018-05-14 16:07:27 +05:30
Zlash65
39668609ce
improv department tree
2018-05-14 16:07:27 +05:30
Shreya Shah
bbee9b6cc4
[Enhancement] Monthly Attendance Report ( #13970 )
...
* Update Attendance on Approval of Leave
* Separate out leaves on the basis of its type
* Remove commented code
* Make attendance records if not found
* Fix Codacy
* Replace bad code in attendance.py
2018-05-14 14:30:58 +05:30
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
