TabletDirector-develop

• 

  Clint Furse 03 Oct 2014 00325e0a95aac4639d02846f799838126fabd135

  support for image displays on Fusion.  WM-184

  • TabletDirector/Controllers/WebServiceController.cs (diffs)
  • TabletDirector/Models/ServiceModels/SmPoReceive.cs (diffs)
  • TabletDirector/Models/ServiceModels/SmSlot.cs (diffs)
  • TabletDirector/Models/ServiceModels/SmVerify.cs (diffs)
  • TabletDirector/Views/PoDetail/Create.cshtml (diffs)
• 

  Clint Furse 03 Oct 2014 16e9dabdc48df4988d8561801d70839356a55b9f

  preventing duplicate records getting created WM-197

  • TabletDirector/Controllers/ItemMasterController.cs (diffs)
  • TabletDirector/Controllers/LocationController.cs (diffs)
  • TabletDirector/Controllers/ZoneController.cs (diffs)
  • TabletDirector/Views/ItemMaster/Create.cshtml (diffs)
  • TabletDirector/Views/Location/Create.cshtml (diffs)
  • TabletDirector/Views/Zone/Create.cshtml (diffs)
• 

  Clint Furse 03 Oct 2014 8f7b1820d10e4d16090497737f4d4ba9a32a00e5

  Merge branch 'master' into develop
  Conflicts:
          TabletDirector/Controllers/WebServiceController.cs
• 

  Clint Furse 03 Oct 2014 a06f826c66dbef333eb39a2ccb579f7a63daeb66

  picks now have a 3rd order by sequence, Location name.  It is only used if LocationSequence and OrderLine Seq are the same.

  • TabletDirector/Controllers/WebServiceController.cs (diffs)