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

73 Commits

Author SHA1 Message Date
Nabin Hait
b8d633cb4a
fix: Desk links for Income Tax Slab and Employee Other Income (#21510) 2020-04-30 11:03:49 +05:30
Anurag Mishra
1f6cc2b6ec
feat: appointment Letter (#20104) 
* feat: appointment Letter

* fix: requested changes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-03 17:52:42 +05:30
Sahil Khan
5f2c030ddc Merge branch 'version-12-hotfix' into merge_v12_hotfix_1 2019-08-20 16:22:49 +05:30
Mangesh-Khairnar
dab5b1f319 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-08-13 13:33:26 +05:30
Michelle Alva
af969d664f Added Employee Tax Exxxemption category and sub-category links (#18659) 2019-08-12 12:59:59 +05:30
Michelle Alva
e666b882e7 fix: added payroll period in HR module (#18500) 2019-07-27 10:03:18 +05:30
Mangesh-Khairnar
5ca3e83a00 feat: add ledger link in hr config 2019-07-25 14:35:39 +05:30
Suraj Shetty
e0d8cf1851 fix: Add Employee Skill Map to HR module page 2019-07-18 15:58:50 +05:30
Michelle Alva
6abb63b445 refactor: Refactor module links of Accounting, HR, Project (#18160) 2019-07-15 14:00:00 +05:30
Himanshu Warekar
2373c095ed Merge develop into sla_fix 2019-06-25 16:27:06 +05:30
karthikeyan5
32197355ad rename(HR): Employee Attendance Log DocType to Employee Checkin 2019-06-24 15:15:38 +05:30
karthikeyan5
ceea328542 fix(HR): validations and bug fixes for Attendance Log 2019-06-24 15:15:38 +05:30
Himanshu Warekar
00a494f07b fix: change sla on priority 2019-05-03 12:44:35 +05:30
Nabin Hait
9d431a8a83 fix: Added link for Expense Claim in HR module page 2019-04-01 21:06:12 +05:30
Nabin Hait
948cc631c6 fix: Added link for loan in HR module page 2019-04-01 20:58:20 +05:30
Prateeksha Singh
9d4a183074 fix(modules): Merge Settings into one, Setup --> Settings 2019-02-11 15:14:50 +05:30
Prateeksha Singh
3423407314 feat(module_links): rearrange links 2019-02-07 09:58:22 +05:30
Prateeksha Singh
063af4ed08 config(modules): Rearrange links 2019-02-07 09:58:22 +05:30
Prateeksha Singh
7cd6ebeb6d feat(explore_page): rearrange links 2019-02-07 09:57:10 +05:30
Rushabh Mehta
20fd2ddd1c ux(hr): module listing and quick entry for employee 2018-08-30 09:21:54 +05:30
Saurabh
d7897f1c53 Resolved merge conflicts 2018-07-18 17:08:16 +05:30
Shreya Shah
8dc4c945dc Fix UX (#14862) 2018-07-11 14:36:49 +05:30
Vishal Dhayagude
0e027a14a7 [minor] Link to Employee Separation template and Onbording template added in HR Module Page (#14748) 
* [minor] Link to Employee Separation template and Onbording template added in HR Module Page

* [minor] Employee templated added in Employee Life Cycle Section
 2018-07-03 10:20:02 +05:30
Suraj Shetty
27067b34e1 Rename (#14771) 
- Daily Work Summary Settings to Daily Work Summary Group
in hr.py
 2018-07-03 10:08:45 +05:30
Jamsheer
398f15754d Rename - Additional Salary Component to Additional Salary (#14302) 
* Rename Doctype Additional Salary Component to Additional Salary

* Remove unused import
 2018-06-04 11:02:53 +05:30
Solufyin
64d02f917a [ADD] Department Analytics Bar Chart Feature (#14217) 2018-05-26 09:26:03 +05:30
Manas Solanki
5b34c00ba6 Added the travel request on the config page 2018-05-16 18:09:43 +05:30
Ranjith
819c3b1bf6 Retention Bonus - menu, validate 2018-05-15 19:17:31 +05:30
Rohit Waghchaure
e2a7f86636 Navigation added for Employee Separation, Onboarding 2018-05-15 16:04:39 +05:30
Zlash65
44146e0cda remove duplicates 2018-05-15 15:21:49 +05:30
rohitwaghchaure
3f0c735e53
Merge branch 'enterprise_sprint' into tax_exemption 2018-05-14 20:47:35 +05:30
Jamsheer
08b60a1a62 New Doctype - Additional Salary Component 2018-05-14 12:16:46 +05:30
Ranjith
85d2d571c5 update hr menu, field subcategory in child table 2018-05-10 15:04:32 +05:30
Nabin Hait
330fae8652 minor fixes 2018-05-07 16:11:35 +05:30
Nabin Hait
e9ad03e23e Documents order in hr page 2018-05-02 14:31:27 +05:30
Nabin Hait
501a64becd Added links in HR module 2018-05-02 14:31:03 +05:30
Pawan Mehta
2215d4c593 Shift Management (#13667) 
* [fix] #13634

* review_changes

* rename function

* rename function
 2018-04-26 12:16:18 +05:30
Nabin Hait
551844881b Removed employee table from Salary Structure and added employee name in all forms 2018-04-26 12:14:01 +05:30
Nabin Hait
fcdca7f2a0 Documents order in hr page 2018-04-26 12:13:46 +05:30
Nabin Hait
f914bd374d Added links in HR module 2018-04-26 12:13:24 +05:30
Shreya Shah
4dc453d131 Loan Management for the Members (Non Profit Module) (#13149) 
* Renamed - Employee Loan Application to Loan Application, Employee Loan to Loan and field Employee Loan Account to Loan Account

* Patch added

* Dynamic link fields 'applicant' and 'applicant_type'

* Member link visible only if domain non profit is active

* Modified loan_dashboard

* Make Repayment Entry button

* Common file loan_common.js for loan and loan_application

* repayment schedule rows selection in dialog

* validation if repayment amount > total paid amount

* repayment only if disbursement is done, make repayment by selecting the installment which falls in the current month

* fetch nowdate if disbursement date not found

* Rebased with develop

* updated non-profit module page

* updated patch for renamed fields

* dialog to select repayment entries

* hidden field to store reschedule paid status

* update paid check in loan on journal entry updation

* calculate total paid

* updated docs

* codacy fix
 2018-04-24 12:19:36 +05:30
Doridel Cahanap
c893268dea Add Health Insurance Doctype and link to Employee (#13257) 2018-03-20 12:37:02 +05:30
Suraj Shetty
d3069fee4d Daily work summary refactor (#12944) 
* added daily work summary setting doctype and code to support feature

this will allow multiple setting for daily work summary

* added daily work summary setting user doctype

* made changes in daily work summary code

* [minor] entry change in hr config file

* deleted previous daily work summary settings (and its company) doctype

* removed unwanted permission check

* toggled read_only option for enabled field

* removed print statements

* add patch for the changes

* doc changes

* [minor] indentation fix

* fixed tests

* indentation fixes

* codacy issue fix

* formatting fixes

* renamed doctype

Renamed Daily Work Summary Setting to  Daily Work Summary Group and did related code and doc changes

* fixed typo

* updated doc

* codacy issue fix

* [minor] renamed doctype name in json

* Renamed old doctype

* fixed indentation

* codacy fix

* indentation fix

* renamed doctype

* handled patch exception

* fixed exception

* Update daily_work_summary_group.py

* rename patch file

removed abbreviation in file name

* handled exception in patch code

* removed Unnecessary pass statement

* [minor] indentation fix
 2018-02-21 15:15:43 +05:30
Shreya Shah
278af1befb remove deprecated processing payroll video links (#12947) 2018-02-16 12:58:04 +05:30
Shreya Shah
394b7a2fa3 Rename Offer Letter to Job Offer (#12934) 2018-02-16 10:49:34 +05:30
Nabin Hait
d0249b0880
Employee advance (#11875) 
* Employee Advances against Expense Claim

* added employee advance test cases and docs

* Default Employee Advance Account field in company

* Cleanup and fixes of employee advance
 2017-12-14 13:25:57 +05:30
Shreya Shah
88dbc26a98 replace process payroll (#11873) 2017-12-07 18:24:42 +05:30
Doridel Cahanap
5a4d5bfaf2 Add Training Program DocType, Script, Path and Doc (#11181) 
* Add Training Program Doctype, Script, Config and documentation

* Add Training Program to Training Event

* [Test Case] Training Event in a Training Program
 2017-10-20 11:31:15 +05:30
Kanchan Chauhan
639eebdae5 [Minor] Employee Loan Management moved up in HR Page 2017-02-28 18:01:07 +05:30
Rushabh Mehta
7ec4b717ed [feature] added team updates page 2017-01-31 11:42:58 +05:30