TabletDirector-develop

• 

  SchoolSpecialty <schoolspecialty@boxworks.com> 09 Feb 2015 8a1e7972168cd559681c7804c4be23f01092dfe1

  Merge remote-tracking branch 'origin/release/2.0.0' into develop
  Conflicts:
          TabletDirector/Controllers/BatchController.cs
          TabletDirector/Views/Location/Edit.cshtml
          TabletDirector/Views/Order/_DailyShippingList.cshtml
• 

  SchoolSpecialty <schoolspecialty@boxworks.com> 09 Feb 2015 54cdd573dea7aa7acd24befb96218922411965ee

  Merge commit 'd8029cf3001fda0f1736a2a0fcc39d69d680c3a7' into develop
  Conflicts:
          TabletDirector/Views/Batch/Index.cshtml
• 

  SchoolSpecialty <schoolspecialty@boxworks.com> 09 Feb 2015 51af9d254ec5e2d607232c055a4a5c0fc0f3666d

  Merge commit '1c2df0d5e7a97616b2c5f67d268ca22f766f7f0f' into develop
• 

  David Butt 09 Feb 2015 0810f42b8d5d2ad30560eab52ba88023904193fe

  other misc files.

  • TabletDirector/TabletDirector.csproj (diffs)
  • TabletDirector/Views/OrderArchive/_ArchiveList.cshtml (diffs)
• 

  David Butt 09 Feb 2015 cdb9421b8cc3f849dc744d4b933dc39f79bc2f5c

  forgot a file

  • TabletDirector/Controllers/BatchController.cs (diffs)
• 

  David Butt 09 Feb 2015 59241029f088f195fe3c0fef5e57c620c33d235b

  WM-282 fixed batch status if no device is selected. WM-302 fixed filter system to be AND instead of OR

  • TabletDirector/Controllers/BatchController.cs (diffs)
• 

  David Butt 06 Feb 2015 966984b4fe605d3ab720cd077d6c663c2aee2cf2

  WM-313 fixed time to show local time instead of UTC WM-279 commented out the rest of the lines that updated the item master

  • TabletDirector/API/OrderApiController.cs (diffs)
  • TabletDirector/Views/Order/_DailyShippingList.cshtml (diffs)
• 

  David Butt 06 Feb 2015 b17d53423a56a7b9b4b5053b8625f15e3f04488b

  WM-279 commented out lines that are updating the ItemMaster on import of orders WM-304 Added !=LocationType.Hold to the where clause so it will not use hold locations for allocation. WM-308 same as WM-304

  • TabletDirector/API/OrderApiController.cs (diffs)
  • TabletDirector/LocalServices/AllocationServiceBase.cs (diffs)
• 

  Clint Furse 05 Feb 2015 4981418700c981674735a4b02bf9f600440343ed

  fixed HomeAllocation crash.  WM-291

  • TabletDirector/LocalServices/AllocationServiceHome.cs (diffs)
• 

  David Butt 05 Feb 2015 6656aa9aebf406ad16ae0e7e75cffee48d729bda

  WM-303 changed this to an "and" function WM-306 summed orders to use for allocation location selection WM-277 fixed date time to use local time for created date

  • TabletDirector/Controllers/BatchController.cs (diffs)
  • TabletDirector/LocalServices/AllocationServiceMinGrab.cs (diffs)
  • TabletDirector/Views/Location/Edit.cshtml (diffs)
• 

  David Butt 04 Feb 2015 d8029cf3001fda0f1736a2a0fcc39d69d680c3a7

  Added "No Device" logic to Batch Index page WM-303

  • TabletDirector/Controllers/BatchController.cs (diffs)
  • TabletDirector/Views/Batch/Index.cshtml (diffs)
• 

  SchoolSpecialty <schoolspecialty@boxworks.com> 04 Feb 2015 1c2df0d5e7a97616b2c5f67d268ca22f766f7f0f

  Figuring things out and made changes to the Location model for WM-305

  • TabletDirector/Models/DatabaseModels/Location.cs (diffs)
  • TabletDirector/TabletDirector.csproj (diffs)