Fix :: Sql problem for fresh install on resource table // Ok in migration script
Merge branch 'Upstream/3.6'
Merge branch 'Upstream/3.6'
Fix unable to delete order line

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=
Merge branch 'Upstream/3.6'
Fix llx_c_type_resource when you update from a 3.6-beta
Fix: error with php strict mode
Fix: strict mode anarchy ;-)
check your variable please
Fix: Bad unique key
Merge pull request #1851 from grandoc/3.6

fix : missing translation
Merge pull request #1846 from aspangaro/3.6

Fix :: llx_c_type_resource when you update from a 3.6-beta
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6

Conflicts:
	htdocs/install/mysql/tables/llx_c_type_resource.key.sql
Merge pull request #1845 from Cubexed/patch-1

Fix unable to delete order line
Fix: sql request with pgsql
Fix error management: When an error is returned by hooks into
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: Salary payments are not reflected on the reporting sheets
Fix: another strict mode alert
Fix: php strict mode saga
maj copyright
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6