Fix: reorder lines problem

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop