Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop

ChangeLog

dev/iso-normes/locales.txt

dev/translation/txpull.sh

dev/translation/txpush.sh

htdocs/admin/compta.php

htdocs/admin/facture.php

htdocs/admin/index.php

htdocs/compta/journal/purchasesjournal.php

htdocs/contact/fiche.php

htdocs/core/class/html.formmail.class.php

htdocs/core/lib/price.lib.php

htdocs/core/modules/facture/mod_facture_mars.php

htdocs/core/modules/facture/mod_facture_mercure.php

htdocs/core/modules/facture/mod_facture_terre.php

htdocs/langs/ca_ES/admin.lang

htdocs/langs/ca_ES/agenda.lang

htdocs/langs/ca_ES/bills.lang

htdocs/langs/ca_ES/boxes.lang

htdocs/langs/ca_ES/categories.lang

htdocs/langs/ca_ES/compta.lang