Fix categories bug

When using the string type,
$typeid == 1 matched all strings making other conditions ineffective.
Fix #1544: Can remove date from invoice
Updated category fix

Categories ID can be passed as strings
PSR code formatting
Fix : VAT and NPR rates where coming from multiprice...
Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5
Fix: Minimum size for captcha
Fix: broken feature: add param for use only "disabled" with delConstant
and "enabled" with setConstant
Merge pull request #1828 from atm-maxime/3.5

Fix : VAT and NPR rates where coming from multiprice...
Fix: backlink was wrong after deleting product or service.
Fix: define new ref before trigger
Fix :: Sql problem for fresh install on resource table // Ok in migration script
Merge branch 'Upstream/3.6'
Merge branch 'fix_1544' of github.com:KreizIT/dolibarr into
KreizIT-fix_1544

Conflicts:
	ChangeLog
Merge branch 'KreizIT-fix_1544' into 3.5
Merge branch 'Upstream/3.6'
FIX error sql on update ficheinter
Merge pull request #1844 from atm-alexis/3.5

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