Gitiles
Code Review Sign In
git.clicks.codes / Clicks / Forks / ERPNext / 43bd88e741b69fcfd4a2547fd59e5e6286229522 / erpnext / payroll
  1. 7481f54 Merge branch 'version-13' into develop by Nabin Hait · 3 years, 6 months ago
  2. 0e41295 perf: Performance enhancement on setup wizard (#25606) by Nabin Hait · 3 years, 6 months ago
  3. 134eaa5 perf: Performance enhancement on setup wizard (#25605) by Nabin Hait · 3 years, 6 months ago
  4. 80c5c86 Revert "fix: default value for Templates (#25591)" (#25608) by Anurag Mishra · 3 years, 6 months ago
  5. 60f3e9e fix: default value for Templates (#25591) by Anurag Mishra · 3 years, 6 months ago
  6. cd9fa61 Merge pull request #25521 from ernestoruiz89/patch-4 by Deepesh Garg · 3 years, 6 months ago
  7. 76e1e68 fix: Make strings translatable by Ernesto Ruiz · 3 years, 6 months ago
  8. 7f1b2de feat: Employee Referral (#24997) by Anurag Mishra · 3 years, 6 months ago
  9. 6625035 fix: Add transtlation function to strings by Ernesto Ruiz · 3 years, 6 months ago
  10. c221682 fix: Bulk Salary Structure Assignment (#25389) by Rucha Mahabal · 3 years, 6 months ago
  11. 9c9907c fix: available employee for selection (#25377) by Afshan · 3 years, 6 months ago
  12. c0db286 fix: filter for employees in salary slip (#25360) by Afshan · 3 years, 6 months ago
  13. 39b1cd8 fix: Additional Salary component amount not getting set (#25355) by Rucha Mahabal · 3 years, 6 months ago
  14. 2535fe9 fix: Resolved merge conflict by Nabin Hait · 3 years, 6 months ago
  15. 10c6137 fix: Backport missing commits to develop branch (#25305) by Nabin Hait · 3 years, 6 months ago
  16. 82d0a1a style: Add missing semicolons - & make formatting consistent by Suraj Shetty · 3 years, 6 months ago
  17. 65f25c2 fix(minor): fix dynamically changing grid properties by Rushabh Mehta · 3 years, 6 months ago
  18. e2da3cb fix: payroll issues (#24540) by Afshan · 3 years, 6 months ago
  19. c39720d fix: frappe.whitelist for doc methods (#25231) by Walstan Baptista · 3 years, 6 months ago
  20. 90e240c fix: frappe.whitelist for doc methods (#25230) by Walstan Baptista · 3 years, 6 months ago
  21. a42194f Merge branch 'develop' of https://github.com/frappe/erpnext into loan_fixes_phase_2 by Deepesh Garg · 3 years, 6 months ago
  22. 2453b0c fix: component amount calculation based on formula with abbr not working (#25117) by Rucha Mahabal · 3 years, 7 months ago
  23. 6717773 fix: Travis (#25078) by Rucha Mahabal · 3 years, 7 months ago
  24. 7f7b360 fix: merge conflict by Nabin Hait · 3 years, 7 months ago
  25. 11eb30d fix: merge conflict by Nabin Hait · 3 years, 7 months ago
  26. 53a1aaf fix: Salary Structure object has no attribute set_totals (#25113) by Rucha Mahabal · 3 years, 7 months ago
  27. d765b21 fix: Salary Structure object has no attribute set_totals (#25114) by Rucha Mahabal · 3 years, 7 months ago
  28. 2fef245 fix: don't set Company:company:default_currency as default for currency link fields (#25111) by Afshan · 3 years, 7 months ago
  29. f3c34aa fix: don't set "Company:company:default_currency" as default for currency link fields (#25095) by Prssanna Desai · 3 years, 7 months ago
  30. d636075 chore: frappe.whitelist for doc methods (#25068) by Walstan Baptista · 3 years, 7 months ago
  31. 170d2ef fix(Payroll): Exchange Rate not getting set in Salary Slip (#25013) by Rucha Mahabal · 3 years, 7 months ago
  32. 2a39b74 fix: Fixes on job card and salary slip (#25011) by Nabin Hait · 3 years, 7 months ago
  33. b2b12f3 fix(Payroll): Exchange Rate not getting set in Salary Slip by Rucha Mahabal · 3 years, 7 months ago
  34. 0885518 test: fix test_loan for payroll module (#24946) by Jannat Patel · 3 years, 7 months ago
  35. 95e9b2f refactor(payroll): simplified logic for additional salary (#24907) by Sagar Vora · 3 years, 7 months ago
  36. cf3fc99 test: fix salary component not found; other optimisation (#24920) by Sagar Vora · 3 years, 7 months ago
  37. 23b6294 Merge pull request #24842 from resilient-tech/allow-duplicate-additional by Anurag Mishra · 3 years, 7 months ago
  38. a2e4564 fix: Prevent non sequential repayment entries by Deepesh Garg · 3 years, 7 months ago
  39. 6727792 test: fix syntax error by Sagar Vora · 3 years, 7 months ago
  40. 514122b refactor(payroll): simplified logic for additional salary by Sagar Vora · 3 years, 7 months ago
  41. fe3529b fix: merge conflict by Nabin Hait · 3 years, 7 months ago
  42. 6e3668d fix: merge conflict by Nabin Hait · 3 years, 7 months ago
  43. 5822b6d fix(payroll): allow duplicate additional salaries by Sagar Vora · 3 years, 7 months ago
  44. fa73074 fix: salary structure assign to employee (#24798) by Jannat Patel · 3 years, 7 months ago
  45. 5accf8a Merge branch 'develop' into salary_slip_error by Marica · 3 years, 7 months ago
  46. 9b4e5bf chore: improve error message for missing fields. by Ankush Menat · 3 years, 8 months ago
  47. f1d13a4 Merge branch 'develop' into track_settings by Raffael Meyer · 3 years, 8 months ago
  48. 11092d0 feat: Additon of leave details in Salary Slip (#24674) by Deepesh Garg · 3 years, 8 months ago
  49. a5c4558 feat: Additon of leave details in Salary Slip (#24674) by Deepesh Garg · 3 years, 8 months ago
  50. 7d89243 fix: track setting changes by Ankush Menat · 3 years, 8 months ago
  51. b27d4f6 fix: salary slip working hours increment (#24784) by Jannat Patel · 3 years, 8 months ago
  52. d46b236 fix: optimize reposting of gle and sle (#24702) by Nabin Hait · 3 years, 8 months ago
  53. 4cef0f5 fix: salary slip attribute error (#24455) by Jannat Patel · 3 years, 8 months ago
  54. 83768b6 fix: emp disappear (#24525) by Afshan · 3 years, 9 months ago
  55. ef5c714 fix: salary slip attribute error (#24455) by Jannat Patel · 3 years, 8 months ago
  56. c0f8f32 fix: fetch query for employee (#24529) by Afshan · 3 years, 9 months ago
  57. 10b00f9 fix: separation of salary creation from payroll (#24528) by Afshan · 3 years, 9 months ago
  58. 91a0286 fix: emp disappear (#24525) by Afshan · 3 years, 9 months ago
  59. 8676089 fix: emp disappear (#24524) by Afshan · 3 years, 9 months ago
  60. 0a8939e Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui by Suraj Shetty · 3 years, 9 months ago
  61. a6213cc Merge branch 'develop' into version-13-beta-pre-release by Nabin Hait · 3 years, 9 months ago
  62. 907e299 fix: remove function to get earning deduction components (#24465) by Afshan · 3 years, 9 months ago
  63. 0c34a71 Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release by Suraj Shetty · 3 years, 9 months ago
  64. 2174409 fix: slider by Afshan · 3 years, 9 months ago
  65. 02d495f fix: added query for fetching salary component by Afshan · 3 years, 9 months ago
  66. f0ff23e Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui by Suraj Shetty · 3 years, 9 months ago
  67. 36e3e05 fix: query for salary componet in salary structure by Afshan · 3 years, 9 months ago
  68. 912647f fix: allow statistical component in salary structure. by Afshan · 3 years, 9 months ago
  69. c69ab6d fix: select sal comp while making sal struct by Afshan · 3 years, 9 months ago
  70. 6fb66f9 Merge pull request #24362 from ruchamahabal/year-to-date-in-salary-components by Deepesh Garg · 3 years, 9 months ago
  71. bbc6bfd Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui by Suraj Shetty · 3 years, 9 months ago
  72. cbed6f9 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters by Deepesh Garg · 3 years, 9 months ago
  73. 6c90e26 feat: add descriptions for YTD and MTD fields by Rucha Mahabal · 3 years, 9 months ago
  74. 49702c1 test: year to date computation for salary slip components by Rucha Mahabal · 3 years, 9 months ago
  75. 2c315a7 feat: Salary Slip with Year to Date Print Format by Rucha Mahabal · 3 years, 9 months ago
  76. fdad94f feat(Payroll): compute Year to Date for Salary Slip components by Rucha Mahabal · 3 years, 9 months ago
  77. 33fac19 fix: calculation of remaining_sub_periods if relieving date before month start date (#24319) by Afshan · 3 years, 9 months ago
  78. a931515 fix: Components formulated from additional salary not being fetched in Payroll Entry by Rucha Mahabal · 3 years, 9 months ago
  79. 77ba72c Merge branch 'develop' into payroll_fixes2.0 by Anurag Mishra · 3 years, 10 months ago
  80. e7fa6f6 fix: edditable employee grid by Anurag Mishra · 3 years, 10 months ago
  81. 9fc44f1 Merge pull request #24182 from scmmishra/fix-dont-set-primary by Shivam Mishra · 3 years, 10 months ago
  82. ad8be7c fix: Consider only submitted salary slips by Deepesh Garg · 3 years, 10 months ago
  83. f7b9b06 fix: tax calculation on salary slip for the first month (#24272) by Nabin Hait · 3 years, 10 months ago
  84. b01b108 fix: do not consider current salary slip in sum by Deepesh Garg · 3 years, 10 months ago
  85. 994fa48 Merge branch 'develop' into fix-dont-set-primary by Saurabh · 3 years, 10 months ago
  86. b864b09 Merge branch 'develop' into gratuity by Anurag Mishra · 3 years, 10 months ago
  87. 517fd8b fix: Ignore customer and supplier while deleting company transactions (#24279) by Nabin Hait · 3 years, 10 months ago
  88. 797a742 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters by Deepesh Garg · 3 years, 10 months ago
  89. 47bc427 Merge branch 'develop' into fix-sal-struc-assign-payroll-acc by Afshan · 3 years, 10 months ago
  90. d7ea2bd Merge pull request #24177 from AfshanKhan/fix-perm-empl-sal-slip by Anurag Mishra · 3 years, 10 months ago
  91. 8b60fe6 fix: setting correct account for sal struct assignment if not specified. by Afshan · 3 years, 10 months ago
  92. 133ce28 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters by Deepesh Garg · 3 years, 10 months ago
  93. 5891b48 Merge pull request #24176 from GangaManoj/Year-to-Date by Deepesh Garg · 3 years, 10 months ago
  94. 66dcaf3 fix: Salary structure assignment in tests by Deepesh Garg · 3 years, 10 months ago
  95. 97d055d fix: Test Case by Deepesh Garg · 3 years, 10 months ago
  96. 8b7ebe5 fix: Test Case cleanup and fixes by Deepesh Garg · 3 years, 10 months ago
  97. 20133bd fix: Remove comments by Deepesh Garg · 3 years, 10 months ago
  98. 353f8f4 fix: Add test case for YTD by Deepesh Garg · 3 years, 10 months ago
  99. 60b77f9 Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date by Deepesh Garg · 3 years, 10 months ago
  100. 4a8c2c4 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters by Deepesh Garg · 3 years, 10 months ago