1. bef2c22 Fix: merge conflict by Nabin Hait · 6 years ago
  2. c13b056 Merge pull request #16337 from Anurag810/Employee by Nabin Hait · 6 years ago
  3. afec3ca Merge branch 'staging' into develop by Saurabh · 6 years ago
  4. 26e5c94 Merge branch 'staging-fixes' into fixed_salary_structure_employee_reqd by Sagar Vora · 6 years ago
  5. 3c74266 fix: PEP8 recommended whitspace by Sagar Vora · 6 years ago
  6. 23a1b98 fix: remove unnecessary code by Sagar Vora · 6 years ago
  7. fdd5d54 Merge branch 'staging' into develop by Frappe Bot · 6 years ago
  8. 3ac57c7 fix: remove print statement from test case by Sahil Khan · 6 years ago
  9. bb6a7eb refractor by Anurag Mishra · 6 years ago
  10. add6bf3 Fix: Employee Onboarding/Seperation task Assignment by Anurag Mishra · 6 years ago
  11. 8bac5b6 [minor] Employee is reqd to preview salary slip from salary structure by Rohit Waghchaure · 6 years ago
  12. c14c7c8 fix: leave application and timesheet tests by Sagar Vora · 6 years ago
  13. c186f15 Added test cases by Rohit Waghchaure · 6 years ago
  14. 50f0a99 fix: Checks for status in employee and for date range in upload attendance. (#16279) by sahil28297 · 6 years ago
  15. 3de12db Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes by Suraj Shetty · 6 years ago
  16. 9e09b3a Merge branch 'staging' into develop by Frappe Bot · 6 years ago
  17. e8c2fdf Merge branch 'master' into staging-fixes by Frappe Bot · 6 years ago
  18. 53a38e8 Merge pull request #16257 from surajshetty3416/permission-fixes by rohitwaghchaure · 6 years ago
  19. deb96da [Fix] Salary structure not saving (#16275) by rohitwaghchaure · 6 years ago
  20. 146be9f Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes by Suraj Shetty · 6 years ago
  21. c4d38c0 Fix the disappears of image bug after uploading and saving the employee (#16217) by Navdeep Ghai · 6 years ago
  22. b296500 Replace 'Make' with 'Create' by Suraj Shetty · 6 years ago
  23. 1b7c583 Merge branch 'staging' into develop by Frappe Bot · 6 years ago
  24. 7ae2d59 Merge branch 'staging-fixes' into permission-fixes by Suraj Shetty · 6 years ago
  25. 0543f03 fix: Remove date_of_joining from field list by shreyashah115@gmail.com · 6 years ago
  26. c8337c6 fix check for leave on holiday for half day by Zlash65 · 6 years ago
  27. e165fc0 Merge branch 'staging' into develop by Saurabh · 6 years ago
  28. eeab3ee fix(test): use frappe.db.rollback to revert deletion of fixture data (#16192) by Rushabh Mehta · 6 years ago
  29. 07e5786 Fix user permission checks by Suraj Shetty · 6 years ago
  30. fe1f532 Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
  31. dde952d Merge pull request #16092 from deepeshgarg007/salary_slip by Nabin Hait · 6 years ago
  32. 9a06543 Merge branch 'staging-fixes' into indicators-in-leave-applications by Nabin Hait · 6 years ago
  33. 2d0b788 [Minor] Indicators in Leave Application by Kanchan Chauhan · 6 years ago
  34. 36f2663 Merge branch 'staging-fixes' into fixed_holiday_list_not_working by Nabin Hait · 6 years ago
  35. bd87903 Added condition for default amount by deepeshgarg007 · 6 years ago
  36. 533066e Salary slip bug fix by deepeshgarg007 · 6 years ago
  37. 48e0e19 fix(test): Fixed salary slip and sales analytics test cases by Nabin Hait · 6 years ago
  38. 037a151 [Fix] New holiday list form is not working by Rohit Waghchaure · 6 years ago
  39. eb4969d Merge branch 'staging' into develop by Frappe Bot · 6 years ago
  40. 98b4a1b Merge branch 'master' into staging-fixes by Frappe Bot · 6 years ago
  41. 98a2348 Merge branch 'staging' into develop by Frappe Bot · 6 years ago
  42. 047a712 Claimed amount is not reset on cancel by Rohit Waghchaure · 6 years ago
  43. e04a753 assign-sa-to-group-of-employees by alsum · 6 years ago
  44. c856794 fix(hr): Delete salary slip when cancel payroll entry (#15757) by TaiLouis · 6 years ago
  45. 8075a57 Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
  46. 4a75d58 Merge branch 'master' into staging-fixes by Ameya Shenoy · 6 years ago
  47. 598d344 [Fix] Column ‘claimed_amount’ cannot be null by Rohit Waghchaure · 6 years ago
  48. f3f997f Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
  49. 78b273a [Bug-Fix] Cannot Save Bank Statement Transaction Entry (#15793) by deepeshgarg007 · 6 years ago
  50. df62296 Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
  51. 4d47c63 Update employee_advance.py by ashish-greycube · 6 years ago
  52. 7658bdc Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
  53. 1b105e2 Add test case by Shreya · 6 years ago
  54. 60d8a0d fix(leave-status): Do not consider current leave application while submitting by Shreya · 6 years ago
  55. 606c504 Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
  56. 3c29967 Fixed merge conflict by Nabin Hait · 6 years ago
  57. 94fcb0e [Enhance] Add user image in the employee from the user (#15680) by rohitwaghchaure · 6 years ago
  58. 3362d6b [Fix] Precision issue in the expense claim (#15678) by rohitwaghchaure · 6 years ago
  59. 8c62ab4 [Enhancement] Email birthday reminder (#15559) by Mangesh-Khairnar · 6 years ago
  60. 50447b1 Compatibility with Py2 (#15653) by Charles-Henri Decultot · 6 years ago
  61. f90af80 Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
  62. d92f3ac Fix 'transporter info' section in Delivery Note (#15565) by Sagar Vora · 6 years ago
  63. da10f6e Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
  64. 7d929c5 Merge branch 'master' into staging-fixes by Ameya Shenoy · 6 years ago
  65. efd776d Events in timeline (#15485) by Charles-Henri Decultot · 6 years ago
  66. c0b684d Attendance - Unique check based on Employee and Date excluding cancelled docs (#15556) by Sharath C · 6 years ago
  67. 8976ad5 Merge pull request #15523 from rohitwaghchaure/fix_attendance_tool_issue by rohitwaghchaure · 6 years ago
  68. c7f8b82 [Fix] Attendance tool by Rohit Waghchaure · 6 years ago
  69. 8fbf856 [Fix] Salary slip by Rohit Waghchaure · 6 years ago
  70. 1e7c32b Payroll fixes and more (#15475) by Nabin Hait · 6 years ago
  71. b9228fa show only submitted salary_structure and leave_policy in Employee Grade app (#15434) by Mohamed_Alsum · 6 years ago
  72. bfc195d Changes to support refactor in frappe pg-poc branch (#15287) by Suraj Shetty · 6 years ago
  73. 75d90b9 a[resolved] merge-conflicts by Saurabh · 6 years ago
  74. 772dc6e Various permission fixes (#15448) by Saif · 6 years ago
  75. a60ab1a [Fix] Salary slip is not saving (#15449) by rohitwaghchaure · 6 years ago
  76. 393dd42 [resolved] merge-conflicts by Saurabh · 6 years ago
  77. 20d8c52 Update salary_slip.js (#15200) by Ahmed Madi · 6 years ago
  78. a2288ff fix(assessment_result): student must be in group (#15255) by Rushabh Mehta · 6 years ago
  79. ee8f828 [py3] Convert filter object to list (#15260) by Shreya Shah · 6 years ago
  80. 7e86d7b Add default payable account for expense claims (#15246) by Charles-Henri Decultot · 6 years ago
  81. f6b784e Test fixes by Nabin Hait · 6 years ago
  82. 68348d4 [Attendance-Tool] Filter employees based on date of joining (#15262) by Shreya Shah · 6 years ago
  83. 20fd2dd ux(hr): module listing and quick entry for employee by Rushabh Mehta · 6 years ago
  84. 13bcc4e perms: fix default import, export perms by Rushabh Mehta · 6 years ago
  85. e3ac5ff erpnext: refactor async to is_async (#15231) by Aditya Hase · 6 years ago
  86. 01b2a65 minor fix by Nabin Hait · 6 years ago
  87. a5add28 Refactor Naming Series (#15070) by Shreya Shah · 6 years ago
  88. c95153f Offer date mandatory in job offer by Nabin Hait · 6 years ago
  89. 8705371 fix(product-listing): fix variant selection in website by Rushabh Mehta · 6 years ago
  90. 4809f86 fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106) by Faris Ansari · 6 years ago
  91. a4d06fc replace cur_frm with frm by Zarrar · 6 years ago
  92. 7df03a4 replace department group to department by ahmad zaqout · 6 years ago
  93. 0fd562e replace customer to department by ahmad zaqout · 6 years ago
  94. 20fb443 [Resolved] merge conflicts by Saurabh · 6 years ago
  95. a0b846f [Minor] Added condition for get_bank_cash_account (#15112) by rohitwaghchaure · 6 years ago
  96. 59de1da [Fix] Math domain error (#15107) by rohitwaghchaure · 6 years ago
  97. 708e47a optimize(various) by Rushabh Mehta · 6 years ago
  98. 63a741e fix throw_overlap_error in Shift Assignment (#15103) by ahmad zaqout · 6 years ago
  99. 824b388 Resolved merge conflicts by Saurabh · 6 years ago
  100. 796ca56 Use frappe.utils.md_to_html instead of manual import (#15087) by Faris Ansari · 6 years ago