Fix margin calculation problem
Fix: CRLF
Fix bug on PgSQL if user in on another entity than 1
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
Fix Trad Fr
Fix trigger call ficher inter create
Merge pull request #916 from FHenry/3.3

Fix margin calculation problem
Fix: regression
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/margin/agentMargins.php
	htdocs/margin/tabs/productMargins.php