- 4671c53 Merge pull request #14056 from ESS-LLP/retention_bonus by rohitwaghchaure · 6 years ago
- 29517c1 Merge pull request #14057 from ESS-LLP/enterprise_fix by rohitwaghchaure · 6 years ago
- 41b4570 Merge branch 'develop' into enterprise_fix by rohitwaghchaure · 6 years ago
- 043aae7 Merge pull request #14058 from ESS-LLP/encashment by rohitwaghchaure · 6 years ago
- f9fa588 Merge pull request #14061 from rohitwaghchaure/budget_validation_enhance_in_mr_po by rohitwaghchaure · 6 years ago
- 4d4fb6d [Enhance] Budget validation on material request, purchase order by Rohit Waghchaure · 6 years ago
- d43e068 fix Leave Encashment unlink additional component, readonly encashed days by Ranjith · 6 years ago
- c60c698 Merge remote-tracking branch 'frappe/develop' into encash by Ranjith · 6 years ago
- 3beeb72 Compensatory Leave Request - add link to leave allocation by Jamsheer · 6 years ago
- ebb68af Leave Allocation - remove link to compensatory leave request by Jamsheer · 6 years ago
- a46ce11 Additional Salary Component - naming and date fix by Jamsheer · 6 years ago
- 819c3b1 Retention Bonus - menu, validate by Ranjith · 6 years ago
- 7d394c1 Email Alert for Retention Bonus by Ranjith · 6 years ago
- 120b393 Merge pull request #14055 from frappe/manassolanki-patch-6 by Manas Solanki · 6 years ago
- 70899f5 Update utils.py by Manas Solanki · 6 years ago
- bb629de doctype retention bonus by anoop · 6 years ago
- 02f0bcd Merge pull request #14053 from Zlash65/fix-dept by rohitwaghchaure · 6 years ago
- b8bd664 remove unused module import and error classes by Zlash65 · 6 years ago
- 504855e on submit: create additional salary component, revert on cancel by anoop · 6 years ago
- 0e47837 Merge pull request #14051 from shreyashah115/min-fix by rohitwaghchaure · 6 years ago
- c3b9eab Merge pull request #14048 from shreyashah115/exchange-rate by rohitwaghchaure · 6 years ago
- acc4cec Add Patch to update existing records by Shreya · 6 years ago
- da5163d Fix Supplier Doctype by Shreya · 6 years ago
- ec54cb1 Merge pull request #14050 from Zlash65/fix-dept by rohitwaghchaure · 6 years ago
- 36cb8fb removed hard coded account_type from tree's add_child entry by Zlash65 · 6 years ago
- 3f77852 Pass buying or selling as filter parameters by Shreya · 6 years ago
- b547cdd Add buying or selling to filters in get_exchange_rate by Shreya · 6 years ago
- 4c721cb Leave Encashment - submit, cancel Additional Salary Component by Ranjith · 6 years ago
- c0b15cf Merge pull request #14041 from manassolanki/deferred-account by rohitwaghchaure · 6 years ago
- 9a0aea8 Merge pull request #14046 from shreyashah115/min-fix by rohitwaghchaure · 6 years ago
- 9cf250c Merge pull request #14047 from rohitwaghchaure/enterprise_s_minor_changes by rohitwaghchaure · 6 years ago
- e0b5150 [Fix] Employee mandatory validation issue by Rohit Waghchaure · 6 years ago
- 8e38616 Set Mandatory from client-side by Shreya · 6 years ago
- e2a7f86 Navigation added for Employee Separation, Onboarding by Rohit Waghchaure · 6 years ago
- f636503 [minor] Fix customer doctype by Shreya · 6 years ago
- 6bcf48a Merge pull request #14043 from Zlash65/fix-dept by rohitwaghchaure · 6 years ago
- 66ece67 Merge pull request #14044 from shreyashah115/fix-promotion-doc by rohitwaghchaure · 6 years ago
- 2f4e5ee Update hooks.py by Manas Solanki · 6 years ago
- 44146e0 remove duplicates by Zlash65 · 6 years ago
- 1879f08 Merge branch 'develop' into deferred-account by Manas Solanki · 6 years ago
- 14069c9 Fix updation of new values by Shreya · 6 years ago
- ac26927 Merge branch 'master' into develop by Saurabh · 6 years ago
- 292f46f Merge branch 'hotfix' by Saurabh · 6 years ago
- 78a0be6 bumped to version 10.1.33 by Saurabh · 6 years ago
- ce4f520 Merge pull request #14042 from saurabh6790/patch_fix_15_05 by Saurabh · 6 years ago
- 2916044 [fix] if UOM and Warehouse link is invalid then set blank values by Saurabh · 6 years ago
- 183dc73 Update employee_onboarding.py by Manas Solanki · 6 years ago
- 6cf8a6c Merge pull request #14040 from Zlash65/fix-dept by rohitwaghchaure · 6 years ago
- 7f5ebbe call post company fixture after setting up company by Zlash65 · 6 years ago
- 667f846 bifurcate data into pre & post company fixtures by Zlash65 · 6 years ago
- 99e72af skip abbr, reload doc, disable edit for root department node' by Zlash65 · 6 years ago
- 0b7f649 booking via the schedular by Manas Solanki · 6 years ago
- 0393848 deferred account in the item and company master by Manas Solanki · 6 years ago
- 62a5930 [fix] resolved merge conflicts by Saurabh · 6 years ago
- 1b18bba Merge branch 'hotfix' by Saurabh · 6 years ago
- f8c26bb bumped to version 10.1.32 by Saurabh · 6 years ago
- 0db8506 Add For Buying and For Selling checkboxes in Currency Exchange by Shreya · 6 years ago
- 686d5f2 Merge pull request #14039 from rohitwaghchaure/code_clanup_hr by rohitwaghchaure · 6 years ago
- 4a12694 Code cleaup by Rohit Waghchaure · 6 years ago
- 6119b73 updated get_leave_balance_on to consider encashed leaves by default. by anoop · 6 years ago
- 1e1b7fc 13615 - Leave Encashment, creating Additional Salary Component on submit and validations pending by anoop · 6 years ago
- 0780fd1 helper method to get employees assigned salary structure by anoop · 6 years ago
- 161b3b2 added field Total Leaves Encashed by anoop · 6 years ago
- 067b557 duplicate field is_encash removed, fixed in install fixtures by anoop · 6 years ago
- ccd0617 Merge pull request #14017 from netchampfaris/apply-price-list-hotfix by Saurabh · 6 years ago
- bf10d0f Merge pull request #14031 from shreyashah115/leave-balance by Saurabh · 6 years ago
- 12f708d Merge pull request #14035 from saurabh6790/v11_patch_fix by Saurabh · 6 years ago
- ae41e5f Merge pull request #14036 from rohitwaghchaure/hcl_leave_application_issue by rohitwaghchaure · 6 years ago
- 3f02820 [Fix] Global name 'Approved' is not defined by Rohit Waghchaure · 6 years ago
- d217fba [fix] reload Leave Period and Staffing Plan doctypes by Saurabh · 6 years ago
- dbb67fb Clear leave balance on changing leave type by Shreya · 6 years ago
- ff85c49 Merge pull request #14030 from saurabh6790/field_fixes by Saurabh · 6 years ago
- 99400bd remove duplicate fields occured due to merge conflicts by Saurabh · 6 years ago
- 4f2e39c Merge pull request #14028 from rohitwaghchaure/get_approved_leaves_for_period_issue by rohitwaghchaure · 6 years ago
- 9ba72f7 [Fix] get_approved_leaves_for_period module import failed by Rohit Waghchaure · 6 years ago
- 2ca83d6 Resolve merge conflicts from enterprise_sprint branch by Saurabh · 6 years ago
- 8b04d43 Merge pull request #13951 from ESS-LLP/jam_enterprise_sprint by Saurabh · 6 years ago
- 1f1dd96 Merge branch 'enterprise_sprint' into jam_enterprise_sprint by Saurabh · 6 years ago
- 451bc04 Merge pull request #13982 from ESS-LLP/tax_exemption by rohitwaghchaure · 6 years ago
- 3f0c735 Merge branch 'enterprise_sprint' into tax_exemption by rohitwaghchaure · 6 years ago
- 2b8fc49 Merge pull request #14027 from saurabh6790/TDS_sprint by rohitwaghchaure · 6 years ago
- 4ae089d Provision to deduct TDS on Advance by Saurabh · 6 years ago
- f3f438a tds fixed for PI by Saurabh · 6 years ago
- b9d3385 calculate TDS on Sales Invoice Amount by Saurabh · 6 years ago
- 3b4a6be Supplier Tax Withholding Config by Saurabh · 6 years ago
- 2d8a7ee Bootstrap 'TDS' via fixture by Saurabh · 6 years ago
- d9faba9 Merge pull request #13746 from Zlash65/supplier-group by rohitwaghchaure · 6 years ago
- 7c6bef4 Merge branch 'enterprise_sprint' into supplier-group by rohitwaghchaure · 6 years ago
- 8137f04 Merge pull request #13984 from manassolanki/employee-boarding by rohitwaghchaure · 6 years ago
- 094e184 minor changes and fixed the conflicts by Manas Solanki · 6 years ago
- 67da5f7 Merge pull request #14023 from mntechnique/accounting_period by rohitwaghchaure · 6 years ago
- 3282191 Merge pull request #14025 from shreyashah115/html-table by rohitwaghchaure · 6 years ago
- b698846 [feature] added the employee onboarding and separation doctype by Manas Solanki · 6 years ago
- 4819984 Merge pull request #13750 from rohitwaghchaure/asset_purchase_link by rohitwaghchaure · 6 years ago
- 8d626e6 Merge pull request #14024 from ESS-LLP/jam_additional_sal_comp by rohitwaghchaure · 6 years ago
- 4bd5583 Make Available Leave HTML Table by Shreya · 6 years ago
- 75c53e5 Fix - missing semicolon by Jamsheer · 6 years ago
- d644e6d Code cleanup by Rohit Waghchaure · 6 years ago
- 1167988 Patch to move asset fields to Asset Finance Book table by Rohit Waghchaure · 6 years ago
- 352df95 Patch to make location by Rohit Waghchaure · 6 years ago