Fix: Edit propal line was losing product supplier price id

Conflicts:
	ChangeLog
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4

Conflicts:
	ChangeLog