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
Faris Ansari
9e5665dc0a
Merge branch 'develop' into upload-attendance-progress
2019-05-21 18:01:30 +05:30
Faris Ansari
81e698d225
fix(UX): Upload Attendance
...
Enqueue import if rows more than 200. Show import progress in dashboard.
2019-05-21 17:58:55 +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
Mangesh-Khairnar
1208ca6a36
feat: add old leaves to track carry forward leave allocation
2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
c182a5687e
feat: add validation for carry forward leave expiry
2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
fd53c64d5d
feat: create carried forward leave expiry option
2019-05-15 15:53:51 +05:30
Karthikeyan S
c3779851e4
fix(HR Settings): Unable to save HR Settings ( #17608 )
2019-05-15 11:38:20 +05:30
Anurag Mishra
73706f85aa
feat: Bank remittance report for tracking payroll-entry transactions ( #17013 )
...
* feat: Bank remittance report for tracking payroll-entry transactions
* feat: show Company bank account and bank name
* feat: Added Permissions to view report
* feat: Validated report only if debit account is present
* fix: query optimisation
* feat: Added From date and To date filters
* fix: code optimisation
* fix: requested changes
* fix: requested changes and refactor
* style: indentation
* style: Formatting
* fix: added parameter filters
2019-05-13 19:03:21 +05:30
Mangesh-Khairnar
b4e8128fdb
feat: validate training event period
2019-05-11 23:26:47 +05:30
Aditya Hase
5f1632cf1f
fix(hr): Use event_status instead of status
...
Training Feedback DocType has event_status field (not status)
This was broken since PR #10379 , PR #17197 made this failure explicit.
2019-05-09 19:00:05 +05:30
Shivam Mishra
374999b048
feat: Password protected salary slips ( #17380 )
...
* feat: Added check for encrypting salary slips and password policy field
* feat: make password policy mandatory if encrypt option is selected
* feat: added password logic to email_salary_slip
* fix: import error
* chore: Minor enhancement to validations in salary slip
* fix: travis patch
* feat: Modified email body for password protected salary slips
2019-05-08 17:30:08 +05:30
Nabin Hait
5762a5d8b6
fix: Null handling
2019-05-01 12:17:55 +05:30
Nabin Hait
a08bf7ef86
fix: a few fixes in payroll
2019-05-01 12:17:47 +05:30
Nabin Hait
7516e7e66e
Merge pull request #17082 from Anurag810/aahi_loan_report
...
feat: Loan repayment report
2019-05-01 11:02:55 +05:30
Nabin Hait
71a07bf022
Update loan_repayment.json
2019-05-01 11:02:35 +05:30
Mangesh-Khairnar
513e3f97e5
fix(salary-register): track doj for non active employee
2019-04-29 12:17:49 +05:30
