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

This commit is contained in:
Laurent Destailleur 2019-05-03 12:08:52 +02:00
commit d9a9c1a086
2 changed files with 2 additions and 1 deletions

View File

@ -968,6 +968,7 @@ if ($resql)
print '&nbsp'; print '&nbsp';
} }
print '</td>'; print '</td>';
if (! $i) $totalarray['nbfield']++;
} }
// Extra fields // Extra fields

View File

@ -200,7 +200,7 @@ if ($action == 'confirm_delete' && ! empty($permissiontodelete))
} }
$result=$object->delete($user); $result=$object->delete($user);
var_dump($result); //var_dump($result);
if ($result > 0) if ($result > 0)
{ {
// Delete OK // Delete OK