TabletDirector-develop

• 

  David Butt 06 Jul 2016 538d42a2223f8e8c3a5b9c9b2f48c381898fc974

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

  David Butt 06 Jul 2016 8883ae4e1c60aa214960946b6b744b64f1d21279

  fix error message for deleting item with inventory

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

  David Butt 05 Jul 2016 2b26b5817a181b72bc1cd4f42d4f944b34db2d65

  should now return error message if cannot delete item due to inventory

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

  David Butt 05 Jul 2016 a8d55e01f69ebe1312eca65dab75afb99685b31b

  Deleting items now cleans up all records

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

  David Butt 01 Jul 2016 066797a5a917e8acc487fe9daba63efd8f5b7888

  WM-1115 WM-1168

  • TabletDirector/Controllers/ItemMasterController.cs (diffs)
  • TabletDirector/Controllers/WebServiceController.cs (diffs)
  • TabletDirector/Views/Attribute/Delete.cshtml (diffs)