Commit Graph

2235 Commits

Author SHA1 Message Date
Anurag Mishra
0c482fde5f
feat: Leave Policy Assignment Refactor ()
* 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
Ganga Manoj
aa9e172091
feat: Add Create Expense Claim button in Delivery Trip ()
* 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 ()
* 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
Shariq Ansari
735fbdc350
fix: Updating Standard Notification's channel field () 2021-05-07 12:26:32 +05:30
Nabin Hait
134eaa5786
perf: Performance enhancement on setup wizard ()
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
2021-05-06 19:13:54 +05:30
Asharam Seervi
18ad15ed16
fix: designation insufficient permission on lead doctype. () 2021-05-04 19:28:07 +05:30
Rucha Mahabal
f1bdfac7a8
fix: Employee Separation ()
* 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 ()
* 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 () 2021-04-24 14:23:08 +05:30
Rucha Mahabal
184317d5bd
fix(HR): Permission error while adding weekly holidays () 2021-04-23 20:03:50 +05:30
pateljannat
73896ce94c fix: conflicts 2021-04-19 16:50:39 +05:30
pateljannat
3b54b1e975 fix: report name and columns 2021-04-19 16:49:28 +05:30
Ankush Menat
6c88ab07c7
fix: commit leave_allocation change to db () 2021-04-19 11:51:46 +05:30
Jannat Patel
b1aad63a99
fix: leave policy in leave allocation ()
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-04-16 16:08:22 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch () 2021-04-13 15:46:01 +05:30
Rucha Mahabal
b7aa658a51
refactor(HR): Add missing reports and doctypes to the Workspace ()
* refactor(HR): Add missing reports and doctypes to the Workspace

* refactor: remove Employee Tax and Benefits from HR Workspace

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2021-04-08 18:13:21 +05:30
Rucha Mahabal
d77ea7c88b
Merge pull request from ruchamahabal/approver-perms
feat(HR): share doc with employee approvers if they don't have access
2021-04-06 14:32:34 +05:30
Rucha Mahabal
0bcd3c45ed fix: leave approver perms test 2021-04-06 13:46:53 +05:30
Anupam Kumar
7b6c8bb3ab
fix: error message compensatory leave request () 2021-04-06 10:20:10 +05:30
Rucha Mahabal
084e90e5d3 fix(test): set user as Administrator 2021-04-06 10:07:50 +05:30
Rucha Mahabal
b7436a04c3
fix: Ignore Permission for Leave Ledger Entry () 2021-04-04 20:09:00 +05:30
Rucha Mahabal
57ab3a5a88
Merge branch 'develop' into approver-perms 2021-04-04 19:57:58 +05:30
Rucha Mahabal
19c3286b06 fix: linter and sider issues 2021-04-04 19:54:00 +05:30
Rucha Mahabal
8c055b5469 fix: ignore share permission while sharing doc with approver 2021-04-04 18:45:06 +05:30
Rucha Mahabal
13c0a350af test: leave, expense, shift request approver permissions 2021-04-04 18:37:46 +05:30
Rucha Mahabal
ba10ef4403 feat(HR): share doc with employee approvers if they don't have access 2021-04-04 17:16:48 +05:30
Sagar Vora
f68f41d7a7
test: fix multiple tests in Leave Application () 2021-04-03 17:34:57 +05:30
Jannat Patel
0353b0f5f6
Merge branch 'develop' into profitability-report 2021-04-02 10:15:28 +05:30
Prssanna Desai
f3c34aa6ae
fix: don't set "Company:company:default_currency" as default for currency link fields ()
* fix: don't set Company:company:default_currency as default for currency link fields

* fix: Company:company:default_currency and refactor

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Afshan <afshan13k@gmail.com>
2021-03-31 21:52:48 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods ()
* chore: frappe.whitelist for doc methods

* fix: incorrect spelling

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-31 12:30:32 +05:30
Anurag Mishra
720f69caaf
fix: column width in Recruitment analytics report ()
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-03-31 11:23:34 +05:30
shariquerik
82d7986a2f fix: sider fix 2021-03-26 17:02:37 +05:30
shariquerik
1989375be4 fix: Employee profile pic upload access for erpnext user 2021-03-26 16:34:22 +05:30
pateljannat
6597bf7dd7 feat: profitability report default working hours and tests 2021-03-25 13:31:43 +05:30
Sagar Vora
78e576ee6a
fix: default total_estimated_cost to zero ()
Co-authored-by: walstanb <walstanb@gmail.com>
2021-03-18 15:23:52 +05:30
Sagar Vora
500f54e515
test: fix shift type not found () 2021-03-17 23:25:04 +05:30
Sagar Vora
52bbd4e182
test: clear Leave Period before running Leave Allocation tests () 2021-03-17 22:37:59 +05:30
Sagar Vora
bce904cf97
test: fix Employee Not Found errors () 2021-03-17 10:03:30 +05:30
Anurag Mishra
6bafbffee0 fix: added also for leave applier as requested 2021-03-16 13:01:39 +05:30
Anurag Mishra
54482fd83f feat: added for disabling leave notification in HR settings 2021-03-16 13:01:39 +05:30
Nabin Hait
6e3668dc30 fix: merge conflict 2021-03-11 16:14:27 +05:30
Rohan
db2d196296
fix: do not send emails to disabled users from Employee Onboarding () 2021-03-09 21:03:45 +05:30
Jannat Patel
d7ac2394e8
fix: error in bulk attendance ()
* fix: error in bulk attendance

* fix: no date selected scenario

* fix: translation and sider
2021-03-09 20:41:58 +05:30
Deepesh Garg
82c6223196
Merge pull request from ankush/no_team_updates
fix(HR): hide "more" button from team updates
2021-03-02 18:55:34 +05:30
Deepesh Garg
ecde26409b
Update team_updates.js 2021-03-02 18:54:50 +05:30
Deepesh Garg
846500e8bc
Merge pull request from danielchalmers/patch-2
chore: Add description field & enable quick entry
2021-03-02 18:53:51 +05:30
Nabin Hait
190106a8b8
fix: rounding of earned leave is optional () 2021-03-02 13:38:14 +05:30
Daniel Chalmers
aa09628358
Skill fields: enable allow_in_quick_entry 2021-02-26 15:24:34 -06:00