1. 6e3668d fix: merge conflict by Nabin Hait · 4 years ago
  2. fa73074 fix: salary structure assign to employee (#24798) by Jannat Patel · 4 years ago
  3. 5accf8a Merge branch 'develop' into salary_slip_error by Marica · 4 years ago
  4. 9b4e5bf chore: improve error message for missing fields. by Ankush Menat · 4 years ago
  5. f1d13a4 Merge branch 'develop' into track_settings by Raffael Meyer · 4 years ago
  6. a5c4558 feat: Additon of leave details in Salary Slip (#24674) by Deepesh Garg · 4 years ago
  7. 7d89243 fix: track setting changes by Ankush Menat · 4 years ago
  8. b27d4f6 fix: salary slip working hours increment (#24784) by Jannat Patel · 4 years ago
  9. ef5c714 fix: salary slip attribute error (#24455) by Jannat Patel · 4 years ago
  10. 91a0286 fix: emp disappear (#24525) by Afshan · 4 years ago
  11. 0a8939e Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui by Suraj Shetty · 4 years ago
  12. 907e299 fix: remove function to get earning deduction components (#24465) by Afshan · 4 years ago
  13. 2174409 fix: slider by Afshan · 4 years, 1 month ago
  14. 02d495f fix: added query for fetching salary component by Afshan · 4 years, 1 month ago
  15. f0ff23e Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui by Suraj Shetty · 4 years, 1 month ago
  16. 36e3e05 fix: query for salary componet in salary structure by Afshan · 4 years, 1 month ago
  17. 912647f fix: allow statistical component in salary structure. by Afshan · 4 years, 1 month ago
  18. c69ab6d fix: select sal comp while making sal struct by Afshan · 4 years, 1 month ago
  19. 6fb66f9 Merge pull request #24362 from ruchamahabal/year-to-date-in-salary-components by Deepesh Garg · 4 years, 1 month ago
  20. bbc6bfd Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui by Suraj Shetty · 4 years, 1 month ago
  21. cbed6f9 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters by Deepesh Garg · 4 years, 1 month ago
  22. 6c90e26 feat: add descriptions for YTD and MTD fields by Rucha Mahabal · 4 years, 1 month ago
  23. 49702c1 test: year to date computation for salary slip components by Rucha Mahabal · 4 years, 1 month ago
  24. 2c315a7 feat: Salary Slip with Year to Date Print Format by Rucha Mahabal · 4 years, 1 month ago
  25. fdad94f feat(Payroll): compute Year to Date for Salary Slip components by Rucha Mahabal · 4 years, 1 month ago
  26. 33fac19 fix: calculation of remaining_sub_periods if relieving date before month start date (#24319) by Afshan · 4 years, 1 month ago
  27. a931515 fix: Components formulated from additional salary not being fetched in Payroll Entry by Rucha Mahabal · 4 years, 1 month ago
  28. 77ba72c Merge branch 'develop' into payroll_fixes2.0 by Anurag Mishra · 4 years, 1 month ago
  29. e7fa6f6 fix: edditable employee grid by Anurag Mishra · 4 years, 1 month ago
  30. 9fc44f1 Merge pull request #24182 from scmmishra/fix-dont-set-primary by Shivam Mishra · 4 years, 1 month ago
  31. ad8be7c fix: Consider only submitted salary slips by Deepesh Garg · 4 years, 1 month ago
  32. f7b9b06 fix: tax calculation on salary slip for the first month (#24272) by Nabin Hait · 4 years, 1 month ago
  33. b01b108 fix: do not consider current salary slip in sum by Deepesh Garg · 4 years, 1 month ago
  34. 994fa48 Merge branch 'develop' into fix-dont-set-primary by Saurabh · 4 years, 1 month ago
  35. b864b09 Merge branch 'develop' into gratuity by Anurag Mishra · 4 years, 1 month ago
  36. 517fd8b fix: Ignore customer and supplier while deleting company transactions (#24279) by Nabin Hait · 4 years, 1 month ago
  37. 797a742 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters by Deepesh Garg · 4 years, 1 month ago
  38. 47bc427 Merge branch 'develop' into fix-sal-struc-assign-payroll-acc by Afshan · 4 years, 1 month ago
  39. d7ea2bd Merge pull request #24177 from AfshanKhan/fix-perm-empl-sal-slip by Anurag Mishra · 4 years, 1 month ago
  40. 8b60fe6 fix: setting correct account for sal struct assignment if not specified. by Afshan · 4 years, 1 month ago
  41. 133ce28 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters by Deepesh Garg · 4 years, 1 month ago
  42. 5891b48 Merge pull request #24176 from GangaManoj/Year-to-Date by Deepesh Garg · 4 years, 1 month ago
  43. 66dcaf3 fix: Salary structure assignment in tests by Deepesh Garg · 4 years, 1 month ago
  44. 97d055d fix: Test Case by Deepesh Garg · 4 years, 1 month ago
  45. 8b7ebe5 fix: Test Case cleanup and fixes by Deepesh Garg · 4 years, 1 month ago
  46. 20133bd fix: Remove comments by Deepesh Garg · 4 years, 1 month ago
  47. 353f8f4 fix: Add test case for YTD by Deepesh Garg · 4 years, 1 month ago
  48. 60b77f9 Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date by Deepesh Garg · 4 years, 1 month ago
  49. 4a8c2c4 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters by Deepesh Garg · 4 years, 1 month ago
  50. 527a156 feat: validated employees whose salary has been already precessed by Anurag Mishra · 4 years, 2 months ago
  51. 3278d02 fix: sider by Anurag Mishra · 4 years, 2 months ago
  52. 1446749 fix: changes requested by Anurag Mishra · 4 years, 2 months ago
  53. eb065d6 fix: fixed gl entries by Nabin Hait · 4 years, 2 months ago
  54. b71611d feat: Added Form dashboard by Anurag Mishra · 4 years, 2 months ago
  55. 4cc3339 fix: test by Anurag Mishra · 4 years, 2 months ago
  56. ba6ff6e fix: conflict by Anurag Mishra · 4 years, 2 months ago
  57. 708065c fix: test cases by Anurag Mishra · 4 years, 2 months ago
  58. af9f172 fix: requested changes and sider by Anurag Mishra · 4 years, 3 months ago
  59. 66b697c feat: fix test for Gratuity by Anurag Mishra · 4 years, 3 months ago
  60. 550e60a feat: fix test for Gratuity by Anurag Mishra · 4 years, 3 months ago
  61. b88af3a feat: Accrural Entry for Gratuity beafore Payment by Anurag Mishra · 4 years, 3 months ago
  62. 78fdd5d fix: update status on salary Slip submission by Anurag Mishra · 4 years, 3 months ago
  63. 46e1c09 style: Broken into smaller function by Anurag Mishra · 4 years, 4 months ago
  64. 4d6c3c9 Fix: Changes Requested, Sider, codacy, Transalation by Anurag Mishra · 4 years, 4 months ago
  65. 493eea1 feat: added link from desk page and some minor fixes by Anurag Mishra · 4 years, 6 months ago
  66. 25c3568 test: gratuity by Anurag Mishra · 4 years, 6 months ago
  67. 34a7250 fix: Some enhancements and better validation by Anurag Mishra · 4 years, 6 months ago
  68. 47f3a3a feat: validation for if no slab found by Anurag Mishra · 4 years, 6 months ago
  69. 6f15380 feat: added minimum year for gratuity and condition utilisation by Anurag Mishra · 4 years, 6 months ago
  70. 30299c6 feat: validating and ordeing the rule slabr by Anurag Mishra · 4 years, 6 months ago
  71. dedc001 feat(HR): Working day calulation based on attendance or Leave by Anurag Mishra · 4 years, 6 months ago
  72. 49b326f feat(HR): Gratuity Payment by Anurag Mishra · 4 years, 6 months ago
  73. fc2cb3a Feat: gratuity by Anurag Mishra · 4 years, 6 months ago
  74. d556847 fix: allow addition and removal of employee in payroll Entry by Anurag Mishra · 4 years, 2 months ago
  75. 0907838 fix: Improve month_to_date computation by Ganga Manoj · 4 years, 2 months ago
  76. c36cab8 fix: Update year_to_date and month_to_date field labels to show company currency by Ganga Manoj · 4 years, 2 months ago
  77. 0e22217 fix: don't set primary action if workflow is set by Shivam Mishra · 4 years, 2 months ago
  78. ddd9fe4 feat: Add month_to_date field by Ganga Manoj · 4 years, 2 months ago
  79. 59fbf70 feat: Compute month_to_date by Ganga Manoj · 4 years, 2 months ago
  80. 1b1df6b feat: Add month_to_date field by Ganga Manoj · 4 years, 2 months ago
  81. 89a02d7 feat: Changed Fiscal Year to Payroll Period by Ganga Manoj · 4 years, 2 months ago
  82. a81519f fix: error popup for submitted doc by Afshan · 4 years, 2 months ago
  83. 9f1e018 feat: Compute year_to_date by Ganga Manoj · 4 years, 2 months ago
  84. 04f48a0 feat: Add year_to_date field by Ganga Manoj · 4 years, 2 months ago
  85. 3ebe511 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui by Your Name · 4 years, 2 months ago
  86. fd044b0 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements by Shivam Mishra · 4 years, 2 months ago
  87. 89d14fd fix: minor ui changes (#24125) by Afshan · 4 years, 2 months ago
  88. 58e8e06 fix: retention filters (#24123) by Afshan · 4 years, 2 months ago
  89. e64718b fix: selecting salary component (#24121) by Afshan · 4 years, 2 months ago
  90. fec8dba fix(merge): merge develop by Rushabh Mehta · 4 years, 2 months ago
  91. 749d36a fix: double exception in payroll (#24078) by Afshan · 4 years, 2 months ago
  92. 2fa3cac feat: update workspace folders by Shivam Mishra · 4 years, 2 months ago
  93. 2895645 feat: rename desk page to workspace by Shivam Mishra · 4 years, 2 months ago
  94. 523c464 fix: Test Payment Based on Leave Application (Travis) by marination · 4 years, 2 months ago
  95. 12b45b3 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters by Deepesh Garg · 4 years, 2 months ago
  96. 9aaca25 feat: update desk page json by Shivam Mishra · 4 years, 2 months ago
  97. de68f74 chore: update all desk pages by Shivam Mishra · 4 years, 2 months ago
  98. ccf5dc6 feat: multi-currency payroll (#23519) by Afshan · 4 years, 2 months ago
  99. 27e7c26 fix: link type by Shivam Mishra · 4 years, 3 months ago
  100. 61388d4 feat: update desk pages by Shivam Mishra · 4 years, 3 months ago