1. 60d8a0d fix(leave-status): Do not consider current leave application while submitting by Shreya · 6 years ago
  2. 606c504 Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
  3. 3c29967 Fixed merge conflict by Nabin Hait · 6 years ago
  4. 94fcb0e [Enhance] Add user image in the employee from the user (#15680) by rohitwaghchaure · 6 years ago
  5. 3362d6b [Fix] Precision issue in the expense claim (#15678) by rohitwaghchaure · 6 years ago
  6. 8c62ab4 [Enhancement] Email birthday reminder (#15559) by Mangesh-Khairnar · 6 years ago
  7. 50447b1 Compatibility with Py2 (#15653) by Charles-Henri Decultot · 6 years ago
  8. f90af80 Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
  9. d92f3ac Fix 'transporter info' section in Delivery Note (#15565) by Sagar Vora · 6 years ago
  10. da10f6e Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
  11. 7d929c5 Merge branch 'master' into staging-fixes by Ameya Shenoy · 6 years ago
  12. efd776d Events in timeline (#15485) by Charles-Henri Decultot · 6 years ago
  13. c0b684d Attendance - Unique check based on Employee and Date excluding cancelled docs (#15556) by Sharath C · 6 years ago
  14. 8976ad5 Merge pull request #15523 from rohitwaghchaure/fix_attendance_tool_issue by rohitwaghchaure · 6 years ago
  15. c7f8b82 [Fix] Attendance tool by Rohit Waghchaure · 6 years ago
  16. 8fbf856 [Fix] Salary slip by Rohit Waghchaure · 6 years ago
  17. 1e7c32b Payroll fixes and more (#15475) by Nabin Hait · 6 years ago
  18. b9228fa show only submitted salary_structure and leave_policy in Employee Grade app (#15434) by Mohamed_Alsum · 6 years ago
  19. bfc195d Changes to support refactor in frappe pg-poc branch (#15287) by Suraj Shetty · 6 years ago
  20. 75d90b9 a[resolved] merge-conflicts by Saurabh · 6 years ago
  21. 772dc6e Various permission fixes (#15448) by Saif · 6 years ago
  22. a60ab1a [Fix] Salary slip is not saving (#15449) by rohitwaghchaure · 6 years ago
  23. 393dd42 [resolved] merge-conflicts by Saurabh · 6 years ago
  24. 20d8c52 Update salary_slip.js (#15200) by Ahmed Madi · 6 years ago
  25. a2288ff fix(assessment_result): student must be in group (#15255) by Rushabh Mehta · 6 years ago
  26. ee8f828 [py3] Convert filter object to list (#15260) by Shreya Shah · 6 years ago
  27. 7e86d7b Add default payable account for expense claims (#15246) by Charles-Henri Decultot · 6 years ago
  28. f6b784e Test fixes by Nabin Hait · 6 years ago
  29. 68348d4 [Attendance-Tool] Filter employees based on date of joining (#15262) by Shreya Shah · 6 years ago
  30. 20fd2dd ux(hr): module listing and quick entry for employee by Rushabh Mehta · 6 years ago
  31. 13bcc4e perms: fix default import, export perms by Rushabh Mehta · 6 years ago
  32. e3ac5ff erpnext: refactor async to is_async (#15231) by Aditya Hase · 6 years ago
  33. 01b2a65 minor fix by Nabin Hait · 6 years ago
  34. a5add28 Refactor Naming Series (#15070) by Shreya Shah · 6 years ago
  35. c95153f Offer date mandatory in job offer by Nabin Hait · 6 years ago
  36. 8705371 fix(product-listing): fix variant selection in website by Rushabh Mehta · 6 years ago
  37. 4809f86 fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106) by Faris Ansari · 6 years ago
  38. a4d06fc replace cur_frm with frm by Zarrar · 6 years ago
  39. 7df03a4 replace department group to department by ahmad zaqout · 6 years ago
  40. 0fd562e replace customer to department by ahmad zaqout · 6 years ago
  41. 20fb443 [Resolved] merge conflicts by Saurabh · 6 years ago
  42. a0b846f [Minor] Added condition for get_bank_cash_account (#15112) by rohitwaghchaure · 6 years ago
  43. 59de1da [Fix] Math domain error (#15107) by rohitwaghchaure · 6 years ago
  44. 708e47a optimize(various) by Rushabh Mehta · 6 years ago
  45. 63a741e fix throw_overlap_error in Shift Assignment (#15103) by ahmad zaqout · 6 years ago
  46. 824b388 Resolved merge conflicts by Saurabh · 6 years ago
  47. 796ca56 Use frappe.utils.md_to_html instead of manual import (#15087) by Faris Ansari · 6 years ago
  48. 0452b40 [Fix] Not able to submit the expense claim (#15057) by rohitwaghchaure · 6 years ago
  49. 14ad9f7 Patch fixes by Nabin Hait · 6 years ago
  50. d53c2c0 more payroll improvements and tests fixes by Nabin Hait · 6 years ago
  51. d305a7a Made leave application importable by Nabin Hait · 6 years ago
  52. 4f135c9 Payroll entry ux improvements and processing via background jobs by Nabin Hait · 6 years ago
  53. 04d5412 Fixed conflict by Nabin Hait · 6 years ago
  54. 9c735e4 Grant leaves via modal and backgroud jobs (#15026) by Nabin Hait · 6 years ago
  55. 6004b66 [Minor] Job Offer UX improvise (#15042) by Zarrar · 6 years ago
  56. e555b5b Salary Slip tests for tax calc on benefits, additional salary (#14985) by Ranjith Kurungadam · 6 years ago
  57. 8173d9f Update additional_salary.json by Nabin Hait · 6 years ago
  58. 22fa99d Payroll Fixes by Nabin Hait · 6 years ago
  59. 1e90daf fixes Benefit Application, Additional Salary (#14971) by Ranjith Kurungadam · 6 years ago
  60. 68abe25 fix - assigned Salary Structure query (#14965) by Ranjith Kurungadam · 6 years ago
  61. dff2ba7 test TDS calculation (#14919) by Ranjith Kurungadam · 6 years ago
  62. d7897f1 Resolved merge conflicts by Saurabh · 6 years ago
  63. 9e874af Query report print (#14935) by Faris Ansari · 6 years ago
  64. fbeab5b Show opening balance of leaves (#14925) by Shreya Shah · 6 years ago
  65. 09e680b [Fix] Should not get approvers for disabled Departments (#14868) by KanchanChauhan · 6 years ago
  66. 9a3b785 [Minor] Employee Separation Fix (#14867) by Zarrar · 6 years ago
  67. db73248 Merge branch 'master' into develop by Saurabh · 6 years ago
  68. ea089d6 Employee Benefit Application - fix (#14837) by Ranjith Kurungadam · 6 years ago
  69. 8179bcb [Fix] Code cleanup (#14843) by rohitwaghchaure · 6 years ago
  70. e4a53f9 [Fix] Unable to print Salary Register (#14844) by rohitwaghchaure · 6 years ago
  71. 6429ba9 Payroll Entry - fix query, get assignment by end date (#14827) by Ranjith Kurungadam · 6 years ago
  72. 1cfcf70 Resolved merge conflicts by Saurabh · 6 years ago
  73. 5d134e0 TDS Calculate tax for whole period on deduct checkboxes (#14824) by Ranjith Kurungadam · 6 years ago
  74. df23c7d [cleanup] bunch of UX fixes (#14787) by Rushabh Mehta · 6 years ago
  75. 430810f Fix typo (#14802) by Shreya Shah · 6 years ago
  76. 68a148e half_day enable/disable check (#14795) by Zarrar · 6 years ago
  77. 9911309 Patch fixes by Nabin Hait · 6 years ago
  78. f4660d2 Ignore calculating tds if amount/formula is mentioned in salary structure by Nabin Hait · 6 years ago
  79. 273e8e5 fix Salary Component (#14783) by Ranjith Kurungadam · 6 years ago
  80. e734b7c Add filters to show Draft salary slips in salary register (#14780) by Pawan Mehta · 6 years ago
  81. afe7642 [Fix] Employee advance issues (#14750) by rohitwaghchaure · 6 years ago
  82. 4dc5721 fix - Benefit Application query (#14767) by Ranjith Kurungadam · 6 years ago
  83. e3daaa6 Payroll fixes (#14758) by Nabin Hait · 6 years ago
  84. 69b03a3 fix typo by Ranjith · 6 years ago
  85. fd7ef2e Salary Component - field display, value dependency (#14747) by Ranjith Kurungadam · 6 years ago
  86. b402ccc Payroll Entry - make only one JE, separate JE for Flexi (#14752) by Ranjith Kurungadam · 6 years ago
  87. 6e86fb2 Set user permissions for new departments based on company by Nabin Hait · 6 years ago
  88. c114ceb Set salary component properties in existing components and salary structures by Nabin Hait · 6 years ago
  89. a10f118 Payroll Entry - Validate Attendance (#14738) by Ranjith Kurungadam · 6 years ago
  90. f6e654e Payroll Entry - fix deduct taxes (#14730) by Ranjith Kurungadam · 6 years ago
  91. 6ceed03 Fix benefits (#14735) by Ranjith Kurungadam · 6 years ago
  92. b66bde3 Payroll Entry - fix only one employee fetched (#14718) by Ranjith Kurungadam · 6 years ago
  93. c7897e49 [fix] #14714 (#14715) by Pawan Mehta · 6 years ago
  94. 23e2353 Salary Slip - remove check query limited to one (#14699) by Ranjith Kurungadam · 6 years ago
  95. 53cdbe9 Salary Slip - fix query (#14693) by Ranjith Kurungadam · 6 years ago
  96. 86aed90 [Fix] - Get payroll period days (#14686) by Jamsheer · 6 years ago
  97. 096b943 [minor] fixes to moment.defaultDateFormat and daily work summary eplies by Rushabh Mehta · 6 years ago
  98. 4f8deb9 [Fix] - Leave Perid - Grant Allocations (#14668) by Jamsheer · 6 years ago
  99. d8031d1 Clear child table before appending (#14648) by Shreya Shah · 6 years ago
  100. b4ad3c3 Salary Structure Assignment - remove to_date (#14642) by Ranjith Kurungadam · 6 years ago