fixed orderWindow reset values
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
added reset of values for generate order window