Gitiles
Code Review Sign In
git.clicks.codes / Clicks / Forks / ERPNext / 40d7e45a34fa1c0bb369b6da952500adb0bb702f / erpnext / payroll
  1. 0950481 fix: merge conflict by Nabin Hait · 3 years, 8 months ago
  2. efd7d58 feat: add Inactive status to Employee by Rucha Mahabal · 3 years, 8 months ago
  3. a38147a feat: add Inactive status to Employee by Rucha Mahabal · 3 years, 8 months ago
  4. 46cc089 Merge branch 'develop' into payroll-emp-detail by gavin · 3 years, 8 months ago
  5. 32ebb10 fix: review chnages by Anupam · 3 years, 8 months ago
  6. 062e247 test: remove unused imports by Sagar Vora · 3 years, 8 months ago
  7. ca205be fix: tests by Sagar Vora · 3 years, 8 months ago
  8. 0e5e135 perf: use frappe.get_value with wildcard instead of another frappe.get_doc call by Sagar Vora · 3 years, 8 months ago
  9. 74818c7 fix: improve filter for `from_date`; validation for joining and relieving date by Sagar Vora · 3 years, 8 months ago
  10. 447c978 fix: choose correct Salary Structure Assignment when getting data for formula eval by Sagar Vora · 3 years, 8 months ago
  11. 5b1e7a6 test: remove unused imports by Sagar Vora · 3 years, 8 months ago
  12. 7f5378d fix: tests by Sagar Vora · 3 years, 8 months ago
  13. bf05284 fix: payroll entry employee detail issue by Anupam · 3 years, 8 months ago
  14. bd92b43 perf: use frappe.get_value with wildcard instead of another frappe.get_doc call by Sagar Vora · 3 years, 8 months ago
  15. 5657fdd fix: improve filter for `from_date`; validation for joining and relieving date by Sagar Vora · 3 years, 8 months ago
  16. e80902b fix: choose correct Salary Structure Assignment when getting data for formula eval by Sagar Vora · 3 years, 8 months ago
  17. eff8f6f fix(Payroll): no need to set `abbr` specially in Salary Slip (#25877) by Sagar Vora · 3 years, 8 months ago
  18. 273589e test: Fix a case where test used to fail due to holiday list by Suraj Shetty · 3 years, 9 months ago
  19. 2e0e4a7 refactor: Additional Salary form clean up (#25785) by Anurag Mishra · 3 years, 8 months ago
  20. 8b2fef1 fix: merge conflict by Nabin Hait · 3 years, 9 months ago
  21. a13c453 test: Fix a case where test used to fail due to holiday list by Suraj Shetty · 3 years, 9 months ago
  22. 735fbdc fix: Updating Standard Notification's channel field (#25564) by Shariq Ansari · 3 years, 9 months ago
  23. 7481f54 Merge branch 'version-13' into develop by Nabin Hait · 3 years, 9 months ago
  24. 0e41295 perf: Performance enhancement on setup wizard (#25606) by Nabin Hait · 3 years, 9 months ago
  25. 134eaa5 perf: Performance enhancement on setup wizard (#25605) by Nabin Hait · 3 years, 9 months ago
  26. 80c5c86 Revert "fix: default value for Templates (#25591)" (#25608) by Anurag Mishra · 3 years, 9 months ago
  27. 60f3e9e fix: default value for Templates (#25591) by Anurag Mishra · 3 years, 9 months ago
  28. cd9fa61 Merge pull request #25521 from ernestoruiz89/patch-4 by Deepesh Garg · 3 years, 9 months ago
  29. 76e1e68 fix: Make strings translatable by Ernesto Ruiz · 3 years, 9 months ago
  30. 7f1b2de feat: Employee Referral (#24997) by Anurag Mishra · 3 years, 9 months ago
  31. 6625035 fix: Add transtlation function to strings by Ernesto Ruiz · 3 years, 10 months ago
  32. c221682 fix: Bulk Salary Structure Assignment (#25389) by Rucha Mahabal · 3 years, 10 months ago
  33. 9c9907c fix: available employee for selection (#25377) by Afshan · 3 years, 10 months ago
  34. c0db286 fix: filter for employees in salary slip (#25360) by Afshan · 3 years, 10 months ago
  35. 39b1cd8 fix: Additional Salary component amount not getting set (#25355) by Rucha Mahabal · 3 years, 10 months ago
  36. 2535fe9 fix: Resolved merge conflict by Nabin Hait · 3 years, 10 months ago
  37. 10c6137 fix: Backport missing commits to develop branch (#25305) by Nabin Hait · 3 years, 10 months ago
  38. 82d0a1a style: Add missing semicolons - & make formatting consistent by Suraj Shetty · 3 years, 10 months ago
  39. 65f25c2 fix(minor): fix dynamically changing grid properties by Rushabh Mehta · 3 years, 10 months ago
  40. e2da3cb fix: payroll issues (#24540) by Afshan · 3 years, 10 months ago
  41. c39720d fix: frappe.whitelist for doc methods (#25231) by Walstan Baptista · 3 years, 10 months ago
  42. 90e240c fix: frappe.whitelist for doc methods (#25230) by Walstan Baptista · 3 years, 10 months ago
  43. a42194f Merge branch 'develop' of https://github.com/frappe/erpnext into loan_fixes_phase_2 by Deepesh Garg · 3 years, 10 months ago
  44. 2453b0c fix: component amount calculation based on formula with abbr not working (#25117) by Rucha Mahabal · 3 years, 10 months ago
  45. 6717773 fix: Travis (#25078) by Rucha Mahabal · 3 years, 10 months ago
  46. 7f7b360 fix: merge conflict by Nabin Hait · 3 years, 10 months ago
  47. 11eb30d fix: merge conflict by Nabin Hait · 3 years, 10 months ago
  48. 53a1aaf fix: Salary Structure object has no attribute set_totals (#25113) by Rucha Mahabal · 3 years, 10 months ago
  49. d765b21 fix: Salary Structure object has no attribute set_totals (#25114) by Rucha Mahabal · 3 years, 10 months ago
  50. 2fef245 fix: don't set Company:company:default_currency as default for currency link fields (#25111) by Afshan · 3 years, 10 months ago
  51. f3c34aa fix: don't set "Company:company:default_currency" as default for currency link fields (#25095) by Prssanna Desai · 3 years, 10 months ago
  52. d636075 chore: frappe.whitelist for doc methods (#25068) by Walstan Baptista · 3 years, 10 months ago
  53. 170d2ef fix(Payroll): Exchange Rate not getting set in Salary Slip (#25013) by Rucha Mahabal · 3 years, 10 months ago
  54. 2a39b74 fix: Fixes on job card and salary slip (#25011) by Nabin Hait · 3 years, 10 months ago
  55. b2b12f3 fix(Payroll): Exchange Rate not getting set in Salary Slip by Rucha Mahabal · 3 years, 10 months ago
  56. 0885518 test: fix test_loan for payroll module (#24946) by Jannat Patel · 3 years, 11 months ago
  57. 95e9b2f refactor(payroll): simplified logic for additional salary (#24907) by Sagar Vora · 3 years, 11 months ago
  58. cf3fc99 test: fix salary component not found; other optimisation (#24920) by Sagar Vora · 3 years, 11 months ago
  59. 23b6294 Merge pull request #24842 from resilient-tech/allow-duplicate-additional by Anurag Mishra · 3 years, 11 months ago
  60. a2e4564 fix: Prevent non sequential repayment entries by Deepesh Garg · 3 years, 11 months ago
  61. 6727792 test: fix syntax error by Sagar Vora · 3 years, 11 months ago
  62. 514122b refactor(payroll): simplified logic for additional salary by Sagar Vora · 3 years, 11 months ago
  63. fe3529b fix: merge conflict by Nabin Hait · 3 years, 11 months ago
  64. 6e3668d fix: merge conflict by Nabin Hait · 3 years, 11 months ago
  65. 5822b6d fix(payroll): allow duplicate additional salaries by Sagar Vora · 3 years, 11 months ago
  66. fa73074 fix: salary structure assign to employee (#24798) by Jannat Patel · 3 years, 11 months ago
  67. 5accf8a Merge branch 'develop' into salary_slip_error by Marica · 3 years, 11 months ago
  68. 9b4e5bf chore: improve error message for missing fields. by Ankush Menat · 4 years ago
  69. f1d13a4 Merge branch 'develop' into track_settings by Raffael Meyer · 4 years ago
  70. 11092d0 feat: Additon of leave details in Salary Slip (#24674) by Deepesh Garg · 4 years ago
  71. a5c4558 feat: Additon of leave details in Salary Slip (#24674) by Deepesh Garg · 4 years ago
  72. 7d89243 fix: track setting changes by Ankush Menat · 4 years ago
  73. b27d4f6 fix: salary slip working hours increment (#24784) by Jannat Patel · 4 years ago
  74. d46b236 fix: optimize reposting of gle and sle (#24702) by Nabin Hait · 4 years ago
  75. 4cef0f5 fix: salary slip attribute error (#24455) by Jannat Patel · 4 years ago
  76. 83768b6 fix: emp disappear (#24525) by Afshan · 4 years ago
  77. ef5c714 fix: salary slip attribute error (#24455) by Jannat Patel · 4 years ago
  78. c0f8f32 fix: fetch query for employee (#24529) by Afshan · 4 years ago
  79. 10b00f9 fix: separation of salary creation from payroll (#24528) by Afshan · 4 years ago
  80. 91a0286 fix: emp disappear (#24525) by Afshan · 4 years ago
  81. 8676089 fix: emp disappear (#24524) by Afshan · 4 years ago
  82. 0a8939e Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui by Suraj Shetty · 4 years ago
  83. a6213cc Merge branch 'develop' into version-13-beta-pre-release by Nabin Hait · 4 years ago
  84. 907e299 fix: remove function to get earning deduction components (#24465) by Afshan · 4 years ago
  85. 0c34a71 Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release by Suraj Shetty · 4 years ago
  86. 2174409 fix: slider by Afshan · 4 years ago
  87. 02d495f fix: added query for fetching salary component by Afshan · 4 years ago
  88. f0ff23e Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui by Suraj Shetty · 4 years ago
  89. 36e3e05 fix: query for salary componet in salary structure by Afshan · 4 years ago
  90. 912647f fix: allow statistical component in salary structure. by Afshan · 4 years ago
  91. c69ab6d fix: select sal comp while making sal struct by Afshan · 4 years ago
  92. 6fb66f9 Merge pull request #24362 from ruchamahabal/year-to-date-in-salary-components by Deepesh Garg · 4 years ago
  93. bbc6bfd Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui by Suraj Shetty · 4 years ago
  94. cbed6f9 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters by Deepesh Garg · 4 years, 1 month ago
  95. 6c90e26 feat: add descriptions for YTD and MTD fields by Rucha Mahabal · 4 years, 1 month ago
  96. 49702c1 test: year to date computation for salary slip components by Rucha Mahabal · 4 years, 1 month ago
  97. 2c315a7 feat: Salary Slip with Year to Date Print Format by Rucha Mahabal · 4 years, 1 month ago
  98. fdad94f feat(Payroll): compute Year to Date for Salary Slip components by Rucha Mahabal · 4 years, 1 month ago
  99. 33fac19 fix: calculation of remaining_sub_periods if relieving date before month start date (#24319) by Afshan · 4 years, 1 month ago
  100. a931515 fix: Components formulated from additional salary not being fetched in Payroll Entry by Rucha Mahabal · 4 years, 1 month ago