Corrected delivery note views
Added changes in controller
Removed conflicts