Update integrate admin and warehouse

Erdianti Wigarequested to merge
warehouse into development

Fixing error message for wrong type Fixing cancel button

Merge request reports