Conflicts:
	htdocs/core/ajax/ziptown.php

Fix: Filter on date into export.
Fix: Tooltip help.

dol_move_uploaded_file, message must be returned by function as if it
were an error for any other reason.

Conflicts:
	htdocs/core/lib/files.lib.php

Fix unable to delete order line

Conflicts:
	htdocs/install/mysql/tables/llx_c_type_resource.key.sql

Fix :: llx_c_type_resource when you update from a 3.6-beta

fix : missing translation

check your variable please

Calling trigger without having globalized $conf causes error and cancels delete operation, this commit adds the missing

2014-08-23 16:52:05 ERR     127.0.0.1        Interfaces::run_triggers was called with wrong parameters action=LINEORDER_SUPPLIER_DELETE object=1 user= langs= conf=

Fix :: Sql problem for fresh install on resource table

Fix :: Entries salaries into menu doesn't appears when this module is activated alone - Needed module tax at the moment

are ok. So after trigger call.
If a trigger need to know new information on an object, trigger must
make a fetch on object.

Revert "Fix: define new ref before trigger"

This reverts commit cb2b6e6e.