Fix: Edit propal line was losing product supplier price id
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr into 3.4

Conflicts:
	ChangeLog
Fix: Supplier price displayed on document lines didnt take discount
Merge pull request #1236 from altairis-fr/3.4

Fix: Supplier price displayed on document lines didnt take discount
Fix: bad sql syntax
Fix: Supplier price displayed on document lines and margin infos didnt take discount
Merge pull request #1237 from altairis-fr/3.4

Fix: Supplier price displayed on document lines and margin infos didnt take discount
Fix: bug preventing creation of predefined invoice.
Also added phpunit test to detect it if it occurs again.
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Fix: bad condition

Conflicts:
	htdocs/societe/societe.php
Fix for debian package
Fix: Error in url
Merge remote-tracking branch 'origin/3.3' into 3.4
Merge remote-tracking branch 'origin/3.4' into develop

Conflicts:
	ChangeLog
	build/debian/get-orig-source.sh
	build/debian/watch
	htdocs/fourn/ajax/getSupplierPrices.php