Commit Graph

2289 Commits

Author SHA1 Message Date
Frappe PR Bot
821d55b0e0 fix: employee remider settings (#27365) (#27366)
(cherry picked from commit 88c9fe35bd)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
2021-09-07 00:20:38 +05:30
Chillar Anand
4b2be2999f chore: Cleanup imports (#27320)
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Remove imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Fix sider issues

* chore: linting

* chore: linting / sorting import

from ecommerce refactor merge

* ci: dont allow unused imports

* chore: sort / clean ecommerce imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-03 18:57:43 +05:30
Frappe PR Bot
cf4ff46c1e fix: Org Chart fixes (#27290) (#27305)
* fix(org chart): multiple root nodes not expanding on clicking Expand All

* fix: unstable filter inserts duplicate nodes

(cherry picked from commit f828d853e3)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-09-01 23:53:23 +05:30
Ankush Menat
f0bcb753fb chore: whitespace trimming 2021-09-01 20:23:48 +05:30
Ankush Menat
1c63cbb1e4 fix: remove duplicate imports 2021-09-01 20:18:45 +05:30
Ankush Menat
0519b59aa9 fix: undefined variables 2021-09-01 20:16:38 +05:30
Ankush Menat
8746466412 chore: correct indentation 2021-09-01 20:16:24 +05:30
Ankush Menat
76f1ed624a fix: remove bare excepts 2021-09-01 20:15:54 +05:30
Raffael Meyer
366eb86fdf feat: color and leave type in leave application calendar (#27246)
* feat: color and leave type in leave application calendar

* fix: sider + use cstring
2021-08-31 17:00:44 +05:30
Frappe PR Bot
a0cf396712 fix: expense claim reimbursed amount update (#27204) (#27229)
(cherry picked from commit 9cb642238f)

Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
2021-08-30 17:54:57 +05:30
Frappe PR Bot
8dae084f23 chore: remove deprecated and empty QUnit tests (#27179) (#27181)
* 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.

(cherry picked from commit ae55eab599)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-26 21:08:08 +05:30
Mohammad Hussain Nagaria
24b2a31581 feat: Employee reminders (#25735)
* 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>
2021-08-24 19:43:43 +05:30
Ankush Menat
9bb69e711a chore: whitespace cleanup from codebase 2021-08-19 14:33:03 +05:30
Frappe PR Bot
90818d57f1 fix: change print_format_type from Server to Jinja (#26374) (#26985)
(cherry picked from commit a2966db1e5)

Co-authored-by: Mohammed Redah <mhbu50@gmail.com>
2021-08-17 13:36:08 +00:00
Ankush Menat
333d962ac2 test: fix tests failing due to doc amend feature (bp #26656) (#26907)
* test: fix test due to rename change

* 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

* 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

* test: fix POS Closing Entry Test

- Separated into two tests, one checks if SI cancelling is blocked, the other checks PCE cancel impact
- This is done because after cancel via assertRaises, damage done by cancel still exists or is partially comitted
- Dont use this partially cancelled doc for any assertions further, end test at exception assertion
- Use `get_value` to check SI docstatus, as its primary key changes after cancel

* test: fixed asset movement tests

- set cwip account in company to avoid value missing
- removed unused statement
- removed trailing spaces

* Revert "test: fix POS Closing Entry Test"

This reverts commit 8f1a3aef2e.

Co-authored-by: marination <maricadsouza221197@gmail.com>
2021-08-17 18:01:39 +05:30
Frappe PR Bot
3c9b8dce21 feat: Training Event Status Update and Validations (#26698) (#26961)
* 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

(cherry picked from commit bf75ea70fb)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-08-16 17:57:14 +05:30
Frappe PR Bot
64dfbfaecb feat: enable track changes for leave type (#26917) (#26959)
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit a9a24051c9)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
2021-08-16 15:17:28 +05:30
Frappe PR Bot
321dd33015 fix: Org Chart fixes (#26952) (#26953)
* 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

(cherry picked from commit 67e3971c3b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-08-16 10:44:35 +05:30
Ankush Menat
6aed9e26ac fix: unknown attribute "string_type" (#26947) 2021-08-14 10:45:43 +05:30
Nabin Hait
f8031d3d79 Merge pull request #26261 from ruchamahabal/org-chart
feat: Organizational Chart
2021-08-10 17:12:59 +05:30
Jannat Patel
6c48a2ed79 fix: Removed set_status after cancel from Expense Claim and Employee Advance (#25901)
* fix: removed set_status after cancel from hr doctypes

* fix: semgrep on_submit issue

* fix: sider

* fix: spaces

* fix: update flag for db_set
2021-07-27 09:41:55 +05:30
Rucha Mahabal
017ed3f5c1 fix: employee status server-side validation (#26615) 2021-07-24 00:08:02 +05:30
Rucha Mahabal
fc4079587b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into org-chart 2021-07-13 12:38:37 +05:30
Anurag Mishra
afafe406c8 Merge pull request #26388 from Anurag810/training_fix_v13
fix: Query for Training Event
2021-07-09 12:21:17 +05:30
Anurag Mishra
a82e9e42e1 fix: query for training Event 2021-07-08 17:27:21 +05:30
Rucha Mahabal
09c24c7949 fix: exclude active node while fetching sibling group 2021-07-08 17:05:40 +05:30
Rucha Mahabal
48018b8d8c fix: do not sort by number of connections 2021-07-08 11:23:50 +05:30
Rucha Mahabal
df3bb9ea8c 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-07-08 09:53:31 +05:30
Rucha Mahabal
6eec251273 feat: handle multiple root / orphan nodes 2021-07-07 12:05:50 +05:30
Deepesh Garg
9b6d9a41f4 fix: Test Cases 2021-07-05 17:08:27 +05:30
Deepesh Garg
15b336df28 fix: Test cases 2021-07-05 14:45:33 +05:30
Anurag Mishra
73db919c99 fix: set query for training events (#26303)
* fix: set query

* fix: remove whitespace between function and params

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-02 17:55:42 +05:30
Rucha Mahabal
7558b28b79 fix: revert changes in employee descendants query 2021-06-29 21:57:27 +05:30
Rucha Mahabal
c40b9d276e feat: setup node edit action 2021-06-29 21:51:21 +05:30
Rucha Mahabal
f15e8b7f5a refactor: add options to chart
- method to return the node data

- wrapper for showing the hierarchy
2021-06-29 21:26:47 +05:30
Rucha Mahabal
bcc998e8c2 chore: create separate files for Desktop and Mobile view and bundle assets 2021-06-29 19:15:08 +05:30
Rucha Mahabal
b7c61ff651 fix: don't refresh connections for same node
- remove all connectors while expanding a group node
2021-06-29 18:21:42 +05:30
Rucha Mahabal
f5314293c6 feat: connectors for mobile node cards 2021-06-29 17:48:44 +05:30
Rucha Mahabal
91dcc07e26 fix: Employee Inactive status implications (#26244) 2021-06-29 15:58:46 +05:30
Rucha Mahabal
25e8723032 fix: expanded node group interactions and visibility 2021-06-29 15:06:09 +05:30
Rucha Mahabal
6e3a7b4a75 feat(mobile): sibling node group expansion and rendering 2021-06-29 11:12:47 +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
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
44815393b3 fix: job applicant link issue (#25934) 2021-06-23 12:28:02 +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
Rucha Mahabal
cce19db826 feat: org chart mobile interactions 2021-06-21 21:55:50 +05:30
Rucha Mahabal
c1ba35b25b feat: Organizational Chart 2021-06-20 12:42:06 +05:30
Anurag Mishra
b1c72da7d7 fix: Training event 2021-06-16 14:08:32 +05:30
Rucha Mahabal
17550fb4bf feat: add Inactive status to Employee 2021-06-12 13:36:47 +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