Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6

This commit is contained in:
Maxime Kohlhaas 2015-08-06 08:57:52 +02:00
commit e13515e59f

View File

@ -419,7 +419,7 @@ else
// State
print '<tr><td>'.$langs->trans('State').'</td><td>';
if ($account->fk_departement > 0) print getState($account->fk_departement);
if ($account->state_id > 0) print getState($account->state_id);
print '</td></tr>';
// Conciliate