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

2102 Commits

Author SHA1 Message Date
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
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
Ankush Menat
7d9819f352
fix: remove duplicate imports 2021-09-01 15:33:35 +05:30
Ankush Menat
694ae81618
fix: remove bare excepts 2021-09-01 15:02:28 +05:30
Anurag Mishra
ab47409e91
feat: Full and Final Settlement and Gratuity Fix (#26364) 
* feat: Full and Final Settlement

* removed option to pay via salary slip

* feat: Create JV

* test:fnf

* fix: tracking asset movement

* fix: sider and test

* fix: changes Requested

* fix: changes requested

* fix: valication for Asset

* fix: add filter for reference document only if relevant field is present

* fix: doctype cleanup

- add more fields to the list view and standard filter

- set title field

- incorrect field labels

* feat: add list view settings for FNF

* fix: incorrect reference type set in Journal Entry

* fix: validation message

* chore: add Full and Final Statement link to Workspace

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-08-31 17:59:26 +05:30
Frappe PR Bot
e958ae9002
feat: color and leave type in leave application calendar (#27246) (#27255) 
* feat: color and leave type in leave application calendar

* fix: sider + use cstring

(cherry picked from commit 366eb86fdfd9bb204bce677b01b8d5bb5ffa4d6d)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2021-08-31 17:34:48 +05:30
Subin Tom
9cb642238f
fix: expense claim reimbursed amount update (#27204) 2021-08-30 13:17:22 +05:30
Rucha Mahabal
71b7c63ec0
feat: Ability to schedule onboarding and separation activities (#26738) 
* refactor: employee onboarding form clean-up

* feat: ability to schedule onboarding / separation tasks

* feat: skip holidays while setting boarding activity dates

* chore: remove unused child table - Employee Onboarding Activity

* fix: tests

* fix: employee separation test
 2021-08-27 11:12:24 +05:30
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests (#27179) 
* chore: remove deprecated and empty QUnit tests

* ci: fix UI test config

Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
 2021-08-26 20:43:06 +05:30
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
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Rucha Mahabal
bf75ea70fb
feat: Training Event Status Update and Validations (#26698) 
* fix: training event employee status not updated on feedback submission

* feat: update attendees status on training event status update

* test: Training Event and Feedback

* chore: remove unused import
 2021-08-16 17:22:51 +05:30
Anupam Kumar
a9a24051c9
feat: enable track changes for leave type (#26917) 
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
 2021-08-16 14:48:53 +05:30
Frappe PR Bot
b5926a33b3
fix: unknown attribute "string_type" (#26947) (#26950) 
(cherry picked from commit 6aed9e26acaf266f7260adab16656d554c6bb022)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-14 10:48:33 +05:30
marination
bca30d6101 test: fix Shift Request test 
- Use `get_value` instead of `get_doc`
- Remove unnecessary loop, only one shift assignment is made against a shift request
- Get value after cancel again. Get doc is not reliable since primary key changed after cancel
 2021-08-11 13:29:44 +05:30
marination
e5b0221693 test: fix attendance request tests 
- Use `frappe.db.get_value` instead of `get_doc` for asserting values
- Get values after cancellation as reloading attendance doc breaks due to stale doc (primary key changed after cancel of attendance request)
- rollback everything on tearDown
 2021-08-11 13:02:49 +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
e99f68fd7e
fix: expense claim semgrep issue (#26709) 
* fix: expense claim semgrep issue

* fix: sider
 2021-07-29 18:31:38 +05:30
Rucha Mahabal
99de84ebe1
Merge branch 'develop' into fix-employee-onboarding-status 2021-07-20 12:22:10 +05:30
Deepesh Garg
2de11fbbc4 fix: Test Cases 2021-07-13 16:50:35 +05:30
Deepesh Garg
3ef394c556 fix: Test cases 2021-07-13 16:50:35 +05:30
Anurag Mishra
b6ff8917e8 fix: query for training Event 2021-07-08 17:25:37 +05:30
Anurag Mishra
0a79cfa170
fix: set query for training events (#26302) 
* fix: set query

* fix: whitespace between function name and param

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-07-02 17:54:43 +05:30
Nabin Hait
fa006402b8 fix: merge conflict 2021-07-01 12:47:28 +05:30
Rucha Mahabal
1f10a99910
fix: Employee Inactive status implications (#26245) 2021-06-29 15:58:56 +05:30
Rucha Mahabal
8f2b8e47f7
fix: Employee Inactive status implications (#26243) 2021-06-29 15:58:30 +05:30
Jannat Patel
6a9798f305
fix: update leave allocation after submit (#26191) 
* fix: update leave allocation after submit v13

* fix: test

* fix: test
 2021-06-24 18:11:33 +05:30
Jannat Patel
ca8c3b90f0
fix: Update leave allocation after submit (#25975) 
* update leave allocation after submit

* fix: leave allocation update after submit

* fix: circular dependency

* fix: replaced update with submit in tests

* fix: replaced update with submit in tests

* fix: updating total leaves allocated
 2021-06-24 13:13:03 +05:30