Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3

ChangeLog

build/obs/README

htdocs/comm/propal.php

htdocs/compta/prelevement/class/rejetprelevement.class.php

htdocs/compta/prelevement/ligne.php

htdocs/core/class/commonobject.class.php

htdocs/core/db/mysql.class.php

htdocs/core/db/mysqli.class.php

htdocs/core/lib/json.lib.php

...odules/mailings/thirdparties_services_expired.modules.php

htdocs/core/modules/modMargin.class.php

htdocs/core/tpl/ajax/fileupload_main.tpl.php

htdocs/core/tpl/freeproductline_create.tpl.php

htdocs/core/tpl/objectline_view.tpl.php

htdocs/core/tpl/predefinedproductline_create.tpl.php

htdocs/fichinter/fiche.php

htdocs/langs/ca_ES/errors.lang

htdocs/langs/en_US/errors.lang

htdocs/langs/es_ES/errors.lang

htdocs/langs/fr_FR/errors.lang