Commit Graph

236 Commits

Author SHA1 Message Date
Nabin Hait
894ed3a9a5
Merge pull request #26765 from frappe/revert-24206-additional_salary_tax_enhancements
Revert "fix: Tax calculation for Recurring additional salary"
2021-08-06 10:22:31 +05:30
Anupam Kumar
df477dcae6
fix: bank remittance report issue (#26398) (#26766) 2021-08-04 14:02:43 +05:30
Nabin Hait
74bb55bfd2 Revert "fix: Tax calculation for Recurring additional salary (#24206)"
This reverts commit adfdc71844.
2021-08-01 20:03:38 +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
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
f0b62f70d5 fix: payroll-entry minor fix 2021-07-06 13:40:22 +05:30
Anupam Kumar
877597bc16
fix: feating employee in payroll entry (#26271) 2021-07-02 13:10:18 +05:30
Rohit Waghchaure
a856624ccb fix: employee selection not working in payroll entry 2021-07-01 11:56:55 +05:30
Rucha Mahabal
91dcc07e26
fix: Employee Inactive status implications (#26244) 2021-06-29 15:58:46 +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
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
Rucha Mahabal
17550fb4bf feat: add Inactive status to Employee 2021-06-12 13:36:47 +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
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
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
Shariq Ansari
735fbdc350
fix: Updating Standard Notification's channel field (#25564) 2021-05-07 12:26:32 +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
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