TabletDirector-develop

• 

  David Butt 01 Jul 2016 e4eb7d80a2167c3526337da94091916c4f7ef00c

  Merge remote-tracking branch 'origin/2.6' into Trunk
• 

  David Butt 01 Jul 2016 b77f9b3b7e00554d181ee0eb12f0c34c0a1e98fc

  restock underway

  • TabletDirector/Controllers/LocationController.cs (diffs)
  • TabletDirector/Controllers/ReportsController.cs (diffs)
  • TabletDirector/Models/ServiceModels/RestockLocation.cs (diffs)
  • TabletDirector/Services/InventoryService.cs (diffs)
  • TabletDirector/TabletDirector.csproj (diffs)
  • TabletDirector/Views/Location/_LocationList.cshtml (diffs)
  • TabletDirector/Views/Reports/Index.cshtml (diffs)
  • TabletDirector/Views/Reports/Restock.cshtml (diffs)
  • TabletDirector/Views/Shared/_MenuPartial.cshtml (diffs)
  • TabletDirector/web.config (diffs)
• 

  David Butt 01 Jul 2016 bab547341a8b41ee447334c49821e2baa2d3c836

  git ingnore setting update

  • .gitignore (diffs)
• 

  David Butt 01 Jul 2016 0dd927e98802c54b6fed482aea611b625572e59e

  stuff to complete 2.6... i dont remember all of it

  • .vs/config/applicationhost.config (diffs)
  • TabletDirector/Controllers/ItemMasterController.cs (diffs)
  • TabletDirector/Controllers/LocationController.cs (diffs)
  • TabletDirector/Controllers/WebServiceController.cs (diffs)
  • TabletDirector/Views/Location/_LocationList.cshtml (diffs)