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

Conflicts:
	htdocs/societe/rib.php
This commit is contained in:
Laurent Destailleur 2016-11-06 14:47:05 +01:00
commit 3ae4ecfb99

View File

@ -62,6 +62,10 @@ $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
$hookmanager->initHooks(array('thirdpartybancard','globalcard'));
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('thirdpartybancard'));
/*
* Actions