Mangesh-Khairnar
|
24fbe23c8d
|
fix: add indicators for expire in the leave allocation list
|
2019-06-14 15:36:26 +05:30 |
|
Anurag Mishra
|
e87ebcaf04
|
fix: upadated employee dashboard
|
2019-06-14 14:10:48 +05:30 |
|
Anurag Mishra
|
0ae6cbdd01
|
fix: requested Changes
|
2019-06-14 14:10:48 +05:30 |
|
Anurag Mishra
|
e6dd55d9f2
|
feat: dashboards for HR module
|
2019-06-14 14:10:47 +05:30 |
|
Saurabh
|
0d50523723
|
Merge pull request #17941 from nabinhait/salary-slip-amount-dev
fix: salary slip amount calculation based on formula
|
2019-06-14 11:19:31 +05:30 |
|
Mangesh-Khairnar
|
6726dea88b
|
style: change formatting
|
2019-06-14 11:17:17 +05:30 |
|
Mangesh-Khairnar
|
4e1b60d401
|
style: change formatting
|
2019-06-14 11:15:54 +05:30 |
|
Nabin Hait
|
a2caf884fe
|
fix: salary slip amount calculation based on formula
|
2019-06-13 19:44:21 +05:30 |
|
Mangesh-Khairnar
|
f8bf57c956
|
fix: remove transaction section head
|
2019-06-13 18:09:23 +05:30 |
|
Mangesh-Khairnar
|
0a3ed374cd
|
test: validate tax based expense claim gl entries
|
2019-06-12 20:03:22 +05:30 |
|
Mangesh-Khairnar
|
a1d354e147
|
feat: add grand total field
|
2019-06-12 18:18:38 +05:30 |
|
Suraj Shetty
|
a7ac218584
|
Merge branch 'develop' into call-summary-dialog
|
2019-06-12 13:28:41 +05:30 |
|
Mangesh-Khairnar
|
444313bdfc
|
feat: change the claim amount in expenses to amount
|
2019-06-12 12:52:02 +05:30 |
|
Kenneth Sequeira
|
add002bb0f
|
fix: Make Travel Request Document Submittable (#17874)
* make travel request submittable
* add patch
* remove patch
|
2019-06-12 12:25:48 +05:30 |
|
Mangesh-Khairnar
|
283d2c5ca2
|
fix: only create leave application ledger on intermediate allocation expiry
|
2019-06-11 16:35:29 +05:30 |
|
Mangesh-Khairnar
|
ac9a4fe03c
|
feat: add tax and charges in expense claim
|
2019-06-11 14:25:44 +05:30 |
|
Suraj Shetty
|
54bb3e4b9f
|
Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog
|
2019-06-10 09:25:39 +05:30 |
|
rohitwaghchaure
|
74d45f40a8
|
Merge pull request #17876 from rohitwaghchaure/salary_slip_update_component_row_error_develop
fix: Not able to save salary slip
|
2019-06-07 12:58:25 +05:30 |
|
Rohit Waghchaure
|
72264697be
|
fix: Not able to save salary slip
|
2019-06-07 11:46:27 +05:30 |
|
Mangesh-Khairnar
|
e4d03bf0d0
|
fix: consider expiry in leaves
|
2019-06-07 11:30:27 +05:30 |
|
Mangesh-Khairnar
|
368a974368
|
style: change formatting
|
2019-06-06 20:43:32 +05:30 |
|
Mangesh-Khairnar
|
86e0f4c617
|
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
|
2019-06-06 20:41:28 +05:30 |
|
Mangesh-Khairnar
|
c7b9ae9c5e
|
fix: get leave balance based on the ledger entries
|
2019-06-06 20:38:59 +05:30 |
|
Mangesh-Khairnar
|
b840ba4407
|
feat: show dashboard on submit
|
2019-06-06 20:38:23 +05:30 |
|
Mangesh-Khairnar
|
00c607116b
|
fix: handle negative leaves without allocation
|
2019-06-06 20:37:34 +05:30 |
|
Mangesh-Khairnar
|
f13243a92e
|
feat: fetch annual allocation based on leave policy
|
2019-06-06 20:35:10 +05:30 |
|
Mangesh-Khairnar
|
3863fc5fb2
|
feat: create ledger entry for each earned leave
|
2019-06-06 20:34:10 +05:30 |
|
Mangesh-Khairnar
|
050f65beb4
|
feat: fetch leave allocation from ledger entry
|
2019-06-06 20:32:01 +05:30 |
|
Suraj Shetty
|
c0a640c462
|
feat: Add user_id of employee to employee group
|
2019-06-06 14:47:40 +05:30 |
|
Mangesh-Khairnar
|
351f4d53a0
|
feat: add employee filter to employee leave balance
|
2019-06-05 21:22:07 +05:30 |
|
Mangesh-Khairnar
|
62011c9dc4
|
feat: add link to policy
|
2019-06-05 21:16:27 +05:30 |
|
Mangesh-Khairnar
|
2bd211cc05
|
fix(attendance): fetch employee name (#17857)
|
2019-06-05 20:24:15 +05:30 |
|
Nabin Hait
|
3f97fac8e1
|
feat: Salary rounding based on settings on salary component (#17852)
|
2019-06-05 13:20:08 +05:30 |
|
Himanshu
|
4cb1a1e2e3
|
fix: set task weight from onboarding template (#17840)
|
2019-06-05 10:26:01 +05:30 |
|
Mangesh-Khairnar
|
afa1dc4ffa
|
feat: expire current allocation
|
2019-06-03 20:09:22 +05:30 |
|
deepeshgarg007
|
55b894bfef
|
Merge branch develop into dimensions
|
2019-06-01 23:13:36 +05:30 |
|
abhijitkumbharIND
|
39d6cf38fc
|
fix: Vehicle Master - Last carbon check accepting future date.(#17821)
|
2019-05-31 14:19:04 +05:30 |
|
abhijitkumbharIND
|
302bce355f
|
fix: Vehicle Master - Last carbon check accepting future date.(#17821)
|
2019-05-31 14:19:04 +05:30 |
|
Mangesh-Khairnar
|
c5385e141b
|
fix: add mandatory reason fields in leave application
|
2019-05-31 00:53:28 +05:30 |
|
Mangesh-Khairnar
|
95e5d812fe
|
fix: UX changes
|
2019-05-30 22:22:15 +05:30 |
|
Mangesh-Khairnar
|
91e62f575e
|
fix: department filters in employee leave balance
|
2019-05-30 13:38:35 +05:30 |
|
Mangesh-Khairnar
|
2124d9884b
|
fix: pass positional arguments on creation of leave application
|
2019-05-30 13:21:34 +05:30 |
|
Mangesh-Khairnar
|
aafb5cb6f6
|
fix: ignore expired non-carry forwarded allocation on calculating leaves taken
|
2019-05-30 13:13:14 +05:30 |
|
Mangesh-Khairnar
|
ded33a7e2e
|
fix: ledger entries creation
|
2019-05-29 19:12:19 +05:30 |
|
Mangesh-Khairnar
|
7cc6a67c18
|
add department filter to employee leave balance
|
2019-05-29 15:59:20 +05:30 |
|
deepeshgarg007
|
acc2422167
|
Merge branch develop into dimensions
|
2019-05-28 12:18:32 +05:30 |
|
Nabin Hait
|
5fef786441
|
Merge pull request #17765 from nabinhait/salary-slip-tax-calc-dev
fix: Tax calculation on salary slip
|
2019-05-28 11:16:31 +05:30 |
|
Mangesh-Khairnar
|
c6d6adcbf3
|
fix: ledger entry creation for encashment
|
2019-05-28 09:44:38 +05:30 |
|
Mangesh-Khairnar
|
61bb236cfa
|
test: delete ledger entry after each test to maintain balance
|
2019-05-27 19:36:40 +05:30 |
|
Nabin Hait
|
7f375d209c
|
fix: Tax calculation on salary slip
|
2019-05-27 18:42:53 +05:30 |
|