Fix :: Sql problem for fresh install on resource table // Ok in migration script
Merge branch 'Upstream/3.6'
Fix :: Entries salaries into menu doesn't appears when this module is activated alone - Needed module tax at the moment
Fix: Pb with focus position with ckeditor
Fix: menu param is not inside allowed list
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
Merge pull request #1839 from aspangaro/3.6

Fix :: Sql problem for fresh install on resource table
Merge branch 'Upstream/3.6'
FIX error sql on update ficheinter
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 in strict mode
Fix: syntax error
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
Fix: Can upload files on services.
Update changelog
Fix: error with php strict mode
fix : missing translation
fix : missing code for extrafields