- ce88bdf Employee Benefit Claim - Validation Updated - Code refactor by Jamsheer · 7 years ago
- d5cb4c1 Set parent department if missing and not root itself by Nabin Hait · 7 years ago
- c141eb0 [Enhance] Department added wherever applicable (#14121) by Zarrar · 7 years ago
- e03937f Send daily work summary alert to only enabled users (#14175) by Suraj Shetty · 7 years ago
- 26eb513 Rename occurences of max_days_allowed to max_continuous allowed (#14180) by Faris Ansari · 7 years ago
- 1cc7500 Merge branch 'master' into develop by Ameya Shenoy · 7 years ago
- 8e12a59 [Fix] Patch by Rohit Waghchaure · 7 years ago
- 35984da relieving_date wasnt of type datetime by Ameya Shenoy · 7 years ago
- 11e2a9a [Fix] Permission issue while saving leave application by Rohit Waghchaure · 7 years ago
- 1275ea5 Merge pull request #14154 from rohitwaghchaure/set_default_leave_approver by rohitwaghchaure · 7 years ago
- 4c79048 job opening designation made mandatory (#14153) by Shridhar Patil · 7 years ago
- 812224e Set leave approver in the leave application by Rohit Waghchaure · 7 years ago
- 1f3f185 [Fix] Leave Application & Expense Claim query fix | Leave Balance Report fix (#14149) by Zarrar · 7 years ago
- d976c04 Merge pull request #14134 from manassolanki/fix-salary-patch by Manas Solanki · 7 years ago
- 33c1a38 [fix] patch for the salary structure assignment for old employees by Manas Solanki · 7 years ago
- 65dd1f6 Mark attendance only if to_date <= nowdate in Leave Application by Shreya · 7 years ago
- 8c6b755 Merge branch 'develop' into jam_enterprise_emp_benefit by rohitwaghchaure · 7 years ago
- 4444430 Merge pull request #14108 from ESS-LLP/tax_deduction by rohitwaghchaure · 7 years ago
- 58363e6 get_payroll_period return name, fix hard coded leave period by Ranjith · 7 years ago
- e3f7e8b typo in frappe.throw in employee_transfer by Zlash65 · 7 years ago
- 31eeff0 merge frappe/develop by Ranjith · 7 years ago
- b485b1e Salary Slip calc tax, except for flexi benefits by Ranjith · 7 years ago
- c6b2575 fields in salary detail, copy data from salary component on change by Ranjith · 7 years ago
- 8e4f676 [Fix] onload set default employee, leave approver, company by Rohit Waghchaure · 7 years ago
- 8b86d18 Remove unused imports by Jamsheer · 7 years ago
- 3434aab Employee Benefit Claim in Salary Slip by Jamsheer · 7 years ago
- 3abae9c Employee Benefit Application - whitlist method get_max_benefits by Jamsheer · 7 years ago
- 3e64297 Employee Benefit Application - validate maximun benefit by Jamsheer · 7 years ago
- 3cd0ad4 Codacy fixes by Jamsheer · 7 years ago
- c9287b5 Manage grouping of salary component for flexible benefit by Jamsheer · 7 years ago
- 6410022 minor fixes by Jamsheer · 7 years ago
- c678d037 Salary slip - throw if no default flexi component by Jamsheer · 7 years ago
- 5f6e274 Salary slip - default flexi component by Jamsheer · 7 years ago
- 43740a6 Employee Benefit Application - employee benefit in salary slip by Jamsheer · 7 years ago
- 0bc665c Salary Copmonent - Default flexible componnent by Jamsheer · 7 years ago
- 15613e4 Salary Copmonent - Defualt flexible componnent by Jamsheer · 7 years ago
- d63c39a Payroll Period - get payroll period days by Jamsheer · 7 years ago
- d66fb84 Employee Benefit Application - validate max benefit for employee by Jamsheer · 7 years ago
- 2d6901d Employee Benefit Application - validate max benefit amount for component by Jamsheer · 7 years ago
- 9cb2fc2 Employee Benefit Application - calcluate benefit amount by Jamsheer · 7 years ago
- d48998b Employee Benefit Application - Calculate benefit amounts by Jamsheer · 7 years ago
- 779f8eb Employee Benefit Application - get max benefit by Jamsheer · 7 years ago
- 41616de Employee Benefit Application - validate duplicate by Jamsheer · 7 years ago
- 9cd292b Employee Benefit Application - filter updated by Jamsheer · 7 years ago
- 4d93d33 Employee benefit - filters fro earning component by Jamsheer · 7 years ago
- 29e0ed3 Exemption Declaration - field total_amount by Ranjith · 7 years ago
- 5b34c00 Added the travel request on the config page by Manas Solanki · 7 years ago
- fda1570 Fix error by Shreya · 7 years ago
- 4534df3 Merge pull request #14078 from manassolanki/pos-fix by Manas Solanki · 7 years ago
- 4256a34 [enterprise] minor fixes by Manas Solanki · 7 years ago
- 9b53b93 Merge pull request #14077 from manassolanki/travel-request by Manas Solanki · 7 years ago
- 6eb7f34 [rename] Photo ID -> Identification Document by Manas Solanki · 7 years ago
- 9ad0ac9 Merge pull request #14068 from manassolanki/travel-request by rohitwaghchaure · 7 years ago
- fbb6b3d Undo replace of frappe.db.sql with frappe.get_list (#14074) by Suraj Shetty · 7 years ago
- cdd4704 Fixes, fields in Salary Component (#14071) by Ranjith Kurungadam · 7 years ago
- e07b332 fix for tests by Rushabh Mehta · 7 years ago
- 0b62838 [minor] remove in_dialog old property by Rushabh Mehta · 7 years ago
- db120fb Salary Component - fields is_tax_applicable, is_payable by Ranjith · 7 years ago
- 447f0e4 remove duplicate fields by Ranjith · 7 years ago
- b56f3d0 [fix] syntax errors by Rushabh Mehta · 7 years ago
- 2a1bcf2 [minor] Fix typo by Shreya · 7 years ago
- d11b5d3 [feature] added travel request doctype in HR by Manas Solanki · 7 years ago
- 8501010 Replace frappe.db.sql to frappe.get_list to apply permissions (#14037) by Suraj Shetty · 7 years ago
- 11f3e81 Import nowdate (#14064) by Shreya Shah · 7 years ago
- d3e84a6 [Fix] Issue, local variable 'leaves_encashed' referenced before assignment by Rohit Waghchaure · 7 years ago
- 4671c53 Merge pull request #14056 from ESS-LLP/retention_bonus by rohitwaghchaure · 7 years ago
- 41b4570 Merge branch 'develop' into enterprise_fix by rohitwaghchaure · 7 years ago
- d43e068 fix Leave Encashment unlink additional component, readonly encashed days by Ranjith · 7 years ago
- c60c698 Merge remote-tracking branch 'frappe/develop' into encash by Ranjith · 7 years ago
- 3beeb72 Compensatory Leave Request - add link to leave allocation by Jamsheer · 7 years ago
- ebb68af Leave Allocation - remove link to compensatory leave request by Jamsheer · 7 years ago
- a46ce11 Additional Salary Component - naming and date fix by Jamsheer · 7 years ago
- 819c3b1 Retention Bonus - menu, validate by Ranjith · 7 years ago
- 7d394c1 Email Alert for Retention Bonus by Ranjith · 7 years ago
- 70899f5 Update utils.py by Manas Solanki · 7 years ago
- bb629de doctype retention bonus by anoop · 7 years ago
- b8bd664 remove unused module import and error classes by Zlash65 · 7 years ago
- 504855e on submit: create additional salary component, revert on cancel by anoop · 7 years ago
- 4c721cb Leave Encashment - submit, cancel Additional Salary Component by Ranjith · 7 years ago
- e0b5150 [Fix] Employee mandatory validation issue by Rohit Waghchaure · 7 years ago
- 66ece67 Merge pull request #14044 from shreyashah115/fix-promotion-doc by rohitwaghchaure · 7 years ago
- 14069c9 Fix updation of new values by Shreya · 7 years ago
- 183dc73 Update employee_onboarding.py by Manas Solanki · 7 years ago
- 99e72af skip abbr, reload doc, disable edit for root department node' by Zlash65 · 7 years ago
- 62a5930 [fix] resolved merge conflicts by Saurabh · 7 years ago
- 4a12694 Code cleaup by Rohit Waghchaure · 7 years ago
- 6119b73 updated get_leave_balance_on to consider encashed leaves by default. by anoop · 7 years ago
- 1e1b7fc 13615 - Leave Encashment, creating Additional Salary Component on submit and validations pending by anoop · 7 years ago
- 0780fd1 helper method to get employees assigned salary structure by anoop · 7 years ago
- 161b3b2 added field Total Leaves Encashed by anoop · 7 years ago
- 067b557 duplicate field is_encash removed, fixed in install fixtures by anoop · 7 years ago
- 3f02820 [Fix] Global name 'Approved' is not defined by Rohit Waghchaure · 7 years ago
- dbb67fb Clear leave balance on changing leave type by Shreya · 7 years ago
- 9ba72f7 [Fix] get_approved_leaves_for_period module import failed by Rohit Waghchaure · 7 years ago
- 2ca83d6 Resolve merge conflicts from enterprise_sprint branch by Saurabh · 7 years ago
- 1f1dd96 Merge branch 'enterprise_sprint' into jam_enterprise_sprint by Saurabh · 7 years ago
- 3f0c735 Merge branch 'enterprise_sprint' into tax_exemption by rohitwaghchaure · 7 years ago
- 2d8a7ee Bootstrap 'TDS' via fixture by Saurabh · 7 years ago
- 8137f04 Merge pull request #13984 from manassolanki/employee-boarding by rohitwaghchaure · 7 years ago
- 094e184 minor changes and fixed the conflicts by Manas Solanki · 7 years ago