FIX #5853 $conf->global->$calc==0 || $conf->global->$calc==1

FIX : delete contract extrafields on contract deletion

Fix: missing encrypt data for llx_const

FIX #5966 Bug: getNomUrl tooltips show Proposal info even if user has no rights to read them

Update companies.lang

Ajout du Gabon

FIX external access of fckeditor image (external emailing)

Fix: missing path of user photo

Fix : vars were not set after commande function

Fix bad parameter in hook call

FIX: #5907 No translation string for PDF Proposal

FIX : margin tab on customer card must filter on current entity invoices

Conflicts:
	htdocs/core/lib/functions.lib.php

Conflicts:
	htdocs/core/lib/functions.lib.php

Fix: Bad localtaxes calc for Spain if VAT is 0. For >= 3.9.x

Fix: Bad localtaxes calc for Spain if VAT is 0