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
Merge pull request #1241 from atm-maxime/develop

Fix : wrong contact list was used for cc and ccc in formmail
Fix: Calculation of second rounding method is available for supplier
invoices.
Doxygen: More comments
Work on openif authentication mode
Fix: bad condition
Fix: bad condition

Conflicts:
	htdocs/societe/societe.php
Fix: select
Fix doxygen
Change for debian
Fix for debian package
Change for debian