Merge branch 'bug-1826' of https://github.com/marcosgdf/dolibarr into

3.6

Conflicts:
	ChangeLog

ChangeLog

@@ -23,7 +23,7 @@ English Dolibarr ChangeLog
 - Fix: [ bug #1827 ] Tax reports gives incorrect amounts when using external modules that create lines with special codes
 - Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
 - Fix: [ bug #1832 ] SQL error when adding a product with no price defined to an object
-- Fix: [ bug #1826 ] Supplier payment types are not translated in fourn/facture/paiement.php
+- Fix: [ bug #1826 ] Supplier payment types are not translated into fourn/facture/paiement.php
 
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.