Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,113 Commits 3 Branches 0 Tags 1 GiB
28dd90f3dc
Commit Graph

2103 Commits

Author SHA1 Message Date
Michelle Alva
b39c17dd55
fix: Typo/Grammatical fixes in Settings (#23612) 
* fix(Stock Settings): Type/Grammatical fixes in Settings

* fix: grammatical fixes in manufacturing settings

* fix: typo fix in accounting settings

* fix: typo fixes in HR settings

* fix: typo fixes in buying settings

* fix: typo fixes in Selling Settings

* Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Apply suggestions from code review

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Apply suggestions from code review

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Update accounts_settings.json

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rushabh Mehta <rmehta@gmail.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-10-23 18:22:26 +05:30
Marica
9d94f785e9
fix: Hide Ex-Employees from Employee Tree and minor message UX (#23711) 
* fix: Hide Ex-Employees from Employee Tree and minor message UX

* fix: translation syntax
 2020-10-23 18:15:55 +05:30
Saqib
2f71927af8
fix: fuel expense amount of vehicle log (#23632) 
* fix: fuel expense amount of vehicle log

* fix: undefined var employee_id in test

* fix: test
 2020-10-16 12:32:59 +05:30
marination
5b790a0095 fix: Convert dates to datetime.date before comparing in Holiday List 2020-10-13 02:37:55 +05:30
rohitwaghchaure
a060f8c00b
Merge pull request #23524 from michellealva/employee_exit 
fix(Employee): Field level change in Exit section
 2020-10-12 16:23:54 +05:30
Abhishek Balam
ebf53a7f25
fix(HR): Appraisal form Enhancements (#23500) 
* fix: remove total score button

* Removing conflicts
 2020-10-07 19:59:26 +05:30
michellealva
203585f292 fix(Employee): Field level change in Exit section 2020-10-06 16:00:39 +05:30
Sun Howwrongbum
72a596971c
fix: also update employee field when renamed (#23482) 2020-10-05 20:48:53 +05:30
Abhishek Balam
4e6733293f
fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) 
* fix: reset owner values in doctype to Administrator

* fix: updated modified value

* fix: also fixed modified by

* fix: change modified_by to Administrator
 2020-09-18 18:27:24 +05:30
rohitwaghchaure
900d0e3ae2
Merge pull request #23245 from Anurag810/attendance_calendar_map 
fix: Attendance calendar map fix
 2020-09-08 10:14:37 +05:30
rohitwaghchaure
842cb6d1d6
Update shift_assignment.py 2020-09-08 10:14:04 +05:30
Anupam Kumar
209f7c76c9
feat: added transaction_type in leave ledger enter (#23258) 2020-09-07 11:50:24 +05:30
Anurag Mishra
e5b7cb0c15 fix: data was not properly maped 2020-09-03 16:59:21 +05:30
bhavesh95863
d888a59bd1
fix: set company filter in condition 2020-08-26 12:44:20 +05:30
Nabin Hait
1ba62c9732
fix:Validate Job offer against vacancies (#23109) 2020-08-20 19:39:10 +05:30
Marica
2d767debf1
Merge branch 'develop' into shift_management 2020-08-18 13:27:15 +05:30
Deepesh Garg
38cabbd4b8
Merge pull request #23007 from prssanna/expense-claim-list-currency 
fix: add company in list fields to fetch for Expense Claim
 2020-08-17 23:07:51 +05:30
Marica
39c97bfbe9
Merge branch 'develop' into shift_management 2020-08-17 13:46:51 +05:30
Afshan
084de5f0b2
fix: handled condition if staffing isn't created (#22992) 
* fix: handled condition if staffing isn't created

* style: reformated code for redability

* Update erpnext/hr/doctype/job_offer/job_offer.py

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-17 13:14:09 +05:30
Suraj Shetty
cab5918244
Merge branch 'develop' into HR-fix 2020-08-14 16:12:28 +05:30
Anurag Mishra
759632c025 fix: requested Changes 2020-08-14 12:26:04 +05:30
Anurag Mishra
c2710e05ce fix: showing on_going shift on calendar 2020-08-13 14:17:47 +05:30
Anurag Mishra
74f0a1ab7c fix: changes Requested 2020-08-13 14:17:47 +05:30
Anurag Mishra
00a8081aba Fix: button label 2020-08-13 14:17:47 +05:30
Anurag Mishra
dcf598dc2d Fix: requested Changes 2020-08-13 14:17:47 +05:30
Anurag Mishra
d5c921e358 Fix: Requested Changes 2020-08-13 14:17:47 +05:30
Anurag Mishra
b48110caf1 Update erpnext/hr/doctype/shift_assignment/shift_assignment.py 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-13 14:17:47 +05:30
Anurag Mishra
3aa1101d5e fix: requested changes 2020-08-13 14:17:47 +05:30
Anurag Mishra
17e6d0918b feat: Employee level Shift Request Approver 2020-08-13 14:17:47 +05:30
Anurag Mishra
43ba7dd4c8 feat: don't allow to request for default shift 2020-08-13 14:17:47 +05:30
Anurag Mishra
feef4a6c1e test: employee checkin 2020-08-13 14:17:47 +05:30
Anurag Mishra
b3e00de0ae refactor: Shift Request 2020-08-13 14:17:47 +05:30
Anurag Mishra
a6ec7e31d2 test: shift assignment 2020-08-13 14:17:47 +05:30
Anurag Mishra
dd46d19765 feat: map event calendar to show ongoing shift assignment and fixed period assigment 2020-08-13 14:17:47 +05:30
Anurag Mishra
afa98bb39b feat: Assign shift for period or create ongoing assignment 2020-08-13 14:17:47 +05:30
Anurag Mishra
ed6e9550ca
fix: removed payroll from HR. (#22991) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-11 18:04:42 +05:30
prssanna
5a7618d8ec fix: add company in list fields to fetch for Expense Claim 2020-08-11 16:50:31 +05:30
Anurag Mishra
95984fd921 fix: Not able to cancel application,allocation nad encashments 2020-08-10 12:36:00 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. (#22913) 
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-05 19:42:25 +05:30
Anurag Mishra
ba52dd8ba6
fix: minor payroll_dashboard fixes (#22832) 
* fix: minor payroll_dashboard fixes

* Update erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-03 08:57:49 +05:30
Anurag Mishra
2a4c90302b
fix: minor recritment analytics fixes (#22830) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-07-31 17:59:30 +05:30
Shivam Mishra
48be7d37b8
fix: add order_by explicitly for lead (#22820) 2020-07-28 09:00:09 +05:30
Nabin Hait
8712ac6d39
fix: Job offer is mandatory for employee onboarding (#22791) 2020-07-23 18:09:35 +05:30
Anurag Mishra
453325fbc9
fix: job applicant fixes (#22448) 
* fix(validation): not two job offer should be allowed for single job_applicant

* fix: don't allow to create employee_onboarding without job offer

* fix: server side validation

* fix: requested changes
 2020-07-23 12:22:42 +05:30
Anurag Mishra
9aa0602065
Fix: HR and Payroll Dashboard (#22771) 
* Fix: HR and Payroll Dashboard

* fix: requested changes
 2020-07-23 12:10:48 +05:30
Anurag Mishra
ce5b490f66
feat : Recruitment analytics (#21732) 
* feat: recruitment_anlytics

* fix: filters

* feat: added missing column designation

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-23 12:04:58 +05:30
michellealva
8c7d8ba917 fix: remove tab in code 2020-07-20 13:12:17 +05:30
michellealva
37cd1b8021 fix: Heatmap in Vehicle 2020-07-20 13:04:46 +05:30
Deepesh Garg
f6c70bca0a
Merge pull request #22615 from aerele/fix_mandatory_error 
fix: log type mandatory error while exposing api call to employee checkin.
 2020-07-17 17:38:21 +05:30
Karthikeyan S
ff6ba25386
fix: remove FE validation for log_type field 2020-07-16 13:33:38 +05:30