Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/errors.lang

FIX #6227 Document models table header "Unit" is shown in 2 lines in Spanish

Fix: Accountancy - Problem on quadratus export

FIX: Deposits and credit notes weren't added in column invoices list

Conflicts:
	htdocs/admin/dict.php
	htdocs/product/price.php

FIX: Setting supplier as client when accept a supplier proposal

FIX : HT and TTC price should always be displayed together

GETPOST instead of $_GET

FIX : wrong test on dict.php

Fix: missing date locale and date rfc

Conflicts:
	htdocs/core/class/CMailFile.class.php
	htdocs/langs/en_US/errors.lang

Conflicts:
	htdocs/product/class/product.class.php