Frappe PR Bot
255b99ebdc
feat: Employee reminders ( #25735 ) ( #27115 )
...
* feat: Add reminders section to HR Settings
* refactor: Extract generic function for getting Employees
* feat: Employee Work Anniversary Reminder
* feat: Daily Holiday Reminder
* fix: Unnecessary params and replace [] with .get()
* test: Daily Holiday Reminders
* test: is_holiday basic tests
* refactor: Move employee reminders code to separate module
* feat: Add advance reminder to HR settings
* feat: Advance Holiday Reminders
* refactor: get_holidays_for_employee
* feat: Email holiday reminders in advance + tests
* fix: Remove unused import
* refactor: HR Setting Reminder Section
* refactor: Remove Daily Holiday Reminders feat
* feat: Reminder miss warning
* fix: Failing test and function name change
* chore: Add patch for field rename
* chore: Rename frequency label
* fix: Failing patch test
* fix: sider and removed description of fields
* fix: email alignment
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 24b2a315818d08ad4cb03347ccf5297df916a5ac)
Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-08-24 20:19:22 +05:30
Rushabh Mehta
49e0a4f287
Revert "fix: Salary component account filter ( #26604 )"
...
This reverts commit ae9d1d9617
2021-08-24 08:33:57 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
Rucha Mahabal
15df0ad6a0
fix: undefined variable due to inconsistent porting of commits ( #26994 )
2021-08-18 11:23:44 +05:30
Mohammed Redah
a2966db1e5
fix: change print_format_type from Server to Jinja ( #26374 )
2021-08-17 18:45:55 +05:30
Rohit Waghchaure
eb1e3181a4
fix: conflicts while merging brnach version-13 to develop
2021-08-17 10:53:19 +05:30
Shariq Ansari
b32c2fa561
fix: updated erpnext wspace json files ( #26380 )
...
* fix: updated erpnext wspace json files
* fix: updated wspace json files
* fix: updated wspace json files
* fix: removed padding code from wspace json files
* fix: Updated restrict_to_domain in wspace json
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-08-13 12:19:16 +05:30
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
Nabin Hait
493029195c
fix: Additional salary processing
2021-08-01 19:47:42 +05:30
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
