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
Presentation invoice page
order task on pdf
Fix categories creation
Updated Vagrant Puphpet box
Update expedition.class.php

fetch line on expedition in the same order than the customer order
Fix: phpunit test
Merge pull request #1771 from frederic34/selectdelivery

Select Shipping Method in Propal, Order
Merge pull request #1779 from aspangaro/develop-patch1

Presentation from invoice page
Merge pull request #1780 from icfr/develop

order task on pdf
Merge pull request #1781 from GPCsolutions/categoriesfix

Fix categories creation
Merge pull request #1782 from marcosgdf/vagrant

Updated Vagrant Puphpet box
Merge pull request #1785 from defrance69/patch-9

Update expedition.class.php
Merge branch 'Upstream/develop'