Anurag Mishra
|
66b697cd05
|
feat: fix test for Gratuity
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
550e60a69d
|
feat: fix test for Gratuity
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
b88af3a3f7
|
feat: Accrural Entry for Gratuity beafore Payment
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
78fdd5d9b4
|
fix: update status on salary Slip submission
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
46e1c09b45
|
style: Broken into smaller function
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
4d6c3c9449
|
Fix: Changes Requested, Sider, codacy, Transalation
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
493eea19e8
|
feat: added link from desk page and some minor fixes
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
25c356894d
|
test: gratuity
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
34a7250a2d
|
fix: Some enhancements and better validation
|
2020-12-23 18:07:06 +05:30 |
|
Anurag Mishra
|
47f3a3a5bd
|
feat: validation for if no slab found
|
2020-12-23 18:07:06 +05:30 |
|
Anurag Mishra
|
6f1538026a
|
feat: added minimum year for gratuity and condition utilisation
|
2020-12-23 18:07:06 +05:30 |
|
Anurag Mishra
|
30299c6f49
|
feat: validating and ordeing the rule slabr
|
2020-12-23 18:07:06 +05:30 |
|
Anurag Mishra
|
dedc0015c0
|
feat(HR): Working day calulation based on attendance or Leave
|
2020-12-23 18:07:06 +05:30 |
|
Anurag Mishra
|
49b326fc08
|
feat(HR): Gratuity Payment
|
2020-12-23 18:07:05 +05:30 |
|
Anurag Mishra
|
fc2cb3a85e
|
Feat: gratuity
|
2020-12-23 18:07:05 +05:30 |
|
Anurag Mishra
|
d556847fca
|
fix: allow addition and removal of employee in payroll Entry
|
2020-12-23 12:59:48 +05:30 |
|
Afshan
|
adf9b49e14
|
fix: sal slip popup error
|
2020-12-23 11:39:38 +05:30 |
|
Ganga Manoj
|
090783804b
|
fix: Improve month_to_date computation
|
2020-12-21 23:52:05 +05:30 |
|
Ganga Manoj
|
c36cab81f2
|
fix: Update year_to_date and month_to_date field labels to show company currency
|
2020-12-21 23:46:02 +05:30 |
|
Shivam Mishra
|
0e222173ea
|
fix: don't set primary action if workflow is set
|
2020-12-21 13:44:03 +05:30 |
|
Ganga Manoj
|
ddd9fe49fc
|
feat: Add month_to_date field
|
2020-12-18 23:58:05 +05:30 |
|
Ganga Manoj
|
59fbf702da
|
feat: Compute month_to_date
|
2020-12-18 23:52:11 +05:30 |
|
Ganga Manoj
|
1b1df6b6bc
|
feat: Add month_to_date field
|
2020-12-18 23:51:05 +05:30 |
|
Ganga Manoj
|
89a02d7d3f
|
feat: Changed Fiscal Year to Payroll Period
|
2020-12-18 15:31:45 +05:30 |
|
Afshan
|
a81519f557
|
fix: error popup for submitted doc
|
2020-12-18 11:16:01 +05:30 |
|
Ganga Manoj
|
9f1e018e4f
|
feat: Compute year_to_date
|
2020-12-18 01:35:27 +05:30 |
|
Ganga Manoj
|
04f48a011d
|
feat: Add year_to_date field
|
2020-12-18 01:31:00 +05:30 |
|
Your Name
|
3ebe511eb9
|
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
|
2020-12-16 08:19:47 +00:00 |
|
Shivam Mishra
|
fd044b032f
|
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements
|
2020-12-16 13:21:10 +05:30 |
|
Afshan
|
89d14fdf68
|
fix: minor ui changes (#24125)
* fix: minor ui changes
* fix: slider
|
2020-12-15 09:31:30 +05:30 |
|
Afshan
|
58e8e06ab7
|
fix: retention filters (#24123)
* fix: retention filters
* fix: slider
|
2020-12-15 09:17:17 +05:30 |
|
Afshan
|
e64718b2ae
|
fix: selecting salary component (#24121)
|
2020-12-15 09:16:27 +05:30 |
|
Nabin Hait
|
3423d94145
|
fix: Fixed merge conflict
|
2020-12-12 21:12:56 +05:30 |
|
Rushabh Mehta
|
fec8dba16c
|
fix(merge): merge develop
|
2020-12-08 16:23:09 +05:30 |
|
Afshan
|
749d36a4dd
|
fix: double exception in payroll (#24078)
|
2020-12-08 09:32:04 +05:30 |
|
Shivam Mishra
|
2fa3cac814
|
feat: update workspace folders
|
2020-12-03 15:48:57 +05:30 |
|
Shivam Mishra
|
2895645f86
|
feat: rename desk page to workspace
|
2020-12-03 15:39:53 +05:30 |
|
marination
|
523c464a92
|
fix: Test Payment Based on Leave Application (Travis)
|
2020-12-02 16:01:35 +05:30 |
|
Deepesh Garg
|
12b45b3f2a
|
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
|
2020-12-02 12:46:23 +05:30 |
|
Shivam Mishra
|
9aaca25edb
|
feat: update desk page json
|
2020-12-01 13:39:54 +05:30 |
|
Shivam Mishra
|
de68f74b4c
|
chore: update all desk pages
|
2020-12-01 12:51:38 +05:30 |
|
Afshan
|
ccf5dc66e2
|
feat: multi-currency payroll (#23519)
* feat: multi-currency payroll
* fix: refactor and added conditions
* fix: uncommented code
* style: removed comments
* fix: missing argument
* style: styling changes
* fix: test cases
* Update asset_value_adjustment.py
* patch: update columns
* style: formating
* style: formatting
* fix: 1st review
* fix: refactor
* Revert "fix: refactor"
This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.
reverting to previous state
* Revert "fix: 1st review"
This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.
reverting before 1st review
* fix: 2nd review changes
* fix: test cases
* fix: added call to fetch exchange rate
* fix: remove unnecessary code
* fix: refactor
* fix: refactor patch
* fix: refactor
* fix: refactor
* fix: clear test data
* fix: slider
* feat: multi-currency payroll
* fix: refactor and added conditions
* fix: uncommented code
* style: removed comments
* fix: missing argument
* style: styling changes
* fix: test cases
* patch: update columns
* Update asset_value_adjustment.py
* style: formating
* style: formatting
* fix: 1st review
* fix: refactor
* Revert "fix: refactor"
This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.
reverting to previous state
* Revert "fix: 1st review"
This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.
reverting before 1st review
* fix: 2nd review changes
* fix: test cases
* fix: added call to fetch exchange rate
* fix: remove unnecessary code
* fix: refactor
* fix: refactor patch
* fix: refactor
* fix: refactor
* fix: clear test data
* fix: slider
* feat: Added company field in leave encashment and employee benefit
* refactor: Refactored multi-currency payroll patch
* fix: currency column in salary register
* refactor: Refactored code for making bank and return entry against employee advance
* fix: minor cleanup
* fix: fixed translation
* fix: removed salary component type
* fix: fixed sider issues
* fix: translation and slider
* style: formatted msg
* fix: fixed slider
* fix: travis
* fix: refactor
* fix: slider
* fix: slider
* fix: slider
* fix: travis
* fix: patch
* fix: patch
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: re-run travis
* fix: rerun travis
* fix: rerun travis
* fix: rerun travis
* fix: travis rerun
* fix: increased throttle_user_limit from 60 to 100
* fix: patch
* fix: patch
* fix: assign payroll payable account as default payroll payable account in SSA
* fix: removed debugger
* fix: slider
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
|
2020-12-01 09:11:05 +05:30 |
|
Shivam Mishra
|
27e7c264f2
|
fix: link type
|
2020-11-30 14:58:16 +05:30 |
|
Shivam Mishra
|
61388d412b
|
feat: update desk pages
|
2020-11-30 14:58:00 +05:30 |
|
Afshan
|
8c3b2d0a0d
|
fix: change query to frappe.get_all
|
2020-11-30 14:58:00 +05:30 |
|
Afshan
|
beb1811523
|
fix: payroll attendance error
|
2020-11-30 14:58:00 +05:30 |
|
Anurag Mishra
|
a81e872cdb
|
fix: added wrong absent days calculation in salary slip
|
2020-11-30 14:57:27 +05:30 |
|
Anurag Mishra
|
f32cff1080
|
feat : Leave type with partial payment (#23173)
* feat: Partially paid Leaves
* feat: some importatnt validation
* fix: requested changes
* fix: requested changes
* fix: travis, sider, codacy
* fix: changes requested
* test: Partially Paid Leaves
|
2020-11-25 16:00:15 +05:30 |
|
Deepesh Garg
|
1a4390de44
|
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
|
2020-11-25 14:51:11 +05:30 |
|
Deepesh Garg
|
6b9dda5f3e
|
fix: Move filter setup to doctype controllers
|
2020-11-25 14:49:10 +05:30 |
|