- eb579a1 Fix demo (#14365) by Saurabh · 6 years ago
- cff1479 Salary Structure, Slip - make fields readonly (#14358) by Ranjith Kurungadam · 6 years ago
- 873e28d Merge branch 'master' into develop by Ameya Shenoy · 6 years ago
- 2f273e7 minor fixes by Nabin Hait · 6 years ago
- e0a2ea6 Merge branch 'develop' of https://github.com/mnaim-cloude8/erpnext into mnaim-cloude8-develop by Nabin Hait · 6 years ago
- 630721a Travis (#14354) by Shreya Shah · 6 years ago
- d580c92 Staffing Plan (#14346) by Ranjith Kurungadam · 6 years ago
- c4eec99 minor fix by Nabin Hait · 6 years ago
- f576c57 Salary Slip - fix when no pyroll period found for tax calc (#14335) by Ranjith Kurungadam · 6 years ago
- 8c7af49 Fixed merge conflict by Nabin Hait · 6 years ago
- ed4e49c Salary Slip - Deduct Tax (#14255) by Ranjith Kurungadam · 6 years ago
- a55090d Fixed merge conflict by Nabin Hait · 6 years ago
- 398f157 Rename - Additional Salary Component to Additional Salary (#14302) by Jamsheer · 6 years ago
- 953ea93 Update leave_type.json by Nabin Hait · 6 years ago
- 375db61 Earned Leave (#14143) by Ranjith Kurungadam · 6 years ago
- 2fa057e [Fix] Expense claim showing status as Unpaid even if Total Advance Amount and Total Sanctioned Amount is same (#14311) by rohitwaghchaure · 6 years ago
- 590bf4c codacy fixes by Ranjith · 6 years ago
- 0cb2684 Tax Exemption Proof Submission - validations, eligible hra calc by Ranjith · 6 years ago
- 793f8e8 Tax Exemption Declaration - update fields, move generic methods to utils by Ranjith · 6 years ago
- 806cd93 Merge remote-tracking branch 'frappe/develop' into dev_hra by Ranjith · 6 years ago
- 155ecc1 Tax Exemption Declaration - HRA Calculation by Ranjith · 6 years ago
- 348a6a8 patch fixes by Nabin Hait · 6 years ago
- 13d4391 Fixed SQL syntax error in Get Loan Details (#14265) by Vladyslav Baidak · 6 years ago
- 7bb621d Tax Exemption Declaration, Proof Submission HRA fields by Ranjith · 6 years ago
- 3aa205f Fixes related to department tree by Nabin Hait · 6 years ago
- 81302a8 [Fix] Leave application, leave approver not fetching by Rohit Waghchaure · 6 years ago
- 64d02f9 [ADD] Department Analytics Bar Chart Feature (#14217) by Solufyin · 6 years ago
- 084b0b3 Treeview permission (#14232) by Suraj Shetty · 6 years ago
- aadfaa4 Minor fixes (#14231) by Suraj Shetty · 6 years ago
- 33df0b4 Test case fixes (#14219) by Nabin Hait · 6 years ago
- e6eef30 Remove unused imports by Jamsheer · 6 years ago
- 9416ac4 Leave Priod - fix - grant leave allocation filter by grade by Jamsheer · 6 years ago
- 730cb3b Update employee.py by Manas Solanki · 6 years ago
- fca88a6 Employee benefits - get_assigned_salary_structure by Jamsheer · 6 years ago
- 79a6b42 Salary Slip - options to fetch from migration by Jamsheer · 6 years ago
- ce89199 taxable salary slabs remove from Salary Component and add to Payroll Period by Jamsheer · 6 years ago
- f1d10bf Salary Component - remove flexi_default by Jamsheer · 6 years ago
- 620c3a8 Employee Benefit Claim - non pro-rata claim validation updated by Jamsheer · 6 years ago
- dc698a8 options to fetch from migration by Jamsheer · 6 years ago
- 8eec40c Employee Benefits in Salary Slip - Application and Claim by Jamsheer · 6 years ago
- 16e9243 get payroll period days - fix by Jamsheer · 6 years ago
- 47d865b Calculate remaining benefit amount in Employee Benefit Application by Jamsheer · 6 years ago
- 8a953ba Validate remaining benefit amount in Employee Benefit Application by Jamsheer · 6 years ago
- 772f257 Employee Benefit Claim - date default to Today by Jamsheer · 6 years ago
- eacaad3 Max benefit amount in Employee Benefit Application Detail by Jamsheer · 6 years ago
- c1ae88b Employee Benefit Calim - earning component filter updated by Jamsheer · 6 years ago
- c5629ef Employee Benefit Application - refactor validation by Jamsheer · 6 years ago
- 9d5d328 Salary Structure - validate flexi with max benefit by Jamsheer · 6 years ago
- 65a5e47 Payroll Period - validate dates and overlap by Jamsheer · 6 years ago
- cf414cc Payroll Period - fields refactor by Jamsheer · 6 years ago
- 2ee211a Salary Structure - validate max benefits with flexi by Jamsheer · 6 years ago
- ce73102 Salary Structure - filter for earnings by Jamsheer · 6 years ago
- 43e1912 Employee Benefit Application - earning component filter by salary structure flexi component by Jamsheer · 6 years ago
- 77a91f0 Salary Component - account mandatory for separate payment entry by Jamsheer · 6 years ago
- 1248f6a Codacy fix by Jamsheer · 6 years ago
- 0493c22 Additional Salary Component - filter updated - salary_component by Jamsheer · 6 years ago
- f647aa1 Salary Component - fields - refactor fields behaviour by Jamsheer · 6 years ago
- 334bd18 Employee Benefit Application - filter updated - earning component by Jamsheer · 6 years ago
- da24722 Employee Benefit Claim - filter for earning component by Jamsheer · 6 years ago
- ce88bdf Employee Benefit Claim - Validation Updated - Code refactor by Jamsheer · 6 years ago
- d5cb4c1 Set parent department if missing and not root itself by Nabin Hait · 6 years ago
- c141eb0 [Enhance] Department added wherever applicable (#14121) by Zarrar · 6 years ago
- e03937f Send daily work summary alert to only enabled users (#14175) by Suraj Shetty · 6 years ago
- 26eb513 Rename occurences of max_days_allowed to max_continuous allowed (#14180) by Faris Ansari · 6 years ago
- 1cc7500 Merge branch 'master' into develop by Ameya Shenoy · 6 years ago
- 8e12a59 [Fix] Patch by Rohit Waghchaure · 6 years ago
- 35984da relieving_date wasnt of type datetime by Ameya Shenoy · 6 years ago
- 11e2a9a [Fix] Permission issue while saving leave application by Rohit Waghchaure · 6 years ago
- 1275ea5 Merge pull request #14154 from rohitwaghchaure/set_default_leave_approver by rohitwaghchaure · 6 years ago
- 4c79048 job opening designation made mandatory (#14153) by Shridhar Patil · 6 years ago
- 812224e Set leave approver in the leave application by Rohit Waghchaure · 6 years ago
- 1f3f185 [Fix] Leave Application & Expense Claim query fix | Leave Balance Report fix (#14149) by Zarrar · 6 years ago
- d976c04 Merge pull request #14134 from manassolanki/fix-salary-patch by Manas Solanki · 6 years ago
- 33c1a38 [fix] patch for the salary structure assignment for old employees by Manas Solanki · 6 years ago
- 65dd1f6 Mark attendance only if to_date <= nowdate in Leave Application by Shreya · 6 years ago
- 8c6b755 Merge branch 'develop' into jam_enterprise_emp_benefit by rohitwaghchaure · 6 years ago
- 4444430 Merge pull request #14108 from ESS-LLP/tax_deduction by rohitwaghchaure · 6 years ago
- 58363e6 get_payroll_period return name, fix hard coded leave period by Ranjith · 6 years ago
- e3f7e8b typo in frappe.throw in employee_transfer by Zlash65 · 6 years ago
- 31eeff0 merge frappe/develop by Ranjith · 6 years ago
- b485b1e Salary Slip calc tax, except for flexi benefits by Ranjith · 6 years ago
- c6b2575 fields in salary detail, copy data from salary component on change by Ranjith · 6 years ago
- 8e4f676 [Fix] onload set default employee, leave approver, company by Rohit Waghchaure · 6 years ago
- 8b86d18 Remove unused imports by Jamsheer · 6 years ago
- 3434aab Employee Benefit Claim in Salary Slip by Jamsheer · 6 years ago
- 3abae9c Employee Benefit Application - whitlist method get_max_benefits by Jamsheer · 6 years ago
- 3e64297 Employee Benefit Application - validate maximun benefit by Jamsheer · 6 years ago
- 3cd0ad4 Codacy fixes by Jamsheer · 6 years ago
- c9287b5 Manage grouping of salary component for flexible benefit by Jamsheer · 6 years ago
- 6410022 minor fixes by Jamsheer · 6 years ago
- c678d037 Salary slip - throw if no default flexi component by Jamsheer · 6 years ago
- 5f6e274 Salary slip - default flexi component by Jamsheer · 6 years ago
- 43740a6 Employee Benefit Application - employee benefit in salary slip by Jamsheer · 6 years ago
- 0bc665c Salary Copmonent - Default flexible componnent by Jamsheer · 6 years ago
- 15613e4 Salary Copmonent - Defualt flexible componnent by Jamsheer · 6 years ago
- d63c39a Payroll Period - get payroll period days by Jamsheer · 6 years ago
- d66fb84 Employee Benefit Application - validate max benefit for employee by Jamsheer · 6 years ago
- 2d6901d Employee Benefit Application - validate max benefit amount for component by Jamsheer · 6 years ago
- 9cb2fc2 Employee Benefit Application - calcluate benefit amount by Jamsheer · 6 years ago
- d48998b Employee Benefit Application - Calculate benefit amounts by Jamsheer · 6 years ago