Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX updateTotal timesheet.js (#29846)

Browse Source 
In some cases, calculation of nbextradays in total is wrong, because the extra hours accumulated by the current task minutes are not considered.
This commit is contained in:
Josep Lluís 2024-06-05 14:56:30 +02:00 committed by GitHub
parent 5b6bbb3479
commit 21aa3ba43e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/js/timesheet.js
View File

@ -1,6 +1,6 @@
/* Copyright (C) 2014 delcroip <delcroip@gmail.com>
* Copyright (C) 2015-2017 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2021 Josep Lluís Amador <joseplluis@lliuretic.cat>
* Copyright (C) 2021-2024 Josep Lluís Amador <joseplluis@lliuretic.cat>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -144,9 +144,10 @@ function updateTotal(days,mode)
}
if (result >= 0)
{
nbextradays = nbextradays + Math.floor((total.getHours()+taskTime.getHours() + result*24) / 24);
nbextrahour = Math.floor((total.getMinutes()+taskTime.getMinutes()) / 60);
nbextradays = nbextradays + Math.floor((total.getHours()+taskTime.getHours() + nbextrahour + result*24) / 24);
//console.log("i="+i+" result="+result);
total.setHours(total.getHours()+taskTime.getHours());
total.setHours(total.getHours()+taskTime.getHours());
total.setMinutes(total.getMinutes()+taskTime.getMinutes());
//console.log("i="+i+" nbextradays cumul="+nbextradays+" h="+total.getHours()+" "+taskTime.getHours());
}
@ -170,7 +171,8 @@ function updateTotal(days,mode)
}
if (result >= 0)
{
nbextradays = nbextradays + Math.floor((total.getHours()+taskTime.getHours() + result*24) / 24);
nbextrahour = Math.floor((total.getMinutes()+taskTime.getMinutes()) / 60);
nbextradays = nbextradays + Math.floor((total.getHours()+taskTime.getHours() + nbextrahour + result*24) / 24);
//console.log("i="+i+" result="+result);
total.setHours(total.getHours()+taskTime.getHours());
total.setMinutes(total.getMinutes()+taskTime.getMinutes());