Conflicts:
	ChangeLog

FIX 1794 Error when cloning Proposal gives error in a malformed page

reenable search criteria in sql clause

FIX facturestat bad sql when customer view is limited

FIX error in SQL due to a previous fix

Fix #3471 3.5 Rounding issue when dispatching non-integer

Fix multientity stock management (F.Henry followup)

3.6

Fix [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask

Close #2893

Conflicts:
	htdocs/filefunc.inc.php

FIX: The hours of date filter aren't correct

Fix #3442 Remove useless syslog

Fix #3448 Pass expected date format