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