TabletDirector-develop

• 

  David Butt 07 Dec 2017 7889441f2ed7b7084b68575dce6200f686e747b6

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

  David Butt 07 Dec 2017 9b1b295f517c49479bf676957c5b608aaa206d95

  fixed item description loop hole

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

  David Butt 07 Dec 2017 0894b1814a18d5c4639f564aca7c7cd4ca991d9f

  added master item to item manager grid

  • TabletDirector/API/InventoryApiController.cs (diffs)
  • TabletDirector/Controllers/ItemMasterController.cs (diffs)
  • TabletDirector/Views/ItemMaster/ItemManager.cshtml (diffs)
• 

  David Butt 07 Dec 2017 69e45d8c7192b93bc43eb53414e6823b53ed9fe6

  exposed Master Item field to group items together

  • TabletDirector/API/InventoryApiController.cs (diffs)
  • TabletDirector/API/ItemApiController.cs (diffs)
  • TabletDirector/Models/DatabaseModels/ItemMaster.cs (diffs)
  • TabletDirector/Models/ImportModels/ImportItemMaster.cs (diffs)
  • TabletDirector/Views/ItemMaster/Create.cshtml (diffs)
  • TabletDirector/Views/ItemMaster/Edit.cshtml (diffs)
• 

  David Butt 06 Dec 2017 0264addeff4bf85a0c4e4bcbe7158205a9400ade

  bumped version number

  • TabletDirector/Properties/AssemblyInfo.cs (diffs)
• 

  David Butt 06 Dec 2017 496d857ce5092380ca071e4b3e0724580deb997d

  WM-2271 WM-2321

  • TabletDirector/API/InventoryApiController.cs (diffs)
  • TabletDirector/API/ItemApiController.cs (diffs)
  • TabletDirector/Controllers/ReportsController.cs (diffs)