projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved a comment.
[timetracker.git]
/
WEB-INF
/
lib
/
ttTeamHelper.class.php
diff --git
a/WEB-INF/lib/ttTeamHelper.class.php
b/WEB-INF/lib/ttTeamHelper.class.php
index
e726b92
..
6f716f5
100644
(file)
--- a/
WEB-INF/lib/ttTeamHelper.class.php
+++ b/
WEB-INF/lib/ttTeamHelper.class.php
@@
-500,6
+500,9
@@
class ttTeamHelper {
// getPredefinedExpenses - obtains predefined expenses for team.
static function getPredefinedExpenses($team_id) {
// getPredefinedExpenses - obtains predefined expenses for team.
static function getPredefinedExpenses($team_id) {
+ global $user;
+ $replaceDecimalMark = ('.' != $user->decimal_mark);
+
$mdb2 = getConnection();
$result = array();
$mdb2 = getConnection();
$result = array();
@@
-508,6
+511,8
@@
class ttTeamHelper {
$result = array();
if (!is_a($res, 'PEAR_Error')) {
while ($val = $res->fetchRow()) {
$result = array();
if (!is_a($res, 'PEAR_Error')) {
while ($val = $res->fetchRow()) {
+ if ($replaceDecimalMark)
+ $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
$result[] = $val;
}
return $result;
$result[] = $val;
}
return $result;
@@
-810,9
+815,9
@@
class ttTeamHelper {
$inactive_teams = array();
$mdb2 = getConnection();
$inactive_teams = array();
$mdb2 = getConnection();
- // Get all team ids for teams created or modified more than
1 year
ago.
+ // Get all team ids for teams created or modified more than
6 months
ago.
// $ts = date('Y-m-d', strtotime('-1 year'));
// $ts = date('Y-m-d', strtotime('-1 year'));
- $ts = date('Y-m-d', strtotime('-
4
month'));
+ $ts = date('Y-m-d', strtotime('-
6
month'));
$sql = "select id from tt_teams where timestamp < '$ts' order by id";
$res = $mdb2->query($sql);
$sql = "select id from tt_teams where timestamp < '$ts' order by id";
$res = $mdb2->query($sql);