Merge branch 'develop' into FIX_inventory

htdocs/accountancy/admin/accountmodel.php

htdocs/adherents/subscription.php

htdocs/admin/mails_templates.php

htdocs/comm/mailing/cibles.php

htdocs/comm/mailing/class/mailing.class.php

htdocs/comm/propal/class/api_proposals.class.php

htdocs/core/class/ctyperesource.class.php

htdocs/core/class/html.form.class.php

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

htdocs/core/class/html.formmailing.class.php

htdocs/core/lib/functions.lib.php

htdocs/core/lib/pdf.lib.php

htdocs/core/modules/modResource.class.php

htdocs/langs/en_US/main.lang

htdocs/langs/en_US/resource.lang

htdocs/product/inventory/card.php