Rohit Waghchaure
343143037c
fix: conflicts
2021-08-01 14:45:24 +05:30
Rucha Mahabal
821db5cce7
fix: employee status server-side validation ( #26442 )
...
* fix: employee status server-side validation
* fix: test
* test: employee inactive status
* fix: test
2021-07-30 10:21:42 +05:30
Jannat Patel
ae9d1d9617
fix: Salary component account filter ( #26604 )
...
* fix: salary component account filter
* fix: cleanup
2021-07-27 09:40:12 +05:30
Jannat Patel
aaea5edbdb
fix: Salary component account filter ( #26605 )
...
* fix: salary component account filter
* fix: cleanup
2021-07-27 09:39:33 +05:30
Rucha Mahabal
017ed3f5c1
fix: employee status server-side validation ( #26615 )
2021-07-24 00:08:02 +05:30
Anurag Mishra
adfdc71844
fix: Tax calculation for Recurring additional salary ( #24206 )
...
* fix: Tax calculation for Recurring additional salary
* fix: conflicts
2021-07-14 09:59:41 +05:30
Anupam Kumar
a8b6cf8114
fix: bank remittance report issue ( #26398 )
2021-07-13 11:45:34 +05:30
Jannat Patel
b4ea185eca
fix: added company filter while fetching loans ( #26295 )
...
* fix: added company filter while fetching loans
* fix: added set_query in refresh
* fix: quotes
* fix: tests
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-12 13:15:41 +05:30
Jannat Patel
38994bd494
fix: Added Company filters for Loan ( #26294 )
...
* fix: loan validations
* fix: added company filter while fetching loans
* fix: tests
2021-07-12 13:01:31 +05:30
Anurag Mishra
8f945a9852
fix: Removed un-used flag
2021-07-08 13:06:04 +05:30
Anurag Mishra
fac420ee09
fix: Removed un-used flag
2021-07-08 13:05:14 +05:30
Anurag Mishra
f0b62f70d5
fix: payroll-entry minor fix
2021-07-06 13:40:22 +05:30
Anurag Mishra
1f5e2ba8e7
fix: payroll-entry minor fix
2021-07-06 13:36:23 +05:30
Anupam Kumar
877597bc16
fix: feating employee in payroll entry ( #26271 )
2021-07-02 13:10:18 +05:30
Nabin Hait
fa006402b8
fix: merge conflict
2021-07-01 12:47:28 +05:30
Rohit Waghchaure
87b4e6ea32
fix: employee selection not working in payroll entry
2021-07-01 12:02:03 +05:30
Rohit Waghchaure
a856624ccb
fix: employee selection not working in payroll entry
2021-07-01 11:56:55 +05:30
Anupam
8492bf040d
fix: feating employee in payroll entry
2021-06-30 17:17:43 +05:30
Rucha Mahabal
1f10a99910
fix: Employee Inactive status implications ( #26245 )
2021-06-29 15:58:56 +05:30
Rucha Mahabal
91dcc07e26
fix: Employee Inactive status implications ( #26244 )
2021-06-29 15:58:46 +05:30
Rucha Mahabal
8f2b8e47f7
fix: Employee Inactive status implications ( #26243 )
2021-06-29 15:58:30 +05:30
Deepesh Garg
5b119ac4a4
Merge pull request #26178 from deepeshgarg007/payroll_accounting_dimension_develop
...
fix: Accounting Dimensions for payroll entry accrual Journal Entry
2021-06-24 12:12:37 +05:30
Deepesh Garg
c451f43f64
fix(minor): Translation and linting issues
2021-06-24 10:18:46 +05:30
Deepesh Garg
3da0541000
fix: Accouting Dimensions for payroll entry accrual Journal Entry
2021-06-24 10:18:36 +05:30
Deepesh Garg
3007c9900b
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payroll_accounting_dimension
2021-06-23 23:06:15 +05:30
Anurag Mishra
11c155e6ce
feat: Employee Grievance ( #25705 ) ( #26162 )
...
* feat: Employee Grievance
* feat: link to desk and automatic unsuspend
* test: Employee Grievance
* fix: Sider and Translation
* fix: sider
* fix: formatting
* feat: changes requested
* feat: Employee Grievance
* feat: link to desk and automatic unsuspend
* test: Employee Grievance
* fix: Sider and Translation
* fix: sider
* fix: formatting
* feat: changes requested
* fix: patch test and sider issue
* fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances
- show pay cut and suspension buttons only if Employee Resposible is set
- some label changes
* feat: added subject field for more context
- set title for documents
- added list view settings
- refactor suspend and unsuspend functions
- add submit and cancel perms for system and hr managers
- fix tests
* fix: sider issues
* fix: removed suspension and paycut
* fix:sider
* fix: test
* fix: test
* fix: resolved Conflicts
* fix: sider
* fix: remove debugging print statements
* fix: validation message
* fix: unnecessary comma
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-06-23 12:13:32 +05:30
Anurag Mishra
fc98abece9
feat: Employee Grievance ( #25705 )
...
* feat: Employee Grievance
* feat: link to desk and automatic unsuspend
* test: Employee Grievance
* fix: Sider and Translation
* fix: sider
* fix: formatting
* feat: changes requested
* feat: Employee Grievance
* feat: link to desk and automatic unsuspend
* test: Employee Grievance
* fix: Sider and Translation
* fix: sider
* fix: formatting
* feat: changes requested
* fix: patch test and sider issue
* fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances
- show pay cut and suspension buttons only if Employee Resposible is set
- some label changes
* feat: added subject field for more context
- set title for documents
- added list view settings
- refactor suspend and unsuspend functions
- add submit and cancel perms for system and hr managers
- fix tests
* fix: sider issues
* fix: removed suspension and paycut
* fix:sider
* fix: test
* fix: test
* fix: resolved Conflicts
* fix: sider
* fix: remove debugging print statements
* fix: validation message
* fix: unnecessary comma
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-06-23 11:21:38 +05:30
Deepesh Garg
510077b3d4
fix(minor): Translation and linting issues
2021-06-17 11:21:21 +05:30
Deepesh Garg
5c19a9251f
fix: Accouting Dimensions for payroll entry accrual Journal Entry
2021-06-16 22:14:29 +05:30
Nabin Hait
0950481253
fix: merge conflict
2021-06-15 20:18:06 +05:30
Rucha Mahabal
17550fb4bf
feat: add Inactive status to Employee
2021-06-12 13:36:47 +05:30
Rucha Mahabal
efd7d584b2
feat: add Inactive status to Employee
2021-06-12 13:34:20 +05:30
Rucha Mahabal
a38147a8ba
feat: add Inactive status to Employee
2021-06-12 13:33:21 +05:30
Anupam Kumar
400205cc8a
fix: payroll entry employee detail issue ( #25968 )
...
* fix: payroll entry employee detail issue
* fix: review changes
2021-06-12 12:30:53 +05:30
gavin
46cc089f8b
Merge branch 'develop' into payroll-emp-detail
2021-06-10 20:15:28 +05:30
Anupam
32ebb1001e
fix: review chnages
2021-06-10 19:32:00 +05:30
Sagar Vora
062e247353
test: remove unused imports
2021-06-08 14:43:28 +05:30
Sagar Vora
ca205be5ac
fix: tests
2021-06-08 14:43:28 +05:30
Sagar Vora
0e5e1350b2
perf: use frappe.get_value with wildcard instead of another frappe.get_doc call
2021-06-08 14:43:28 +05:30
Sagar Vora
74818c7b62
fix: improve filter for from_date
; validation for joining and relieving date
2021-06-08 14:43:28 +05:30
Sagar Vora
447c978757
fix: choose correct Salary Structure Assignment when getting data for formula eval
2021-06-08 14:43:28 +05:30
Sagar Vora
5b1e7a61b8
test: remove unused imports
2021-06-07 19:34:02 +05:30
Sagar Vora
7f5378d98a
fix: tests
2021-06-07 18:40:54 +05:30
Anupam
bf0528413d
fix: payroll entry employee detail issue
2021-06-06 13:12:13 +05:30
Sagar Vora
bd92b4339c
perf: use frappe.get_value with wildcard instead of another frappe.get_doc call
2021-06-04 16:09:00 +05:30
Sagar Vora
5657fddb7a
fix: improve filter for from_date
; validation for joining and relieving date
2021-06-04 16:09:00 +05:30
Sagar Vora
e80902be8e
fix: choose correct Salary Structure Assignment when getting data for formula eval
2021-06-04 16:09:00 +05:30
Sagar Vora
eff8f6fe34
fix(Payroll): no need to set abbr
specially in Salary Slip ( #25877 )
2021-06-01 19:57:17 +05:30
Suraj Shetty
273589e835
test: Fix a case where test used to fail due to holiday list
...
- fixes: "Please set a default Holiday List for Employee EMP-00009 or Company Wind Power LLC" error
2021-05-28 09:10:33 +05:30
Anurag Mishra
2e0e4a7861
refactor: Additional Salary form clean up ( #25785 )
...
* feat: additional salary clean up
* fix: Label and description
* fix: labels
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-05-26 11:13:19 +05:30
Nabin Hait
8b2fef11b1
fix: merge conflict
2021-05-17 11:37:14 +05:30
Suraj Shetty
a13c453c69
test: Fix a case where test used to fail due to holiday list
...
- fixes: "Please set a default Holiday List for Employee EMP-00009 or Company Wind Power LLC" error
2021-05-10 20:33:47 +05:30
Shariq Ansari
735fbdc350
fix: Updating Standard Notification's channel field ( #25564 )
2021-05-07 12:26:32 +05:30
Nabin Hait
7481f54e0c
Merge branch 'version-13' into develop
2021-05-06 19:18:18 +05:30
Nabin Hait
0e41295c0e
perf: Performance enhancement on setup wizard ( #25606 )
...
* perf: Performance enhancement on setup wizard
* fix: create departments without updating nsm
2021-05-06 19:14:06 +05:30
Nabin Hait
134eaa5786
perf: Performance enhancement on setup wizard ( #25605 )
...
* perf: Performance enhancement on setup wizard
* fix: create departments without updating nsm
2021-05-06 19:13:54 +05:30
Anurag Mishra
80c5c866db
Revert "fix: default value for Templates ( #25591 )" ( #25608 )
...
This reverts commit 60f3e9ee29
.
2021-05-06 17:45:58 +05:30
Anurag Mishra
60f3e9ee29
fix: default value for Templates ( #25591 )
2021-05-05 13:23:42 +05:30
Deepesh Garg
cd9fa61659
Merge pull request #25521 from ernestoruiz89/patch-4
...
fix: Make strings translatable
2021-04-30 12:58:26 +05:30
Ernesto Ruiz
76e1e68cf4
fix: Make strings translatable
...
Make strings translatable
2021-04-29 08:24:56 -06:00
Anurag Mishra
7f1b2de74d
feat: Employee Referral ( #24997 )
...
* feat: Employee referal design and status sync
* feat: create job Applicant and linked Document
* feat: Added list view indicator
* chore: formatted file
* feat: Addedd Employee Referral form Dashboard
* feat: pay compensation via additional salary
* test: Employee Rreferral
* Update erpnext/hr/doctype/employee_advance/employee_advance.js
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
* fix: changes requested
* fix: changes requested
* fix: sider
* fix: translation
* fix: test
* feat: added to Dashboard
* fix: changes
* chore: clean-up Employee Referral form
- fix labels
- fix full name field
- fix failing test
- set title for Employee Referral form
- set fields in List View and Standard Filter
* feat: option to add a resume link
- copy resume and resume link from Employee Referral to Job Applicant
* fix: multiple fixes
- confirm before rejecting employee referral
- set primary actions for custom buttons
- Validations for additional salary against employee referrals with status as accepted only
- fix list view indicators
- code formatting style
* feat: Add field to track Referral Bonus Payment Status
- fix visibility of additional salary button
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-04-26 22:23:48 +05:30
Ernesto Ruiz
66250351d2
fix: Add transtlation function to strings
...
Add transtlation function to strings
2021-04-20 14:35:14 -06:00
Rucha Mahabal
c221682373
fix: Bulk Salary Structure Assignment ( #25389 )
2021-04-19 21:11:27 +05:30
Afshan
9c9907cf8e
fix: available employee for selection ( #25377 )
...
* fix: available employee for selection
* fix: available employee for selection
fix: available employee for selection
2021-04-19 11:48:28 +05:30
Afshan
c0db286dc1
fix: filter for employees in salary slip ( #25360 )
2021-04-15 23:48:25 +05:30
Rucha Mahabal
39b1cd827a
fix: Additional Salary component amount not getting set ( #25355 )
2021-04-15 18:54:29 +05:30
Nabin Hait
2535fe9b1e
fix: Resolved merge conflict
2021-04-14 13:09:50 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch ( #25305 )
2021-04-13 15:46:01 +05:30
Suraj Shetty
82d0a1a13e
style: Add missing semicolons
...
- & make formatting consistent
2021-04-13 12:35:42 +05:30
Rushabh Mehta
65f25c27b3
fix(minor): fix dynamically changing grid properties
2021-04-13 11:58:16 +05:30
Afshan
e2da3cbc28
fix: payroll issues ( #24540 )
...
* fix: payroll issues
* fix: enhancements
* fix: rename variables and refactor
* fix: slider
* fix: added missing arguments
* fix: test cases
* fix: slider
* fix: slider
fix: slider
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-07 15:13:44 +05:30
Walstan Baptista
c39720db50
fix: frappe.whitelist for doc methods ( #25231 )
2021-04-07 11:51:22 +05:30
Walstan Baptista
90e240c3e6
fix: frappe.whitelist for doc methods ( #25230 )
2021-04-07 11:32:51 +05:30
Deepesh Garg
a42194f3d5
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_fixes_phase_2
2021-04-06 23:53:34 +05:30
Rucha Mahabal
2453b0cf6a
fix: component amount calculation based on formula with abbr not working ( #25117 )
2021-04-02 17:00:28 +05:30
Rucha Mahabal
6717773c28
fix: Travis ( #25078 )
...
* fix(test): set default accounts in mode of payment
* fix(test): import_doc params in shopify settings test
* fix: syntax error in salary slip test
* fix(test): use Temporary Opening account for Stock Reco opening entry
* fix(test): skip GST doc naming validations for tests
* fix(test): Salary Structure Assignment date edge case
* fix(test): GST doc naming validations
* fix: sider
* revert: skip GST doc naming validations for tests
2021-04-01 15:30:34 +05:30
Nabin Hait
7f7b3608bb
fix: merge conflict
2021-04-01 15:05:53 +05:30
Nabin Hait
11eb30d082
fix: merge conflict
2021-04-01 15:03:11 +05:30
Rucha Mahabal
53a1aaf33d
fix: Salary Structure object has no attribute set_totals ( #25113 )
2021-04-01 14:40:15 +05:30
Rucha Mahabal
d765b21825
fix: Salary Structure object has no attribute set_totals ( #25114 )
2021-04-01 14:39:52 +05:30
Afshan
2fef245607
fix: don't set Company:company:default_currency as default for currency link fields ( #25111 )
2021-03-31 21:57:04 +05:30
Prssanna Desai
f3c34aa6ae
fix: don't set "Company:company:default_currency" as default for currency link fields ( #25095 )
...
* fix: don't set Company:company:default_currency as default for currency link fields
* fix: Company:company:default_currency and refactor
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Afshan <afshan13k@gmail.com>
2021-03-31 21:52:48 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods ( #25068 )
...
* chore: frappe.whitelist for doc methods
* fix: incorrect spelling
* fix: sider issue
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-31 12:30:32 +05:30
Rucha Mahabal
170d2efd35
fix(Payroll): Exchange Rate not getting set in Salary Slip ( #25013 )
2021-03-30 11:02:46 +05:30
Nabin Hait
2a39b74ad2
fix: Fixes on job card and salary slip ( #25011 )
...
* fix: map conversion factor while making stock entry from job card
* fix: fetch additional salary in salary slip
2021-03-26 10:49:39 +05:30
Rucha Mahabal
b2b12f303e
fix(Payroll): Exchange Rate not getting set in Salary Slip
2021-03-25 14:48:08 +05:30
Jannat Patel
08855182a3
test: fix test_loan for payroll module ( #24946 )
...
* test: fix test_loan for payroll module
* fix: minor style changes
2021-03-19 16:34:14 +05:30
Sagar Vora
95e9b2fd6e
refactor(payroll): simplified logic for additional salary ( #24907 )
2021-03-17 19:58:56 +05:30
Sagar Vora
cf3fc99b12
test: fix salary component not found; other optimisation ( #24920 )
2021-03-17 19:54:08 +05:30
Anurag Mishra
23b6294f5c
Merge pull request #24842 from resilient-tech/allow-duplicate-additional
...
fix(payroll): allow duplicate additional salaries
2021-03-17 17:39:52 +05:30
Deepesh Garg
a2e4564464
fix: Prevent non sequential repayment entries
2021-03-15 10:32:38 +05:30
Sagar Vora
6727792aaf
test: fix syntax error
2021-03-11 18:12:01 +05:30
Sagar Vora
514122bf6f
refactor(payroll): simplified logic for additional salary
2021-03-11 17:22:11 +05:30
Nabin Hait
fe3529b194
fix: merge conflict
2021-03-11 16:45:41 +05:30
Nabin Hait
6e3668dc30
fix: merge conflict
2021-03-11 16:14:27 +05:30
Sagar Vora
5822b6d76f
fix(payroll): allow duplicate additional salaries
2021-03-10 21:45:32 +05:30
Jannat Patel
fa73074250
fix: salary structure assign to employee ( #24798 )
...
* fix: salary structure assign to employee
* fix: pass data from dialog
2021-03-09 20:27:29 +05:30
Marica
5accf8adf5
Merge branch 'develop' into salary_slip_error
2021-03-09 18:20:54 +05:30
Ankush Menat
9b4e5bfa87
chore: improve error message for missing fields.
2021-03-09 13:59:14 +05:30
Raffael Meyer
f1d13a4ff3
Merge branch 'develop' into track_settings
2021-03-03 12:40:37 +01:00
Deepesh Garg
11092d0824
feat: Additon of leave details in Salary Slip ( #24674 )
...
* feat: Additon of leave details in Salary Slip
* fix: Change leaves to leave
2021-03-02 18:38:31 +05:30
Deepesh Garg
a5c4558f8b
feat: Additon of leave details in Salary Slip ( #24674 )
...
* feat: Additon of leave details in Salary Slip
* fix: Change leaves to leave
2021-03-02 18:36:48 +05:30
Ankush Menat
7d892438f0
fix: track setting changes
2021-03-02 17:50:58 +05:30
Jannat Patel
b27d4f6095
fix: salary slip working hours increment ( #24784 )
2021-03-02 17:44:42 +05:30
Nabin Hait
d46b23699c
fix: optimize reposting of gle and sle ( #24702 )
...
* fix(india): escape for special characters in JSON (#24695 )
JSON does not accept special whitespace characters like tab, carriage
return, line feed
Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf
Related issue: ISS-20-21-09811
* fix: Accounting Dimension creation background job timeout
* fix(regional): vehicle no is mandatory for ewaybill generation (#24679 )
* fix: vehicle no required for e-invoice
* fix: ewaybill generation dialog condition
* fix: excluding unidentified accounts from gstr-1
* fix: optimize reposting of sle and gle (#24694 )
* fix: optimize update_gl_entries_after method
* fix: Optimized reposting patch
* fix: accounting dimensions
* added reload_doc in patch
* Update item_reposting_for_incorrect_sl_and_gl.py
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
* fix: Replaced spaces with tabs
* fix: merge conflict
* fix: test cases
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2021-02-23 16:38:52 +05:30
Jannat Patel
4cef0f5983
fix: salary slip attribute error ( #24455 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-02-18 21:30:13 +05:30
Afshan
83768b68c1
fix: emp disappear ( #24525 )
...
* fix: emp disappear
* fix: renamed set_totals_call to set_totals
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-18 21:20:14 +05:30
Jannat Patel
ef5c714de2
fix: salary slip attribute error ( #24455 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-02-18 15:52:29 +05:30
Afshan
c0f8f32801
fix: fetch query for employee ( #24529 )
2021-02-02 20:27:23 +05:30
Afshan
10b00f9d0d
fix: separation of salary creation from payroll ( #24528 )
...
* fix: separation of salary creation from payroll
* fix: removed unnecessary veriable
* fix: check existing sal slips
* fix: existing checks
* style: refactoring query
2021-02-02 16:24:01 +05:30
Afshan
91a02868cb
fix: emp disappear ( #24525 )
...
* fix: emp disappear
* fix: renamed set_totals_call to set_totals
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-02 11:04:25 +05:30
Afshan
8676089794
fix: emp disappear ( #24524 )
...
* fix: emp disappear
* fix: renamed set_totals_call to set_totals
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-02 11:02:22 +05:30
Suraj Shetty
0a8939e1c1
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-29 08:56:22 +05:30
Nabin Hait
a6213ccd61
Merge branch 'develop' into version-13-beta-pre-release
2021-01-28 17:36:08 +05:30
Afshan
907e2990d0
fix: remove function to get earning deduction components ( #24465 )
...
* fix: remove function to get earning deduction components
* fix: slider
2021-01-27 15:34:42 +05:30
Suraj Shetty
0c34a711eb
Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release
2021-01-25 16:06:38 +05:30
Afshan
217440952f
fix: slider
2021-01-22 15:39:59 +05:30
Afshan
02d495f1fb
fix: added query for fetching salary component
2021-01-22 15:39:59 +05:30
Suraj Shetty
f0ff23eac3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-21 19:07:57 +05:30
Afshan
36e3e05a0e
fix: query for salary componet in salary structure
2021-01-20 16:48:42 +05:30
Afshan
912647f4f2
fix: allow statistical component in salary structure.
2021-01-20 13:58:32 +05:30
Afshan
c69ab6d184
fix: select sal comp while making sal struct
2021-01-19 19:29:31 +05:30
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
Suraj Shetty
bbc6bfd3c3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-19 09:34:06 +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
2c315a738e
feat: Salary Slip with Year to Date Print Format
2021-01-14 10:06: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
Anurag Mishra
b864b09d40
Merge branch 'develop' into gratuity
2021-01-05 14:47:38 +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