Merge branch 'upstream/develop'

.tx/config

ChangeLog

htdocs/categories/admin/categorie.php

htdocs/categories/admin/categorie_extrafields.php

htdocs/categories/class/categorie.class.php

htdocs/categories/edit.php

htdocs/categories/fiche.php

htdocs/categories/viewcat.php

htdocs/compta/bank/account.php

htdocs/compta/charges/index.php

htdocs/compta/deplacement/fiche.php

htdocs/compta/deplacement/index.php

htdocs/compta/hrm.php

htdocs/compta/index.php

htdocs/compta/prelevement/index.php

htdocs/compta/salaries/class/paymentsalary.class.php

htdocs/compta/salaries/fiche.php

htdocs/compta/salaries/index.php

htdocs/core/class/menubase.class.php

htdocs/core/js/lib_batch.js