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

Conflicts: htdocs/langs/en_US/errors.lang
2026-02-07 16:41:48 +01:00 · 2018-02-08 17:27:36 +01:00
parent 493a9a7289 d10d9f0fb2
commit 26ee7ec5be
7 changed files with 9 additions and 5 deletions
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -162,6 +162,7 @@ class Interventions extends DolibarrApi
        {
            $num = $db->num_rows($result);
            $min = min($num, ($limit <= 0 ? $num : $limit));
+            $i = 0;
            while ($i < $min)
            {
                $obj = $db->fetch_object($result);