Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

ChangeLog

htdocs/comm/action/class/actioncomm.class.php

htdocs/comm/action/index.php

htdocs/comm/remise.php

htdocs/comm/remx.php

htdocs/core/class/discount.class.php

htdocs/core/class/html.form.class.php

htdocs/install/mysql/migration/3.9.0-4.0.0.sql

htdocs/install/mysql/tables/llx_societe_remise.sql

htdocs/install/mysql/tables/llx_societe_remise_except.sql

htdocs/install/upgrade2.php

htdocs/langs/en_US/install.lang

htdocs/societe/class/societe.class.php