Print IPP
print ipp
Print IPP
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	htdocs/commande/fiche.php
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' of https://github.com/frederic34/dolibarr into
frederic34-develop

Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php