Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,884 Commits 3 Branches 0 Tags 1 GiB
4c612b7cb2
Commit Graph

2305 Commits

Author SHA1 Message Date
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
Faris Ansari
1fe891b287 refactor: Replace Class.extend with native class 2021-04-23 08:04:00 +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 (#25382) 2021-04-19 11:51:46 +05:30
Jannat Patel
b1aad63a99
fix: leave policy in leave allocation (#25334) 
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 (#25305) 2021-04-13 15:46:01 +05:30
Rucha Mahabal
b7aa658a51
refactor(HR): Add missing reports and doctypes to the Workspace (#24994) 
* 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 #25190 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 (#25206) 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 (#25172) 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 (#25173) 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 (#25095) 
* 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 (#25068) 
* 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 (#25003) 
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 (#24939) 
Co-authored-by: walstanb <walstanb@gmail.com>
 2021-03-18 15:23:52 +05:30
Sagar Vora
500f54e515
test: fix shift type not found (#24929) 2021-03-17 23:25:04 +05:30
Sagar Vora
52bbd4e182
test: clear Leave Period before running Leave Allocation tests (#24928) 2021-03-17 22:37:59 +05:30
Sagar Vora
bce904cf97
test: fix Employee Not Found errors (#24906) 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 (#24795) 2021-03-09 21:03:45 +05:30
Jannat Patel
d7ac2394e8
fix: error in bulk attendance (#24806) 
* 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 #24745 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 #24751 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 (#24782) 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
Daniel Chalmers
9803835436
Add "description" field to Skill doctype 
Lets us describe a skill past just the title. Closes #23592
 2021-02-26 00:33:48 -06:00
Ankush Menat
027db0b41e
fix(HR): hide "more" button from team updates 2021-02-25 21:29:00 +05:30
Ankush Menat
dca307e7cc
feat: track changes to HR settings (#24739) 
related issue: FR-ISS-259927
 2021-02-25 19:05:07 +05:30
Daniel Chalmers
d3e122259d
Update skill.json 2021-02-24 17:13:48 -06:00
Daniel Chalmers
c04ed62863
Allow renaming skills 2021-02-23 22:02:09 -06:00
Deepesh Garg
e12398e75e
Merge pull request #24682 from frappe/michellealva-leave 
fix: typo in Leave Balance Report
 2021-02-20 17:53:04 +05:30
Michelle Alva
43f126ed13
fix: Typo in Leave Application 
Change "Leaves" to "Leave"
 2021-02-20 10:46:22 +05:30
Michelle Alva
ab149f196e
fix: typo in Leave Balance Report 
Change Leaves to Leave
 2021-02-20 10:43:47 +05:30
Kanchan Chauhan
bb05acb60d
fix(Leave Application): List view fix (#24550) 2021-02-11 11:18:59 +05:30
Afshan
8609d31430
fix: amend cancelled job offer (#24589) 2021-02-11 11:05:48 +05:30
Anurag Mishra
5164223b99
fix: error on group by filter (#24587) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-02-09 16:22:28 +05:30
Nabin Hait
c4a1bb0e1c
fix: couple of travis fixes (#24554) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-02-05 23:34:18 +05:30
Suraj Shetty
f57efd1150 style: Fix invalid translation syntax usages 2021-02-01 20:09:20 +05:30
prssanna
a3585e40f7 style: fix formatting 2021-02-01 19:50:27 +05:30
prssanna
2aebf99968 fix: add removed get_employee_emails function 2021-01-29 15:55:21 +05:30
Suraj Shetty
0a8939e1c1 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-29 08:56:22 +05:30
Anurag Mishra
5756bf50e6
fix: removed all day event from shift assignment calendar (#24397) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-01-28 12:24:39 +05:30
Abhishek Balam
ea30e0a37d fix: change modified date 2021-01-21 19:38:37 +05:30
Abhishek Balam
ae3a9c1ead fix: remove payroll card from HR workspace 2021-01-21 19:33:19 +05:30
Suraj Shetty
bed55bb7ba fix: Use multisql to support postgres 2021-01-21 18:36:50 +05:30
Suraj Shetty
0c0155e885 fix: Make birthday messages translatable 2021-01-21 14:59:19 +05:30
Suraj Shetty
164fe37fa0 fix: Employee birthday reminder 2021-01-21 14:32:35 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
Deepesh Garg
cbed6f970a Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2021-01-15 15:43:59 +05:30
Suraj Shetty
cde1566606 fix: Typo 2021-01-15 15:28:50 +05:30
Suraj Shetty
f75d1bb043 fix: Typo 2021-01-15 14:53:51 +05:30
Suraj Shetty
3d00e25232 refactor: Employee birthday reminder 2021-01-15 14:48:28 +05:30
Kanchan Chauhan
d2c71350cd
refactor(Job Application): New fields in Job Applicant and webform (#23326) 
* refactor(Job Application): New fields in Job Applicant and webform

* fix: translation syntax

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-01-15 13:56:03 +05:30
Marica
cb079cd8c4
Merge branch 'develop' into naming-series-proj 2021-01-12 19:57:55 +05:30
Nabin Hait
f7b9b0687e
fix: tax calculation on salary slip for the first month (#24272) 
* fix: tax calculation on salary slip for the first month

* fix: net pay precision issue

* fix: net pay precision issue

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2021-01-05 20:43:11 +05:30