Merge pull request #192 from delcroip/develop

rev 4.5.4
delcroip · Jun 29, 2022 · 76356dc · funsurfer2008 · Jul 14, 2022 · 76356dc
2 parents 9e6a9af + 15c5fa2
commit 76356dc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/htdocs/timesheet/ChangeLog.md b/htdocs/timesheet/ChangeLog.md
@@ -1,4 +1,9 @@
 # dolibarr_project_timesheet changelog
+4.5.4
+- fix: save and next
+- fix: update progress only #190
+- fix: calcualte total lines
+
 4.5.3
 - better adaptative header size in PDF
 

diff --git a/htdocs/timesheet/Timesheet.php b/htdocs/timesheet/Timesheet.php
@@ -50,7 +50,7 @@
 $postUserId = GETPOST('userid', 'int');
 $submitted = GETPOST('submit', 'alpha');
 $submitted_next = GETPOST('submit_next', 'alpha');
-$save_next = GETPOST('save_next', 'alpha');
+$saved_next = GETPOST('save_next', 'alpha');
 $tsUserId = GETPOST('tsUserId', 'int');
 
 $admin = $user->admin || $user->rights->timesheet->timesheet->admin;

diff --git a/htdocs/timesheet/class/TimesheetTask.class.php b/htdocs/timesheet/class/TimesheetTask.class.php
@@ -1250,7 +1250,7 @@ public function postTaskTimeActual($timesheetPost, $userId, $Submitter, $token,
             + $_SESSION['timesheet'][$token]['timeSpendDeleted'] 
             + $_SESSION['timesheet'][$token]['timeSpendCreated']) ;
         # update the time used on the task level
-        if ($nbUpdate > 0) {
+        if (($nbUpdate + $progressUpdate) > 0) {
             $this->updateTimeUsed();
             if ($progressUpdate)$_SESSION['timesheet'][$token]['ProgressUpdate']++;
         }

diff --git a/htdocs/timesheet/core/js/timesheet.js b/htdocs/timesheet/core/js/timesheet.js
@@ -121,7 +121,7 @@ function updateAll(){
               TotalList[i].innerHTML = minutesToHTML(total);
           }
     }
-    //updateAllLinesTotal();
+    updateAllLinesTotal();
 }
 
 

diff --git a/htdocs/timesheet/core/modules/modtimesheet.class.php b/htdocs/timesheet/core/modules/modtimesheet.class.php
@@ -54,7 +54,7 @@ public function __construct($db)
 		        $this->editor_name = 'Patrick Delcroix';
 		        $this->editor_url = 'https://github.com/delcroip';
                 // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-                $this->version = '4.5.3';
+                $this->version = '4.5.4';
                 // Key used in llx_cons table to save module status enabled/disabled(where timesheet is value of property name of module in uppercase)
                 $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
                 // Where to store the module in setup page(0=common, 1=interface, 2=others, 3=very specific)
-Original file line number
+Diff line change
@@ Expand Up / @@ -121,7 +121,7 @@ function updateAll(){ @@
                   TotalList[i].innerHTML = minutesToHTML(total);
               }
         }
-        //updateAllLinesTotal();
+        updateAllLinesTotal();
     }
@@ Expand Down @@