Merge remote-tracking branch 'upstream/3.5_backported' into develop

Conflicts:
	htdocs/admin/barcode.php
	htdocs/barcode/codeinit.php
	htdocs/barcode/printsheet.php
	htdocs/comm/fiche.php
	htdocs/comm/propal.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/deplacement/fiche.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/barcode/doc/phpbarcode.modules.php
	htdocs/core/modules/barcode/mod_barcode_product_standard.php
	htdocs/core/modules/barcode/modules_barcode.class.php
	htdocs/core/tpl/notes.tpl.php
	htdocs/fourn/class/fournisseur.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/products.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/product/class/product.class.php
	htdocs/product/fiche.php
	htdocs/product/price.php
	htdocs/projet/class/project.class.php
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.phpMerge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php