Deepesh Garg
6fb66f9428
Merge pull request #24362 from ruchamahabal/year-to-date-in-salary-components
...
feat(Payroll): compute Year to Date for Salary Slip components
2021-01-19 09:40:47 +05:30
Deepesh Garg
cbed6f970a
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2021-01-15 15:43:59 +05:30
Rucha Mahabal
6c90e26982
feat: add descriptions for YTD and MTD fields
2021-01-14 13:42:40 +05:30
Rucha Mahabal
49702c1487
test: year to date computation for salary slip components
2021-01-14 11:57:24 +05:30
Rucha Mahabal
fdad94f983
feat(Payroll): compute Year to Date for Salary Slip components
2021-01-14 00:40:58 +05:30
Afshan
33fac19bce
fix: calculation of remaining_sub_periods if relieving date before month start date ( #24319 )
2021-01-13 21:06:04 +05:30
Rucha Mahabal
a93151502c
fix: Components formulated from additional salary not being fetched in Payroll Entry
2021-01-08 12:10:26 +05:30
Anurag Mishra
77ba72c4ff
Merge branch 'develop' into payroll_fixes2.0
2021-01-06 14:23:53 +05:30
Anurag Mishra
e7fa6f6a1c
fix: edditable employee grid
2021-01-06 13:25:09 +05:30
Shivam Mishra
9fc44f1606
Merge pull request #24182 from scmmishra/fix-dont-set-primary
2021-01-06 12:52:44 +05:30
Deepesh Garg
ad8be7c1fe
fix: Consider only submitted salary slips
2021-01-06 09:29:03 +05:30
Nabin Hait
f7b9b0687e
fix: tax calculation on salary slip for the first month ( #24272 )
...
* fix: tax calculation on salary slip for the first month
* fix: net pay precision issue
* fix: net pay precision issue
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2021-01-05 20:43:11 +05:30
Deepesh Garg
b01b108dfa
fix: do not consider current salary slip in sum
2021-01-05 17:34:16 +05:30
Saurabh
994fa48cd4
Merge branch 'develop' into fix-dont-set-primary
2021-01-05 16:32:56 +05:30
Nabin Hait
517fd8b9e6
fix: Ignore customer and supplier while deleting company transactions ( #24279 )
...
* fix: Ignore customer and supplier while deleting company transactions
* fix: Test cases fixed based on Travis
2021-01-05 09:23:39 +05:30
Deepesh Garg
797a742cb2
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2021-01-04 14:24:00 +05:30
Afshan
47bc42740b
Merge branch 'develop' into fix-sal-struc-assign-payroll-acc
2020-12-31 17:41:44 +05:30
Anurag Mishra
d7ea2bd705
Merge pull request #24177 from AfshanKhan/fix-perm-empl-sal-slip
...
fix: error popup for submitted doc
2020-12-31 17:07:30 +05:30
Afshan
8b60fe6125
fix: setting correct account for sal struct assignment if not specified.
2020-12-31 16:10:39 +05:30
Deepesh Garg
133ce286f9
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-31 11:24:14 +05:30
Deepesh Garg
5891b48cf6
Merge pull request #24176 from GangaManoj/Year-to-Date
...
feat: Add year_to_date field (cumulative salary for a fiscal year)
2020-12-30 16:53:47 +05:30
Deepesh Garg
66dcaf3ab2
fix: Salary structure assignment in tests
2020-12-30 15:47:22 +05:30
Deepesh Garg
97d055dfc3
fix: Test Case
2020-12-30 14:06:13 +05:30
Deepesh Garg
8b7ebe5044
fix: Test Case cleanup and fixes
2020-12-30 12:45:46 +05:30
Deepesh Garg
20133bd1df
fix: Remove comments
2020-12-29 22:19:12 +05:30
Deepesh Garg
353f8f4d85
fix: Add test case for YTD
2020-12-29 22:13:40 +05:30
Deepesh Garg
60b77f9865
Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date
2020-12-29 18:26:32 +05:30
Deepesh Garg
4a8c2c4cb5
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-29 15:10:36 +05:30
Anurag Mishra
527a156512
feat: validated employees whose salary has been already precessed
2020-12-24 13:59:12 +05:30
Anurag Mishra
d556847fca
fix: allow addition and removal of employee in payroll Entry
2020-12-23 12:59:48 +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
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
Afshan
749d36a4dd
fix: double exception in payroll ( #24078 )
2020-12-08 09:32:04 +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
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
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
