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

2019-05-03 12:08:52 +02:00 · 2019-05-03 12:08:52 +02:00 · d9a9c1a086
commit d9a9c1a086
parent 9115df7439 4f3a8ad23f
2 changed files with 2 additions and 1 deletions
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@ -968,6 +968,7 @@ if ($resql)
 				print '&nbsp';
 			}
 			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
 		}

 		// Extra fields
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@ -200,7 +200,7 @@ if ($action == 'confirm_delete' && ! empty($permissiontodelete))
    }

    $result=$object->delete($user);
-    var_dump($result);
+    //var_dump($result);
    if ($result > 0)
    {
        // Delete OK