Fix phpunit to be compatible with new version of phpunit
FIX alert for customer order wasn't on delivery_date if exist
Fix: [ bug #1393 ] PHP Warning when creating a supplier invoice.
Merge pull request #1603 from marcosgdf/bug-1393

Fix: [ bug #1393 ] PHP Warning when creating a supplier invoice.
Merge pull request #1602 from atm-alexis/3.5

FIX alert for customer order wasn't on delivery_date if exist
Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
	test/phpunit/CoreTest.php
	test/phpunit/Functions2Test.php
	test/phpunit/FunctionsTest.php
Fix: Box was not added on correct side
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5_mcneil

Conflicts:
	htdocs/commande/class/commande.class.php