1. 5c18bd9 Fixed merge conflict by Nabin Hait · 8 years ago
  2. 45fda8a Merge pull request #7149 from KanchanChauhan/salary-slip-validation-in-leave by Nabin Hait · 8 years ago
  3. 67d226f Merge pull request #7127 from KanchanChauhan/salary-slip-fix by Nabin Hait · 8 years ago
  4. 9313a74 Merge pull request #7144 from rohitwaghchaure/report_builder_total_row_issue by Nabin Hait · 8 years ago
  5. dc80b35 [Minor] Apply Salary Slip validation only if it is submitted by Kanchan Chauhan · 8 years ago
  6. 6f6a533 [fix] salary slip working days by Rohit Waghchaure · 8 years ago
  7. 36a01d3 [Enhancement] Total row added for report builder by Rohit Waghchaure · 8 years ago
  8. 323c06e [minor] rename icons as per FontAwesome 4 (#7136) by Rushabh Mehta · 8 years ago
  9. 4a888b4 [Fix] lwp issue fixed for salary slip without salary structure by Kanchan Chauhan · 8 years ago
  10. faa525e [Fix] Fixed condition and formula issue in Salary Slip by Kanchan Chauhan · 8 years ago
  11. 4e61564 [minor] fixes to daily work summary formatting by Rushabh Mehta · 8 years ago
  12. 557e7f7 [minor] UX fixes for Daily Work Summary by Rushabh Mehta · 8 years ago
  13. 9dd58d4 [fix] test cases and final wiring for daily work summary by Rushabh Mehta · 8 years ago
  14. c10d2a0 [wip] daily work summary by Rushabh Mehta · 8 years ago
  15. fe816c3 [fix] [wip] daily work summary by Rushabh Mehta · 8 years ago
  16. 46753de fixed merge conflict by Nabin Hait · 8 years ago
  17. d4e8b29 Merge pull request #6784 from RobertSchouten/calendar_fix by Nabin Hait · 8 years ago
  18. 7652b85 [Fix] Filters to get employee in Payroll by Kanchan Chauhan · 8 years ago
  19. 6d04afc fixed merge conflict by Nabin Hait · 8 years ago
  20. 00e841d update missing salary component abbr by Nabin Hait · 8 years ago
  21. 4bfa074 [merge] master by Rushabh Mehta · 8 years ago
  22. 8dfbe7c [fix] patch missing salary component type based on existing salary slips (#6955) by Rushabh Mehta · 8 years ago
  23. 95e6ccd Merge branch 'master' into develop by Nabin Hait · 8 years ago
  24. 598a0c9 [fix] fixed student dashboard issue (#6897) by Nabin Hait · 8 years ago
  25. a469e65 Fixed merge conflict by Nabin Hait · 8 years ago
  26. 13fc52d [minor] added default standard filters (#6854) by Rushabh Mehta · 8 years ago
  27. dd01bcc Get employee details in Salary Slip (#6837) by KanchanChauhan · 8 years ago
  28. f5d8dd3 Fixed merge conflict by Nabin Hait · 8 years ago
  29. 81f7a26 Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value by Nabin Hait · 8 years ago
  30. 63dda84 [Fix] Error in pulling in Salary Structure fixed by Kanchan Chauhan · 8 years ago
  31. 0d2f7e6 set remember last selected value as true for company field by Rohit Waghchaure · 8 years ago
  32. 3844d2c Remember last selected value for link field by Rohit Waghchaure · 8 years ago
  33. e855f53 [minor] fix ellipsis style by Rushabh Mehta · 8 years ago
  34. bb79fc5 [fix] calendar range fixes by robert schouten · 8 years ago
  35. df366a6 Merge pull request #6683 from KanchanChauhan/multiple-active-salary-slio by Nabin Hait · 8 years ago
  36. a964db7 Add multiple emoloyee in salary structure (#6621) by Mainul Islam · 8 years ago
  37. 6ef8ede Merge pull request #6675 from KanchanChauhan/holiday-in-lwp-salaryslip by Nabin Hait · 8 years ago
  38. 5ced4df Merge pull request #6673 from KanchanChauhan/max-leave-days-in-leave-application-hotfix by Nabin Hait · 8 years ago
  39. 8918dcf Merge pull request #6678 from KanchanChauhan/total-leave-days-updated by Nabin Hait · 8 years ago
  40. 29ce0aa Warning if there are mutliple active salary structures by Kanchan Chauhan · 8 years ago
  41. c4c9666 [Fix] Make Bank Entry button depends_on fixed by Kanchan Chauhan · 8 years ago
  42. a084405 Total leave days gets updated on date change by Kanchan Chauhan · 8 years ago
  43. a1006c0 include_holiday being taken into consideration while calculating lwp by Kanchan Chauhan · 8 years ago
  44. 24d5802 [Fix] leave application days should be less than max days leave allowed by Kanchan Chauhan · 8 years ago
  45. bc0783b [fix] duplicate columns in monthly salary report #6623 by Saurabh · 8 years ago
  46. 97fa119 Set prefered contact email in Employee by Nabin Hait · 8 years ago
  47. 0702fa2 Fixed version conflict by Nabin Hait · 8 years ago
  48. ff183ee Fixes for testcases by Nabin Hait · 8 years ago
  49. fa1cdd5 Fixed merge conflict by Nabin Hait · 8 years ago
  50. 17f6874 [minor] [fix] doctype_dasboard.py files, move data to get_data by Rushabh Mehta · 8 years ago
  51. dc86964 Patch fixed for Employee by Kanchan Chauhan · 8 years ago
  52. b3b1219 Fixed merge conflict by Nabin Hait · 8 years ago
  53. 1a96cc1 Fixes 6171 (#6417) by Pawan Mehta · 8 years ago
  54. 81581c6 No Leave allocation for Leave Type for which Leave Without Pay is checked (#6626) by KanchanChauhan · 8 years ago
  55. 395d757 Fixed merge conflict by Nabin Hait · 8 years ago
  56. cd9c45f Fixed merge conflict by Nabin Hait · 8 years ago
  57. 370e711 [Fix] Expense Claim, sanctioned amount not auto-populated from claim amount by Rohit Waghchaure · 8 years ago
  58. 80499bb Fixed merge conflict by Nabin Hait · 8 years ago
  59. 2e31d7c [fix] Validate leave application period with salary slip only if leave type is LWP by Nabin Hait · 8 years ago
  60. b40c0a9 [WIP] Process Payroll Changes by Kanchan Chauhan · 8 years ago
  61. 1e97fc8 Merge pull request #6460 from KanchanChauhan/salary-slip-fixes by Nabin Hait · 8 years ago
  62. 70b7d32 added required fields in doctypes for gantt (#6466) by Faris Ansari · 8 years ago
  63. 273c5e7 [Fix]Salary Slip can be created without salary structure by Kanchan Chauhan · 8 years ago
  64. 147c727 changed from label based to fieldname based by robert schouten · 8 years ago
  65. 96d38ea Merge pull request #6429 from rohitwaghchaure/minor_fix by Nabin Hait · 8 years ago
  66. a7e3d11 [Fix] Image is copied when duplicate supplier, employee by Rohit Waghchaure · 8 years ago
  67. 2142a0a [Fix] Indentation fixed by Kanchan Chauhan · 8 years ago
  68. 521b34c Merge pull request #6413 from KanchanChauhan/salaryslip-docfield-in-condition by Nabin Hait · 8 years ago
  69. 081eab1 Update salary_slip.py by Nabin Hait · 8 years ago
  70. d7721a6 preferred email for payroll by robert schouten · 8 years ago
  71. 9f4ca1f set posting date in salalry slip by Nabin Hait · 8 years ago
  72. 158ac5a Merge pull request #6416 from KanchanChauhan/minor-fix by Nabin Hait · 8 years ago
  73. 77aaa70 [Fix] filters_by_name changed to query_report_filters_by_name by Kanchan Chauhan · 8 years ago
  74. e5057c8 Salary Slip fields in Condition and Formula by Kanchan Chauhan · 8 years ago
  75. b8eef64 Merge pull request #6325 from RobertSchouten/patch-26 by Nabin Hait · 8 years ago
  76. 79fe1fa Merge pull request #6374 from RobertSchouten/salary_register by Nabin Hait · 8 years ago
  77. 33ea19d Merge pull request #6395 from RobertSchouten/payroll_date by Nabin Hait · 8 years ago
  78. 5c41c77 added posting date to process payroll and salary slip by robert schouten · 8 years ago
  79. 56700ae Merge pull request #6356 from KanchanChauhan/job-application-webform by Nabin Hait · 8 years ago
  80. 83d8120 Added Student Admissions (#6359) by Neil Trini Lasrado · 8 years ago
  81. 32c3665 add print format and id to monthly salary register by robert schouten · 8 years ago
  82. 122d079 Job Application web form by Kanchan Chauhan · 8 years ago
  83. fcbb769 Merge pull request #6322 from RobertSchouten/patch-23 by Nabin Hait · 8 years ago
  84. b7c5b76 Merge pull request #6321 from RobertSchouten/patch-22 by Nabin Hait · 8 years ago
  85. f449830 fix allow negatives in leave type check by RobertSchouten · 8 years ago
  86. 2ecddf5 leave balance now fy not calendar by RobertSchouten · 8 years ago
  87. 93c095b allow users without employee with hr permission to view all calendars by RobertSchouten · 8 years ago
  88. e4d3809 allow users without employee with hr permission to view all calendars by RobertSchouten · 8 years ago
  89. 7b2bd20 [fix] #6254 by pawan · 8 years ago
  90. bd9a275 [fix] #6254 by pawan · 8 years ago
  91. d260602 Merge pull request #6202 from KanchanChauhan/component-type-added by Nabin Hait · 8 years ago
  92. 145f87c 'Type' field added to Salary Component by Kanchan Chauhan · 8 years ago
  93. 338e63c Fixed version conflict by Nabin Hait · 8 years ago
  94. 9d1b56f [minor] validate permission in Process Payroll and all products fix for home page by Rushabh Mehta · 8 years ago
  95. 22073f3 Layout changes in Salary Structure by Kanchan Chauhan · 8 years ago
  96. c95a318 Merge pull request #6127 from KanchanChauhan/demo-fixes-salary by Nabin Hait · 8 years ago
  97. 681a86d [Minor]Fixes by Kanchan Chauhan · 8 years ago
  98. db197d5 Demo updated for new salary structure by Kanchan Chauhan · 8 years ago
  99. b5951b7 Merge pull request #5924 from KanchanChauhan/salary-structure-changes by Nabin Hait · 8 years ago
  100. bccf0fa [WIP] Formula based Salary Structure and multiple employees for same Salary Structure by Kanchan Chauhan · 9 years ago