Commit Graph

2374 Commits

Author SHA1 Message Date
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
Rucha Mahabal
f828d853e3
fix: Org Chart fixes (#27290)
* fix(org chart): multiple root nodes not expanding on clicking Expand All

* fix: unstable filter inserts duplicate nodes
2021-09-01 23:07:26 +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
2d62c500c4
fix: undefined variables 2021-09-01 15:05:00 +05:30
Ankush Menat
010060d92e
chore: correct indentation 2021-09-01 15:02:29 +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
Mohammed Redah
a2966db1e5
fix: change print_format_type from Server to Jinja (#26374) 2021-08-17 18:45:55 +05:30
Rucha Mahabal
39efc62b94
feat: Organizational Chart (#26893)
* feat: Organizational Chart

* feat: org chart mobile interactions

* feat(mobile): sibling node group expansion and rendering

* fix: expanded node group interactions and visibility

* feat: connectors for mobile node cards

* fix: don't refresh connections for same node

- remove all connectors while expanding a group node

* chore: create separate files for Desktop and Mobile view and bundle assets

* refactor: add options to chart

- method to return the node data

- wrapper for showing the hierarchy

* feat: setup node edit action

* fix: revert changes in employee descendants query

* refactor: use arcs instead of bezier curves for cleaner connectors

* feat: add arc to connectors in mobile view

* fix: edit node button overflowing

* fix: sider

* fix: removing orphaned connectors

* fix: unnecessary variables

* feat: handle multiple root / orphan nodes

* perf: Optimise Rendering

- optimise get_children function

- use promises instead of callbacks

- optimise selectors

- use const wherever possible

- use pure js instead of jquery for connectors for faster rendering

* fix: do not sort by number of connections

* feat: use icon for connections on mobile view

* fix: exclude active node while fetching sibling group

* fix: sibling group expansion not working for root nodes

* fix(mobile): collapsed nodes not expanding

* fix: sider

* test: UI tests for org chart desktop

* test: UI tests for org chart mobile

fix(mobile): detach node before emptying hierarchy

fix(mobile): sibling group not rendering for first level

* fix: sider

* ci(cypress): use env variable for key

documentation ref: https://docs.cypress.io/guides/guides/command-line\#cypress-run

* fix(tests): clear filter before typing

* fix(tests): apply filters correctly

* fix: tests

* fix: tests

* fix: tests

* fix(test): increase timeout for record creation

* fix: sider

* fix: sider

* feat: Expand All nodes option in Desktop view

* feat: add html2canvas for easily exporting html to images using canvas

* feat: Export chart option in desktop view

* fix(style): longer titles overflowing

* fix: remove unnecessary imports

* fix: test

* fix: make bundled assets for hierarchy chart

* fix(style): apply svg container margin only in desktop view

* fix: Nest `.level` class style under `.hierarchy` class (#26905)

fix: Nest `.level` class style under `.hierarchy` class

* fix: add z-index to filter to avoid svg wrapper overlapping

* fix: expand all nodes not working when there are only 2 levels

- added dom freeze while expanding all nodes and exporting

* fix: test

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-08-16 20:42:23 +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
Rucha Mahabal
0b4959966c fix: expand all nodes not working when there are only 2 levels
- added dom freeze while expanding all nodes and exporting
2021-08-16 10:19:48 +05:30
Rucha Mahabal
4981746b9a
Merge branch 'develop' into org-chart-develop 2021-08-15 20:50:56 +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
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
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
52cd007292 fix: make bundled assets for hierarchy chart 2021-08-10 20:13:28 +05:30
Rucha Mahabal
c79316a9c0 fix: exclude active node while fetching sibling group 2021-08-10 17:51:28 +05:30
Rucha Mahabal
b6715189fb fix: do not sort by number of connections 2021-08-10 17:50:02 +05:30
Rucha Mahabal
a48b23e6a5 perf: Optimise Rendering
- optimise get_children function

- use promises instead of callbacks

- optimise selectors

- use const wherever possible

- use pure js instead of jquery for connectors for faster rendering
2021-08-10 17:49:53 +05:30
Rucha Mahabal
31a0f36ed9 feat: handle multiple root / orphan nodes 2021-08-10 17:49:44 +05:30
Rucha Mahabal
e179cd9841 fix: revert changes in employee descendants query 2021-08-10 17:47:53 +05:30
Rucha Mahabal
aacb649050 feat: setup node edit action 2021-08-10 17:47:43 +05:30
Rucha Mahabal
249621af1b refactor: add options to chart
- method to return the node data

- wrapper for showing the hierarchy
2021-08-10 17:47:06 +05:30
Rucha Mahabal
281241dc24 chore: create separate files for Desktop and Mobile view and bundle assets 2021-08-10 17:46:51 +05:30
Rucha Mahabal
e9c6ea077f fix: don't refresh connections for same node
- remove all connectors while expanding a group node
2021-08-10 17:46:40 +05:30
Rucha Mahabal
fb9b628b89 feat: connectors for mobile node cards 2021-08-10 17:46:20 +05:30
Rucha Mahabal
25c5cff3de fix: expanded node group interactions and visibility 2021-08-10 17:46:10 +05:30
Rucha Mahabal
5046cb09d8 feat(mobile): sibling node group expansion and rendering 2021-08-10 17:45:51 +05:30
Rucha Mahabal
8a33a039f7 feat: org chart mobile interactions 2021-08-10 17:44:52 +05:30
Rucha Mahabal
506ecb4216 feat: Organizational Chart 2021-08-10 17:44:30 +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
Rucha Mahabal
357657fa73 chore: create a separate controller file for EmployeeBoardingController 2021-06-24 13:00:50 +05:30
Rucha Mahabal
c5c858e428
Merge branch 'develop' into fix-employee-onboarding-status 2021-06-24 12:24:44 +05:30
Jannat Patel
9ec0ded28f
fix: Staffing plan vacancies data type issue (#25941)
* fix: staffing plan vacancies data type issue

* fix: translation issue

* fix: removed greater than 0 condition
2021-06-23 14:05:10 +05:30
Jannat Patel
da66cefefc
fix: staffing plan vacancies data type issue (#25936)
* fix: staffing plan vacancies data type issue

* fix: translation issue

* fix: removed greater than 0 condition

* fix: sider

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-06-23 14:04:48 +05:30
Anurag Mishra
d021db1cb1
fix: Training event (#26164)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-06-23 12:59:43 +05:30
Jannat Patel
44815393b3
fix: job applicant link issue (#25934) 2021-06-23 12:28:02 +05:30
Jannat Patel
0354ec6363
fix: job applicant link issue (#25933)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-06-23 12:27:45 +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
Anurag Mishra
b1c72da7d7 fix: Training event 2021-06-16 14:08:32 +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
Rucha Mahabal
67519d6b79 fix: boarding status in Employee Onboarding and Separation
- make boarding status read-only as its dependent on project

- update boarding status in onboarding/separation on project update

- update tests to check status changes
2021-06-03 18:07:00 +05:30
Jannat Patel
1175e0686b
refactor: leave balance report (#25771)
* refactor: leave balance report

* refactor: sql to orm
2021-06-01 10:53:00 +05:30
Jannat Patel
022b5c973a
fix: wrap dates in getdate for leave application (#25899)
* fix: wrap dates in getdate for leave application

* fix: translation issue

* fix: replaced today with getdate
2021-05-31 19:49:53 +05:30
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
Rucha Mahabal
3be28054de
refactor: Vehicle Expenses Report (#25727)
* refactor: Vehicle Expense Report

* test: Vehicle Expenses Report

* feat: Added Employee filter to report

- fix Vehicle Log form view

* fix: set currency fieldtype for chart data

- added filters for employee and vehicle

* fix: service expenses not getting set
2021-05-31 09:11:42 +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
5670cf4386
feat: enhancements in Training Event (#25782)
* feat: Some Minor fixes

* fix: patch file

* fix: patch

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-05-24 20:24:20 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild 2021-05-18 14:48:28 +05:30
Nabin Hait
8b2fef11b1 fix: merge conflict 2021-05-17 11:37:14 +05:30
Suraj Shetty
14ca9ce1b7
Merge pull request #25635 from surajshetty3416/parallel-distributed-testing 2021-05-13 15:41:13 +05:30
Anurag Mishra
0c482fde5f
feat: Leave Policy Assignment Refactor (#24327)
* feat: Leave Policy Assignment Refactor

* fix: Changes Requested

* fix: sider

* fix: changes requested

* test: fixed

* test: fixed wrong set query

* fix: remove commented code

* fix(style): extra space

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-05-13 13:20:14 +05:30
David Angulo
c55aa295fc
fix: Translate weekday when getting weekly off dates (#25691) 2021-05-13 12:16:04 +05:30
Suraj Shetty
b3fadebb41 style: Fix sider issues 2021-05-10 20:49:07 +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
Suraj Shetty
ec6b652cd4 refactor: Rename assertEquals to assertEqual to avoid deprecation warnings 2021-05-10 09:18:25 +05:30
Ganga Manoj
aa9e172091
feat: Add Create Expense Claim button in Delivery Trip (#25526)
* feat(Delivery Trip): Add employee_code field

* feat(Expense Claim): Add Delivery Trip Number field

* feat(Delivery Trip): Add Create Expense Claim button

* feat(Delivery Trip): Make Create Expense Claim button show up after save

* fix(Delivery Trip): Fix Sider issues

* fix(Delivery Trip): Display button after submit

* fix(Delivery Trip & Expense Claim): Rename new fields

* fix(Delivery Trip): Add button in refresh

* fix(Delivery Trip): Remove redundant line

* fix(Expense Claim): Display delivery_trip only if non-empty

* fix(Delivery Trip): Add test for Create Expense Claim

* fix(Delivery Trip): Fix Sider Issue

* fix(Delivery Trip): Only display Create Expense Claim if the driver is an employee

* fix(Delivery Trip): Fix test

* fix(Delivery Trip): Fix make_expense_claim()

* fix: sider

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-05-08 17:15:33 +05:30
Ankush Menat
90e671905a
chore: replace assertEquals with alias assertEqual (#25613)
* chore: replace assertEquals with alias assertEqual

assertEquals has been deprecated.

ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases

* chore: sider fixes
2021-05-07 20:28:51 +05:30
Faris Ansari
69eb6d476e Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-07 15:21:33 +05:30
Syed Mujeer Hashmi
bcf3f3dd29
fix: Monthly Attendance Sheet Summarized view (#24976)
* fix: Monthly Attendance Sheet Summarized view

This fixes the count of different leave types in the monthly
attendance sheet summarized view.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: Avoid using raw sql query

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2021-05-07 13:34:21 +05:30
Shariq Ansari
735fbdc350
fix: Updating Standard Notification's channel field (#25564) 2021-05-07 12:26:32 +05:30
Nikhil Ponnuru
ef9f126cb2
fix: change get_all to get_list in employee leave balance summary report to hide descendants when hide descendants is selected in user permissions (#25599)
Co-authored-by: nikhilponnuru <nikhil.kp@zerodha.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-05-07 10:06:29 +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
Anurag Mishra
ca9599da51
Merge branch 'develop' into Employee-Referrals-ui-fix 2021-05-05 12:57:17 +05:30
Asharam Seervi
18ad15ed16
fix: designation insufficient permission on lead doctype. (#25331) 2021-05-04 19:28:07 +05:30
Anurag Mishra
16da87a307 fix: created new section for deatils 2021-05-04 17:05:42 +05:30
Rucha Mahabal
f1bdfac7a8
fix: Employee Separation (#25503)
* fix: Employee Separation

- add ignore_mandatory flag for project creation

- form clean-up

* fix: Employee Separation test
2021-05-03 18:37:00 +05:30
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
Rucha Mahabal
0decc2b66a fix: validate Standard Working Hours
- use standard working hours in metrics calculation
2021-04-26 11:00:54 +05:30
Rucha Mahabal
e939da982e
Merge branch 'develop' into profitability-report 2021-04-26 09:17:12 +05:30
Walstan Baptista
4a805b5622
chore: frappe.whitelist for doc methods (#25465) 2021-04-24 14:23:08 +05:30
Rucha Mahabal
184317d5bd
fix(HR): Permission error while adding weekly holidays (#25450) 2021-04-23 20:03:50 +05:30