Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,727 Commits 3 Branches 0 Tags 1 GiB
3c8ed4f737
Commit Graph

2129 Commits

Author SHA1 Message Date
Rucha Mahabal
3c8ed4f737
Merge branch 'develop' into multiple-cost-centers-against-employee 2021-12-28 08:40:48 +05:30
Rucha Mahabal
25f4de80b3
fix: filter out Claimed employee advances in Expense Claim (#29046) 2021-12-27 21:15:40 +05:30
Rucha Mahabal
21b07385ba
fix: flaky HR tests (#29017) 
* fix(test): use root company in Expense Claim tests

* fix(test): set Holiday List for Leave Allocation

* fix(test): set Holiday List for company
 2021-12-27 16:57:36 +05:30
Nabin Hait
f867f1974a fix: get fallback cost center from Employee/Department 2021-12-24 17:34:34 +05:30
Nabin Hait
f152a40b28 feat: Provision to assign multiple payroll cost centers against a single employee 2021-12-24 16:23:33 +05:30
Rucha Mahabal
ae929d7a63
fix(test): Leave Allocation validation against Leave Application after submit (#29005) 
* fix(test): Leave Allocation validation against Leave Application after submit

* chore: clean-up Leave Allocation tests

* fix(test): set holiday list for leave allocation test
 2021-12-23 19:18:05 +05:30
Rucha Mahabal
92e86f2f09
fix: fetch appointment letter content in the same order as template (#28968) 2021-12-20 22:56:15 +05:30
Ankush Menat
f5d5281119 chore: drop deprecated qunit tests 2021-12-20 17:03:10 +05:30
Dany Robert
0ca467a28f
fix: remove rounding of avg rating (#28945) 2021-12-18 16:16:47 +05:30
Rucha Mahabal
a481a7c90e
fix(test): Employee Exit Summary (#28888) 2021-12-14 22:03:44 +05:30
Rucha Mahabal
e93694d0ab fix: missing import 2021-12-12 23:02:44 +05:30
Rucha Mahabal
dcbf0c9eca fix: tests and sider issues 2021-12-07 23:40:10 +05:30
Rucha Mahabal
8db21e065c test: Exit Interview 2021-12-07 14:55:17 +05:30
Rucha Mahabal
0a937dc050 fix: show Exit Questionnaire button only to the users with write access 
- fix linter issues
 2021-12-07 13:04:23 +05:30
Rucha Mahabal
3230741cde fix: email summary 2021-12-06 10:08:51 +05:30
Rucha Mahabal
d67536cc8d feat: update Exit Interview date in employee master on submission 2021-12-05 19:55:25 +05:30
Rucha Mahabal
e30187f246 feat: bulk questionnaire sending 2021-12-05 19:32:33 +05:30
Rucha Mahabal
09fdfed163 fix: make Exit Interview submittable 2021-12-05 18:28:23 +05:30
Rucha Mahabal
1347187a30 feat: track status and final decision (Retained/Exit Confirmed) 2021-12-05 17:20:39 +05:30
Rucha Mahabal
235b707417 feat: add default Exit Questionnaire email template 2021-12-05 17:06:29 +05:30
Rucha Mahabal
7412accf6d feat: sending Exit Questionnaire 2021-12-05 17:02:19 +05:30
Rucha Mahabal
36a2d8ee0d feat: Exit Interview 2021-12-05 14:42:27 +05:30
Ankush Menat
0854c183aa
chore: remove duplicate code (#28646) 
[skip ci]
 2021-11-30 17:57:53 +05:30
Rucha Mahabal
d0f4f03b66
fix: Employee Transfer and Project Profitability test cases (#28633) 
* fix: Employee Transfer testcases

* fix: Project Profitability test case
 2021-11-30 14:04:47 +05:30
Rucha Mahabal
4458b24813
fix: allow creating Shift Assignment for same day (#28613) 2021-11-30 10:15:41 +05:30
Rucha Mahabal
baf41fdc9c
fix: Employee Advance paid amount not updated on PE cancellation (#28572) 
* fix: employee advance paid amount not updated on PE cancellation

* fix: convert raw sql queries to qb

* test: Employee Advance Paid Amount on PE cancellation

* chore: disable no copy for sanctioned amount in Expense Claim
 2021-11-29 14:23:06 +05:30
Rucha Mahabal
e7eef9601d
fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (#28497) 
* fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim

* fix: Expense Claim Advance form labels
 2021-11-22 20:13:15 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
mergify[bot]
25d1c1ce86
fix: add filter to query to avoid send reminder for zero years (#28092) (#28096) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 8cad23b8fb4d830a5703e107c371ae9319bc003d)

Co-authored-by: gsi-maruiz <62341390+gsi-maruiz@users.noreply.github.com>
 2021-10-27 11:21:26 +05:30
Dany Robert
2920f2f614
fix: change modified timestamp to apply changes on migrate #28095 
fix: change modified timestamp to apply changes on migrate
 2021-10-27 11:17:48 +05:30
Mohammed Yusuf Shaikh
03bfc77940
feat: employee initial work history updated when transfer is performed (#27768) 
* feat: employee initial work history updated when transfer is performed

* fix: sider

* fix: remove commit statement

* fix: tests and code formatting

* fix: tests

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-21 10:15:09 +05:30
Nabin Hait
2ef4844a3c
feat: Tax for recurring additional salary (#27459) 
* fix: Logic for tax calculation on recurring additional salary

* fix: Get actual amount always in case of overwritten additional salary even if based on payment days

* feat: Test case added for recurring additional salary

* fix: use query builder to get additional salaries instead of raw SQL

* fix: query formatting and remove trailing spaces

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-20 15:50:30 +05:30
Jannat Patel
00f7f97dc9
Merge branch 'develop' into auto-attendance-issue 2021-10-13 13:28:25 +05:30
Ankush Menat
8d69ec72a6 fix: remove transaction commit from tests 2021-10-12 16:17:15 +05:30
Chillar Anand
f0c4ea14a9
fix(hr): Update expense account after company is updated (#27843) 2021-10-11 11:59:26 +05:30
Jannat Patel
c07dfbc08b
Merge branch 'develop' into auto-attendance-issue 2021-10-07 17:22:28 +05:30
pateljannat
921b4be348 fix: exclude inactive employees from auto attendance 2021-10-07 17:12:46 +05:30
Chillar Anand
772d4753e7
refactor: Clean up mutable defaults and add CI check (#27828) 
* refactor: Clean up mutable defaults and add CI check
 2021-10-06 16:58:48 +00:00
Deepesh Garg
aa0698078f
Merge pull request #27660 from rtdany10/patch-8 
fix: tax rate being overridden in case of 0.00
 2021-10-05 14:11:27 +05:30
mergify[bot]
418b9f8545
feat(HR): Some Enhancements and Onboarding (backport #25741) (#27741) 
* feat(HR): Some Enhancements and Onboarding (#25741)

* feat: Hr settings restructure

* feat: remove validation and make As warning

* feat: made leave policy Assignment feild read only

* feat: send leave Notification via 'Notification'

* patch: for field name change

* feat: removed defaults value for removed field

* feat: removed leave Notification fields

* feat: better label and description

* feat: Hr Module onboarding and Onboarding slides

* fix: sider, test, translations

* chore: remove unnecessary code formatting changes

* refactor: HR Onboarding

* refactor: HR Settings

* revert: Notification changes

* chore: remove unnecessary descriptions from leave type

* fix: linter issues

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 4837238f3dbbad336bcd21fcbfa19b438cbad16a)

# Conflicts:
#	erpnext/hr/doctype/employee/employee.js

* fix: conflicts

* fix: conflicts

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-02 13:28:39 +05:30
mergify[bot]
b9942ad639
feat: Tracking Multi-round interview (#25482) (#27724) 
* feat: Tracking Multi-round interview

* fix: releted to scheduler event and formating

* fix: job applicant UI/UX and conflicts

* test: Interview Round

* fix(test): Employee referral, Employee Onboarding, Job Offer

* fix: sider

* feat: set default value in Hr settings

* feat: added validation for designation

* test: Interview

* test: Added validatiolns for skill

* test: Interview feedback

* fix: sider

* fix: remove unnecessary validations and form label cleanups

* chore: clean-up Interview Round and Interview Type doctype

* fix: remove redundant Rating Value, only keep Rating

* fix: update interview details on feedback submission

- make interview feedback submission dialog minimizable

* fix: show submit feedback button only if feedback doesn't exist

* refactor: Interview and Feedback statuses and workflow

* fix(HR Settings): clean up interview settings

* refactor: Interview

* refactor: Interview Feedback, remove unnecessary validations

* chore: update notification messages

* chore: remove unnecessary formatting changes in attendance list and leave application

* refactor: Job Applicant to Interview mapping

* chore: sorted imports

* chore: sorted imports

* fix: sider issues

* fix: linter issues

* fix: sider issues

* fix: tests

* fix: sorted imports

* fix: tests, sider

* fix: therapy plan test

* fix: sider issues

* feat: Include From Time and To Time fields in Interview for cleaner data

* feat: Interview Calendar

* fix: allow renaming masters

* fix: add more fields to list view and standard filter

* fix: validate overlapping interviews

* fix: update tests

* fix: linter issues

* refactor: replace reminder messages with Email Templates

* fix: sider issues

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 57e66f958cd57d66a6fd3b19f6cd3593eab63666)

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2021-10-01 13:15:40 +05:30
mergify[bot]
9df5df4d94
fix: wrong company selected when marking attendance for all employees (#27685) (#27707) 
* fix: wrong company selected when marking attendance for all employees

* fix: enable caching for repeated queries of the same employee


(cherry picked from commit b478e72cefbdffd3e906fdd1ef822becdead78d7)

Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
 2021-09-30 12:07:38 +05:30
Dany Robert
2b4959fb3b
fix: return tax rate since fetch is removed 2021-09-29 13:01:40 +05:30
Dany Robert
5ce6a4c107
fix: tax rate being overridden in case of 0.00 
Tax rate could be different for different expenses.
Therefore, rate is kept as 0.00 and tax amount entered manually. 
But fetching used to override the rate(upon saving) and mess up the amount.
 2021-09-26 18:31:27 +05:30
Ankush Menat
c302c7ab42
fix: remove bad default for anniversary reminders (#27632) 
🤦
 2021-09-21 17:51:46 +05:30
François de Ryckel
5c400da4e2
Update training_result.js (#27615) 
cur_frm is deprecated
 2021-09-21 09:29:15 +05:30
Rucha Mahabal
b98740b44a
fix: employee advance return through multiple additional salaries (#27438) 
* fix: employee advance return through multiple additional salaries

* test: test repay unclaimed amount from salary

* fix: sorting in imports
 2021-09-14 11:20:15 +05:30
Anupam Kumar
88c9fe35bd
fix: employee remider settings (#27365) 2021-09-07 00:15:58 +05:30
Chillar Anand
915b34391c
chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30