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