Select Shipping Method in Propal
Select delivery method for order
The delivery method is transmited in shipment
Some cleaning
Add restriction to combo box
Merge remote branch 'upstream/develop' into selectdelivery

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Merge remote branch 'upstream/develop' into selectdelivery
Merge pull request #1771 from frederic34/selectdelivery

Select Shipping Method in Propal, Order