1. 51d45d8 Fixed merge conflict by Nabin Hait · 8 years ago
  2. 01baceb Revert "proposed usage of daterange picker" by Nabin Hait · 8 years ago
  3. 6e9d2a3 fixed conflict by Nabin Hait · 8 years ago
  4. a2fae84 Merge pull request #7410 from RobertSchouten/timesheet_overlap_validation by Nabin Hait · 8 years ago
  5. 802b435 Fetch same items multiple times from source doc if all qty not processed by Nabin Hait · 8 years ago
  6. 138c2f6 [fix] timesheet overlap validation not including modified timesheet by robert schouten · 8 years ago
  7. 81130e8 proposed usage of daterange picker by robert schouten · 8 years ago
  8. 4573029 Merge pull request #7292 from frappe/bcornwellmott-patch-1 by Nabin Hait · 8 years ago
  9. 58291c7 Fixed version conflict by Nabin Hait · 8 years ago
  10. c2d66bd Merge branch 'master' into develop by Nabin Hait · 8 years ago
  11. e549984 Grabs title from SQL by bcornwellmott · 8 years ago
  12. 3385bd4 Add hours to label in calendar view by bcornwellmott · 8 years ago
  13. 1af1a43 [Enhancement] Setting to maintain the work hours and bill hours same on the timesheet by Rohit Waghchaure · 8 years ago
  14. b79aa1d [Minor] Read permissions to Employee on Activity Type and Appraisal Template by Kanchan Chauhan · 8 years ago
  15. a72841e Show only Project tasks in depends on tasks by Kanchan Chauhan · 8 years ago
  16. f5460e9 Merge pull request #6846 from KanchanChauhan/payroll-updates by Nabin Hait · 8 years ago
  17. 1b9caf9 Merge branch 'master' into develop by Nabin Hait · 8 years ago
  18. f7b25cb [WIP] Payroll Updates by Kanchan Chauhan · 8 years ago
  19. 86ed030 minor issue by Rohit Waghchaure · 8 years ago
  20. 0327b35 [fix] timesheet datetime issue by Rohit Waghchaure · 8 years ago
  21. 5c18bd9 Fixed merge conflict by Nabin Hait · 8 years ago
  22. 12a396e Merge pull request #7107 from RobertSchouten/timesheetdates by Nabin Hait · 8 years ago
  23. 323c06e [minor] rename icons as per FontAwesome 4 (#7136) by Rushabh Mehta · 8 years ago
  24. c92e2f9 Update project_wise_stock_tracking.json by Nabin Hait · 8 years ago
  25. 81a5467 [fix] Project wise Stock Tracking is script report by robert schouten · 8 years ago
  26. 0beb5bd calc timesheet dates on validate not just submit by robert schouten · 8 years ago
  27. 7f3da5d Fixed merge conflict by Nabin Hait · 8 years ago
  28. 8c4e45a cleanup timesheet by Rohit Waghchaure · 8 years ago
  29. 4e61564 [minor] fixes to daily work summary formatting by Rushabh Mehta · 8 years ago
  30. d4e8b29 Merge pull request #6784 from RobertSchouten/calendar_fix by Nabin Hait · 8 years ago
  31. a469e65 Fixed merge conflict by Nabin Hait · 8 years ago
  32. 13fc52d [minor] added default standard filters (#6854) by Rushabh Mehta · 8 years ago
  33. 0ecad33 cleanup and fixes by Rohit Waghchaure · 8 years ago
  34. 81f7a26 Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value by Nabin Hait · 8 years ago
  35. 0d2f7e6 set remember last selected value as true for company field by Rohit Waghchaure · 8 years ago
  36. 3844d2c Remember last selected value for link field by Rohit Waghchaure · 8 years ago
  37. e32e212 gantt fix by robert schouten · 8 years ago
  38. e8c1777 gantt fix by robert schouten · 8 years ago
  39. bb79fc5 [fix] calendar range fixes by robert schouten · 8 years ago
  40. 7ef2c0f Fix calendar view for Timesheet by bcornwellmott · 8 years ago
  41. c00b17a Update project.json by Nabin Hait · 8 years ago
  42. 297e725 Update project.json by Pawan Mehta · 8 years ago
  43. 46ead70 [fix] fixes_6363 by pawan · 8 years ago
  44. 9a43a2a [fix] #6363 by pawan · 8 years ago
  45. 28ad589 [fix] #6363 by pawan · 8 years ago
  46. 8d187de [fix] #6363 by pawan · 8 years ago
  47. fa1cdd5 Fixed merge conflict by Nabin Hait · 8 years ago
  48. 17f6874 [minor] [fix] doctype_dasboard.py files, move data to get_data by Rushabh Mehta · 8 years ago
  49. 395d757 Fixed merge conflict by Nabin Hait · 8 years ago
  50. a0608d4 [gantt] Gantt fixes (#6490) by Faris Ansari · 8 years ago
  51. 558f526 Fixed version conflict by Nabin Hait · 8 years ago
  52. 9ac2fc9 Validate dates, fixes #6542 by Nabin Hait · 8 years ago
  53. b40c0a9 [WIP] Process Payroll Changes by Kanchan Chauhan · 8 years ago
  54. 1e97fc8 Merge pull request #6460 from KanchanChauhan/salary-slip-fixes by Nabin Hait · 8 years ago
  55. a4d19b4 change to link of gantt in project (#6469) by paurosello · 8 years ago
  56. 70b7d32 added required fields in doctypes for gantt (#6466) by Faris Ansari · 8 years ago
  57. 273c5e7 [Fix]Salary Slip can be created without salary structure by Kanchan Chauhan · 8 years ago
  58. e5c7d4b Fixed version conflict by Nabin Hait · 8 years ago
  59. 342ec18 [Fix] Daily timesheet summary permission issue by Rohit Waghchaure · 8 years ago
  60. d5ebd79 Fixed version conflict by Nabin Hait · 8 years ago
  61. e9fa81c Merge pull request #6327 from rohitwaghchaure/timesheet_enhancement by Nabin Hait · 8 years ago
  62. 9c32baa Merge pull request #6355 from rohitwaghchaure/timesheet_calendar_permission_issue by Nabin Hait · 8 years ago
  63. 4bd0818 [Fix] Timesheet calendar permission issue by Rohit Waghchaure · 8 years ago
  64. 1579565 Activity Summary to not show cancelled timesheets on click by superlack · 8 years ago
  65. 0568238 rename total_billing_hours to total_billable_hours in timesheet doctype by Rohit Waghchaure · 8 years ago
  66. 7b6fdb7 rename total_billing_amount to total_billable_amount in timesheet doctype by Rohit Waghchaure · 8 years ago
  67. 6594c84 Added color coding to timesheet calendars (#6269) by bcornwellmott · 8 years ago
  68. 03e5e68 [Fix] Employee name is missing in timesheet by Rohit Waghchaure · 8 years ago
  69. e1d59d6 test cases and minor changes by Rohit Waghchaure · 8 years ago
  70. 1d0e8ea minor changes by Rohit Waghchaure · 8 years ago
  71. c940440 patch and rearrangement of fields by Rohit Waghchaure · 8 years ago
  72. 3815ebf Added %billed in timesheet by Rohit Waghchaure · 8 years ago
  73. a6927e0 set project wise timesheet data by Rohit Waghchaure · 8 years ago
  74. cc8644f [Timesheet] Field rearrange by Rohit Waghchaure · 8 years ago
  75. 406f0a3 Fixed merge conflicts by Nabin Hait · 8 years ago
  76. 8693b5c Minor fixes by Nabin Hait · 8 years ago
  77. b2f0920 [minor] new global for query report filters by Rushabh Mehta · 8 years ago
  78. 2490ea0 Fixed merge conflict by Nabin Hait · 8 years ago
  79. 7f165f1 [Fix] Timesheet employee is missing in patch by Rohit Waghchaure · 8 years ago
  80. a2bf16b [Fix] Billing Hours showing blank on sales invoice by Rohit Waghchaure · 8 years ago
  81. dd96cbd Coded column deleted, column added from UI by Kanchan Chauhan · 8 years ago
  82. 69aebf4 fixes test cases, added patch by Rohit Waghchaure · 8 years ago
  83. 0cb171f [Enhancement] Added billing hours for account user in timesheet by Rohit Waghchaure · 8 years ago
  84. b5951b7 Merge pull request #5924 from KanchanChauhan/salary-structure-changes by Nabin Hait · 8 years ago
  85. bccf0fa [WIP] Formula based Salary Structure and multiple employees for same Salary Structure by Kanchan Chauhan · 8 years ago
  86. 613ef34 Patch fixed for v6 to v7 migration by Nabin Hait · 8 years ago
  87. d643f2b [minor] fixes #6074; by Rushabh Mehta · 8 years ago
  88. ed1b8cf Added a Calendar view for timesheet logs by Ben Cornwell-Mott · 8 years ago
  89. 20b4666 Merge pull request #5958 from rohitwaghchaure/minor_fixes_and_cleanups by Nabin Hait · 8 years ago
  90. 84969bd Merge pull request #6007 from KanchanChauhan/task-json-fixed by Rushabh Mehta · 8 years ago
  91. b77a105 fixes and cleanups. by Rohit Waghchaure · 8 years ago
  92. 93b1f2a [Minor] Removed hard coded success URL by Kanchan Chauhan · 8 years ago
  93. 9a433ff [fix] success_url Issue #6004 by Revant Nandgaonkar · 8 years ago
  94. 4d32d53 Merge pull request #5996 from KanchanChauhan/users-selection-for-project by Rushabh Mehta · 8 years ago
  95. 58bc00f Project Users role not required to add user to the project by Kanchan Chauhan · 8 years ago
  96. a88dec8 [Fix] batch no searching in pos by Rohit Waghchaure · 8 years ago
  97. e326ae9 Fixed typo by Ben Cornwell-Mott · 8 years ago
  98. 5f59a0a Corrected SQL query by bcornwellmott · 8 years ago
  99. 19cb34c removed test variable by Ben Cornwell-Mott · 8 years ago
  100. 5342ec5 Added employee name to get_employee_list query by Ben Cornwell-Mott · 8 years ago