Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php

member page.

develop

Conflicts:
	htdocs/main.inc.php

Fix: Use hooks (Multicompany)

should prefer use the hook afterLogin or afterLoginFailed instead.

Fix: change encrypt/decrypt method for avoid division by zero

FIX #3091 TotalHT amount in supplier order is bold unlike the rest of

Transifex Syncro

Merge branch 'develop-patch43' of https://github.com/aspangaro/dolibarr into aspangaro-develop-patch43

Conflicts:
	htdocs/contact/list.php

New: Possibility to add javascript in main login page with

"getLoginPageOptions" hook

Dolibarr

Fix: missing table

Fix: for avoid error with function "complete_head_from_modules"

table title line (works only with theme menu eldy).