Mangesh-Khairnar
|
6f69bbe1d7
|
test: leave ledger balance
|
2019-05-27 15:40:36 +05:30 |
|
Mangesh-Khairnar
|
7fbaef5de3
|
fix: expiry ledger creation
|
2019-05-27 15:39:48 +05:30 |
|
Mangesh-Khairnar
|
705b7dc9c2
|
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
|
2019-05-27 11:21:06 +05:30 |
|
Mangesh-Khairnar
|
71cdcb3593
|
style: add a more descriptive method name
|
2019-05-27 11:00:04 +05:30 |
|
Mangesh-Khairnar
|
45197965d7
|
fix: give cancellation permission to hr manager
|
2019-05-27 03:26:48 +05:30 |
|
Mangesh-Khairnar
|
d751281fa7
|
fix: application and leave encashment test cases
|
2019-05-27 03:23:58 +05:30 |
|
Mangesh-Khairnar
|
e7d307e6bf
|
fix: only expire carry forwarded allocation via scheduler
|
2019-05-27 03:21:32 +05:30 |
|
Mangesh-Khairnar
|
2417c93d0e
|
feat: create expiry and carry forward calculation on leave allocation creation
|
2019-05-27 03:20:10 +05:30 |
|
Mangesh-Khairnar
|
c99f644ffe
|
test: carry forward and expiry allocation
|
2019-05-27 03:13:47 +05:30 |
|
Mangesh-Khairnar
|
7a7f4bd822
|
fix: leave balance calculation
|
2019-05-27 03:12:57 +05:30 |
|
Mangesh-Khairnar
|
9e3b688333
|
test: create leave policy
|
2019-05-27 03:10:39 +05:30 |
|
Rushabh Mehta
|
2d7993592f
|
Merge pull request #17703 from rmehta/yeah-form-js
refactor: deprecate old API as per https://github.com/frappe/frappe/pull/7537
|
2019-05-24 11:36:16 +05:30 |
|
Rushabh Mehta
|
7e4fb49c61
|
fix(minor): after manual testing
|
2019-05-24 11:22:31 +05:30 |
|
Mangesh-Khairnar
|
45cf02308e
|
fix: prevent manual creation of ledger entries
|
2019-05-23 20:29:18 +05:30 |
|
Mangesh-Khairnar
|
8ef81870bb
|
test: create leave ledger entry for encashment
|
2019-05-23 20:28:16 +05:30 |
|
Mangesh-Khairnar
|
5ba17c87e5
|
feat: remove update allocation after submit
|
2019-05-22 18:29:22 +05:30 |
|
Rushabh Mehta
|
04e89ce808
|
refactor: deprecate old API
|
2019-05-22 16:52:36 +05:30 |
|
Rushabh Mehta
|
98a80407f8
|
Merge pull request #17538 from adityahase/fix-training-feedback
fix(hr): Use event_status instead of status
|
2019-05-21 12:19:03 +05:30 |
|
Saurabh
|
1bcdb094ea
|
Merge pull request #17630 from nabinhait/multi-fixes-dev
fix: Multiple small fixes
|
2019-05-16 15:21:15 +05:30 |
|
Nabin Hait
|
b90fc7fc0d
|
fix: Get bank account on selection of payment mode in Loan
|
2019-05-16 13:45:54 +05:30 |
|
Nabin Hait
|
6b9d64ce1d
|
refator: Payroll processing and tax calculation (#17617)
* refactor: Payroll processing and tax calculation
* fix: payroll test cases
* fix: Codacy fixes
* fix: payroll test cases
* fix: removed unwanted code
|
2019-05-16 11:23:04 +05:30 |
|
Himanshu
|
0e31089af6
|
validate: if additional salary exists (#17529)
|
2019-05-16 10:35:02 +05:30 |
|
Mangesh-Khairnar
|
afb0c4aa43
|
fix: delete entry on cancellation of transaction
|
2019-05-15 21:50:34 +05:30 |
|
Mangesh-Khairnar
|
f8f02c508d
|
feat: create leave ledger entry on leave encashment creation
|
2019-05-15 21:50:06 +05:30 |
|
Mangesh-Khairnar
|
50037f8609
|
fix: consider min days remaining as remaining leaves
|
2019-05-15 21:49:27 +05:30 |
|
Mangesh-Khairnar
|
6ba9a128e7
|
feat: calculate leave balance using ledger entries
|
2019-05-15 15:53:54 +05:30 |
|
Mangesh-Khairnar
|
964deaca96
|
test: creation of ledger entries on application submit
|
2019-05-15 15:53:53 +05:30 |
|
Mangesh-Khairnar
|
201aeeb20d
|
test: creation of ledger entries on allocation submit
|
2019-05-15 15:53:53 +05:30 |
|
Mangesh-Khairnar
|
170b8dded8
|
fix: expiry logic for carry forwarded allocation
|
2019-05-15 15:53:53 +05:30 |
|
Mangesh-Khairnar
|
9bb4b8e8b2
|
feat: create expiry ledger entry on allocation period completion
|
2019-05-15 15:53:53 +05:30 |
|
Mangesh-Khairnar
|
cf8f4bda8f
|
fix: skip application fetch for non allocation records
|
2019-05-15 15:53:53 +05:30 |
|
Mangesh-Khairnar
|
783bd89413
|
feat: handle cancellation workflow for leave application
|
2019-05-15 15:53:53 +05:30 |
|
Mangesh-Khairnar
|
5448edff2c
|
feat: delete cancelled allocation from ledger
|
2019-05-15 15:53:53 +05:30 |
|
Mangesh-Khairnar
|
01490f1560
|
feat: add cancellation workflow for leave allocation ledger entry
|
2019-05-15 15:53:53 +05:30 |
|
Mangesh-Khairnar
|
5ad83c06c2
|
feat: add ledger entries on leave addition
|
2019-05-15 15:53:53 +05:30 |
|
Mangesh-Khairnar
|
679371e397
|
feat: get carry forwarded leaves via ledger entries
|
2019-05-15 15:53:53 +05:30 |
|
Mangesh-Khairnar
|
2b421c39b5
|
feat: add transaction details in ledger
|
2019-05-15 15:53:53 +05:30 |
|
Mangesh-Khairnar
|
1de990b2ac
|
feat: create leave ledger entry
|
2019-05-15 15:53:53 +05:30 |
|
Mangesh-Khairnar
|
5e2b067107
|
feat: display carry forwarded allocation days and total leaves allocated
|
2019-05-15 15:53:52 +05:30 |
|
Mangesh-Khairnar
|
0abf5d340c
|
fix: carry forwarded allocation period validation
|
2019-05-15 15:53:52 +05:30 |
|
Mangesh-Khairnar
|
d01863707c
|
test: pass leave type as params
|
2019-05-15 15:53:52 +05:30 |
|
Mangesh-Khairnar
|
70cf4a6796
|
feat: validate leave allocation period to be within expiry limits
|
2019-05-15 15:53:52 +05:30 |
|
Mangesh-Khairnar
|
99c9cfaaed
|
feat: generate leave allocation for carry forwarded leaves
|
2019-05-15 15:53:52 +05:30 |
|
Mangesh-Khairnar
|
4badca54af
|
feat: validate leave expiry days
|
2019-05-15 15:53:52 +05:30 |
|
Mangesh-Khairnar
|
0c0bfb1ef0
|
feat: calculate carry forward leaves allocation
|
2019-05-15 15:53:52 +05:30 |
|
Mangesh-Khairnar
|
d6c5b6320f
|
feat: add a field for conditionally displaying carry forwarded leave
|
2019-05-15 15:53:52 +05:30 |
|
Mangesh-Khairnar
|
e46d3a87ea
|
feat: set carry forwarded leave allocation
|
2019-05-15 15:53:52 +05:30 |
|
Mangesh-Khairnar
|
c28d2e4b2a
|
test: create leave allocation check
|
2019-05-15 15:53:51 +05:30 |
|
Mangesh-Khairnar
|
bd3b3ea12c
|
test: create leave type
|
2019-05-15 15:53:51 +05:30 |
|
Mangesh-Khairnar
|
7c6b6eae5b
|
feat: set leave allocation on carry forward check
|
2019-05-15 15:53:51 +05:30 |
|