Fix :: MySql Problem when create a salary payment
Merge branch 'upstream/develop'
Fix :: Key language "Thirdparty" not traduced when module thirdparty is deactivated
Type bank & tva
Merge branch 'upstream/develop'
Merge branch 'upstream/develop'
TVA : Add type_payment & num_payment who are missing
Salaries : typo & presentation
Changelog
Move module trips into family "hr"
Social contrib. :: Replace index.php by $_SERVER["PHP_SELF"]
TVA :: Add sortfield & search
Translation
Salaries payments :: Add sortfield & search
Merge branch 'develop' of github.com:aspangaro/dolibarr into
aspangaro-develop

Conflicts:
	ChangeLog
Merge branch 'aspangaro-develop' into develop