TabletDirector-develop

• 

  David Butt 08 Feb 2018 b88c4736ffb430d07ae63bbb6e3a526062c235e9

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

  David Butt 08 Feb 2018 704024bb539408a17e09cd801e13695bd59688d4

  WM-2471

  • TabletDirector/Models/DatabaseModels/ItemMaster.cs (diffs)
• 

  David Butt 07 Feb 2018 9b7654c30db698e133fdec27ed39af0bc5c39e02

  fixed Inventory issue.

  • TabletDirector/Controllers/WebServiceController.cs (diffs)
  • TabletDirector/Models/DatabaseModels/Inventory.cs (diffs)
• 

  David Butt 07 Feb 2018 5076f5efc81524c4a5cef297d18bdcd1d68dcbe5

  WM-2462 WM-2463

  • TabletDirector/Controllers/OrderController.cs (diffs)
  • TabletDirector/Views/Batch/BatchBuild.cshtml (diffs)
• 

  David Butt 07 Feb 2018 4bd99875e7d2b7430fa37ffdca2cc5aa78878451

  WM-2468

  • TabletDirector/Views/Batch/Edit.cshtml (diffs)
• 

  David Butt 07 Feb 2018 1d6ff5be462037b405e2ac13081cf0db91c4aa44

  fixed db insert not using right context

  • TabletDirector/Controllers/WebServiceController.cs (diffs)