[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.bobilling.inc.php,1.8,1.8.4.1
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.bobilling.inc.php,1.8,1.8.4.1 class.bodeliveries.inc.php,1.15.4.1,1.15.4.2 class.boprojecthours.inc.php,1.8.2.1.2.2,1.8.2.1.2.3 class.boprojects.inc.php,1.42.2.5.2.18,1.42.2.5.2.19 class.bostatistics.inc.php,1.3,1.3.4.1 class.sobilling.inc.php,1.11.2.1.2.3,1.11.2.1.2.4 class.sodeliveries.inc.php,1.15.2.1.2.2,1.15.2.1.2.3 class.soprojecthours.inc.php,1.8.4.7,1.8.4.8 class.soprojects.inc.php,1.34.2.6.2.18,1.34.2.6.2.19 class.sostatistics.inc.php,1.5.2.2,1.5.2.2.2.1 class.uibilling.inc.php,1.18.2.6.2.6,1.18.2.6.2.7 class.uideliveries.inc.php,1.21.2.3.2.6,1.21.2.3.2.7 class.uiprojecthours.inc.php,1.22.2.5.2.7,1.22.2.5.2.8 class.uiprojects.inc.php,1.47.2.7.2.20,1.47.2.7.2.21 class.uistatistics.inc.php,1.10.2.2.2.6,1.10.2.2.2.7 |
|
Date: |
Fri, 20 Jun 2003 18:04:35 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv9561/inc
Modified Files:
Tag: Version-0_9_16-branch
class.bobilling.inc.php class.bodeliveries.inc.php
class.boprojecthours.inc.php class.boprojects.inc.php
class.bostatistics.inc.php class.sobilling.inc.php
class.sodeliveries.inc.php class.soprojecthours.inc.php
class.soprojects.inc.php class.sostatistics.inc.php
class.uibilling.inc.php class.uideliveries.inc.php
class.uiprojecthours.inc.php class.uiprojects.inc.php
class.uistatistics.inc.php
Log Message:
update header
Index: class.bobilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.bobilling.inc.php,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -C2 -r1.8 -r1.8.4.1
*** class.bobilling.inc.php 5 Jan 2002 03:26:42 -0000 1.8
--- class.bobilling.inc.php 20 Jun 2003 22:04:32 -0000 1.8.4.1
***************
*** 3,11 ****
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000, 2001 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 3,12 ----
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/
*
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright 2000 - 2003 Free Software Foundation, Inc *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 24,27 ****
--- 25,29 ----
\*******************************************************************/
/* $Id$ */
+ /* $Source$ */
class bobilling
Index: class.bodeliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.bodeliveries.inc.php,v
retrieving revision 1.15.4.1
retrieving revision 1.15.4.2
diff -C2 -r1.15.4.1 -r1.15.4.2
*** class.bodeliveries.inc.php 26 Apr 2003 01:33:45 -0000 1.15.4.1
--- class.bodeliveries.inc.php 20 Jun 2003 22:04:32 -0000 1.15.4.2
***************
*** 3,11 ****
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000,2001,2002 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 3,12 ----
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/
*
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright 2000 - 2003 Free Software Foundation, Inc *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 24,27 ****
--- 25,29 ----
\*******************************************************************/
/* $Id$ */
+ /* $Source$ */
class bodeliveries
Index: class.boprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojecthours.inc.php,v
retrieving revision 1.8.2.1.2.2
retrieving revision 1.8.2.1.2.3
diff -C2 -r1.8.2.1.2.2 -r1.8.2.1.2.3
*** class.boprojecthours.inc.php 10 Jun 2003 22:37:16 -0000
1.8.2.1.2.2
--- class.boprojecthours.inc.php 20 Jun 2003 22:04:32 -0000
1.8.2.1.2.3
***************
*** 3,11 ****
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000,2001,2002 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 3,12 ----
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/
*
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright 2000 - 2003 Free Software Foundation, Inc *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 24,27 ****
--- 25,29 ----
\*******************************************************************/
/* $Id$ */
+ // $Source$
class boprojecthours
Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.42.2.5.2.18
retrieving revision 1.42.2.5.2.19
diff -C2 -r1.42.2.5.2.18 -r1.42.2.5.2.19
*** class.boprojects.inc.php 15 Jun 2003 23:00:54 -0000 1.42.2.5.2.18
--- class.boprojects.inc.php 20 Jun 2003 22:04:32 -0000 1.42.2.5.2.19
***************
*** 3,11 ****
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 3,12 ----
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/
*
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright 2000 - 2003 Free Software Foundation, Inc *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 24,27 ****
--- 25,29 ----
\*******************************************************************/
/* $Id$ */
+ // $Source$
class boprojects
Index: class.bostatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.bostatistics.inc.php,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -r1.3 -r1.3.4.1
*** class.bostatistics.inc.php 11 Jan 2002 00:40:18 -0000 1.3
--- class.bostatistics.inc.php 20 Jun 2003 22:04:32 -0000 1.3.4.1
***************
*** 3,11 ****
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000, 2001 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 3,12 ----
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/
*
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright 2000 - 2003 Free Software Foundation, Inc *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 24,27 ****
--- 25,29 ----
\*******************************************************************/
/* $Id$ */
+ /* $Source$ */
class bostatistics
***************
*** 56,73 ****
function get_userstat_pro($account_id, $values)
{
! $pro = $this->sostatistics->user_stat_pro($account_id,
$values);
! return $pro;
}
function get_stat_hours($type, $account_id, $project_id,
$values)
{
! $hours = $this->sostatistics->stat_hours($type,
$account_id, $project_id, $values);
! return $hours;
}
function get_employees($project_id, $values)
{
! $employees =
$this->sostatistics->pro_stat_employees($project_id, $values);
! return $employees;
}
}
--- 58,72 ----
function get_userstat_pro($account_id, $values)
{
! return $this->sostatistics->user_stat_pro($account_id,
$values);
}
function get_stat_hours($type, $account_id, $project_id,
$values)
{
! return $this->sostatistics->stat_hours($type,
$account_id, $project_id, $values);
}
function get_employees($project_id, $values)
{
! return
$this->sostatistics->pro_stat_employees($project_id, $values);
}
}
Index: class.sobilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.sobilling.inc.php,v
retrieving revision 1.11.2.1.2.3
retrieving revision 1.11.2.1.2.4
diff -C2 -r1.11.2.1.2.3 -r1.11.2.1.2.4
*** class.sobilling.inc.php 15 Jun 2003 21:39:37 -0000 1.11.2.1.2.3
--- class.sobilling.inc.php 20 Jun 2003 22:04:32 -0000 1.11.2.1.2.4
***************
*** 3,11 ****
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 3,12 ----
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/
*
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright 2000 - 2003 Free Software Foundation, Inc *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 24,27 ****
--- 25,29 ----
\*******************************************************************/
/* $Id$ */
+ /* $Source$ */
class sobilling
Index: class.sodeliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.sodeliveries.inc.php,v
retrieving revision 1.15.2.1.2.2
retrieving revision 1.15.2.1.2.3
diff -C2 -r1.15.2.1.2.2 -r1.15.2.1.2.3
*** class.sodeliveries.inc.php 15 Jun 2003 21:39:37 -0000 1.15.2.1.2.2
--- class.sodeliveries.inc.php 20 Jun 2003 22:04:32 -0000 1.15.2.1.2.3
***************
*** 3,11 ****
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 3,12 ----
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/
*
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright 2000 - 2003 Free Software Foundation, Inc *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 24,27 ****
--- 25,29 ----
\*******************************************************************/
/* $Id$ */
+ // $Source$
class sodeliveries
Index: class.soprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojecthours.inc.php,v
retrieving revision 1.8.4.7
retrieving revision 1.8.4.8
diff -C2 -r1.8.4.7 -r1.8.4.8
*** class.soprojecthours.inc.php 15 Jun 2003 23:00:54 -0000 1.8.4.7
--- class.soprojecthours.inc.php 20 Jun 2003 22:04:32 -0000 1.8.4.8
***************
*** 3,11 ****
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 3,12 ----
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/
*
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright 2000 - 2003 Free Software Foundation, Inc *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 24,27 ****
--- 25,29 ----
\*******************************************************************/
/* $Id$ */
+ // $Source$
class soprojecthours
Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.34.2.6.2.18
retrieving revision 1.34.2.6.2.19
diff -C2 -r1.34.2.6.2.18 -r1.34.2.6.2.19
*** class.soprojects.inc.php 16 Jun 2003 21:47:24 -0000 1.34.2.6.2.18
--- class.soprojects.inc.php 20 Jun 2003 22:04:32 -0000 1.34.2.6.2.19
***************
*** 3,11 ****
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 3,12 ----
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/
*
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright 2000 - 2003 Free Software Foundation, Inc *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 24,27 ****
--- 25,29 ----
\*******************************************************************/
/* $Id$ */
+ // $Source$
class soprojects
***************
*** 380,383 ****
--- 382,390 ----
{
$this->db->query("Update phpgw_p_projects set
status='archive' WHERE parent=" . $values['project_id'],__LINE__,__FILE__);
+ }
+
+ if($values['oldstatus'] && $values['oldstatus'] ==
'archive' && $values['status'] != 'archive')
+ {
+ $this->db->query("Update phpgw_p_projects set
status='" . $values['status'] . "' WHERE parent=" .
$values['project_id'],__LINE__,__FILE__);
}
}
Index: class.sostatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.sostatistics.inc.php,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.2.2.1
diff -C2 -r1.5.2.2 -r1.5.2.2.2.1
*** class.sostatistics.inc.php 17 Sep 2002 02:38:34 -0000 1.5.2.2
--- class.sostatistics.inc.php 20 Jun 2003 22:04:32 -0000 1.5.2.2.2.1
***************
*** 3,11 ****
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000, 2001 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 3,12 ----
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/
*
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright 2000 - 2003 Free Software Foundation, Inc *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 24,27 ****
--- 25,29 ----
\*******************************************************************/
/* $Id$ */
+ /* $Source$ */
class sostatistics
***************
*** 51,60 ****
if ($values['sdate'])
{
! $filter .= " AND start_date >='" .
$values['sdate'] . "'";
}
if ($values['edate'])
{
! $filter .= " AND end_date <='" .
$values['edate'] . "'";
}
--- 53,62 ----
if ($values['sdate'])
{
! $filter .= ' AND start_date >=' .
$values['sdate'];
}
if ($values['edate'])
{
! $filter .= ' AND end_date <=' .
$values['edate'];
}
***************
*** 68,80 ****
if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
{
! $join = " JOIN ";
}
elseif
($GLOBALS['phpgw_info']['server']['db_type']=='mysql')
{
! $join = " LEFT JOIN ";
}
! $this->db->query("SELECT title,num,phpgw_p_projects.id
as id FROM phpgw_p_projects $join phpgw_p_hours ON "
! .
"phpgw_p_hours.employee='" . $account_id . "' GROUP BY
title,num,phpgw_p_projects.id",__LINE__,__FILE__);
while ($this->db->next_record())
--- 70,82 ----
if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
{
! $join = ' JOIN ';
}
elseif
($GLOBALS['phpgw_info']['server']['db_type']=='mysql')
{
! $join = ' LEFT JOIN ';
}
! $this->db->query('SELECT title,num,phpgw_p_projects.id
as id FROM phpgw_p_projects' . $join . 'phpgw_p_hours ON '
! .
'phpgw_p_hours.employee=' . $account_id . ' GROUP BY
title,num,phpgw_p_projects.id',__LINE__,__FILE__);
while ($this->db->next_record())
***************
*** 96,102 ****
switch($type)
{
! case 'account': $idfilter = "WHERE employee='"
. $account_id . "'"; break;
! case 'project': $idfilter = "WHERE
project_id='" . $project_id . "'"; break;
! case 'both': $idfilter = "WHERE employee='"
. $account_id . "' AND project_id='" . $project_id . "'"; break;
}
--- 98,104 ----
switch($type)
{
! case 'account': $idfilter = 'WHERE employee=' .
$account_id; break;
! case 'project': $idfilter = 'WHERE project_id='
. $project_id; break;
! case 'both': $idfilter = 'WHERE employee=' .
$account_id . ' AND project_id=' . $project_id; break;
}
***************
*** 120,125 ****
{
! $this->db->query("SELECT employee from phpgw_p_hours
WHERE project_id='" . $project_id . "'" . $this->stat_filter($values)
! . " GROUP BY
employee",__LINE__,__FILE__);
while ($this->db->next_record())
--- 122,127 ----
{
! $this->db->query('SELECT employee from phpgw_p_hours
WHERE project_id=' . $project_id . $this->stat_filter($values)
! . ' GROUP BY
employee',__LINE__,__FILE__);
while ($this->db->next_record())
Index: class.uibilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uibilling.inc.php,v
retrieving revision 1.18.2.6.2.6
retrieving revision 1.18.2.6.2.7
diff -C2 -r1.18.2.6.2.6 -r1.18.2.6.2.7
*** class.uibilling.inc.php 15 Jun 2003 23:00:54 -0000 1.18.2.6.2.6
--- class.uibilling.inc.php 20 Jun 2003 22:04:32 -0000 1.18.2.6.2.7
***************
*** 3,11 ****
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 3,12 ----
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/
*
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright 2000 - 2003 Free Software Foundation, Inc *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 24,27 ****
--- 25,29 ----
\*******************************************************************/
/* $Id$ */
+ // $Source$
class uibilling
Index: class.uideliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uideliveries.inc.php,v
retrieving revision 1.21.2.3.2.6
retrieving revision 1.21.2.3.2.7
diff -C2 -r1.21.2.3.2.6 -r1.21.2.3.2.7
*** class.uideliveries.inc.php 15 Jun 2003 23:00:54 -0000 1.21.2.3.2.6
--- class.uideliveries.inc.php 20 Jun 2003 22:04:32 -0000 1.21.2.3.2.7
***************
*** 3,11 ****
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 3,12 ----
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/
*
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright 2000 - 2003 Free Software Foundation, Inc *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 24,27 ****
--- 25,29 ----
\*******************************************************************/
/* $Id$ */
+ // $Source$
class uideliveries
Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.22.2.5.2.7
retrieving revision 1.22.2.5.2.8
diff -C2 -r1.22.2.5.2.7 -r1.22.2.5.2.8
*** class.uiprojecthours.inc.php 12 Jun 2003 21:28:21 -0000
1.22.2.5.2.7
--- class.uiprojecthours.inc.php 20 Jun 2003 22:04:32 -0000
1.22.2.5.2.8
***************
*** 3,11 ****
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 3,12 ----
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/
*
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright 2000 - 2003 Free Software Foundation, Inc *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 24,27 ****
--- 25,29 ----
\*******************************************************************/
/* $Id$ */
+ // $Source$
class uiprojecthours
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.20
retrieving revision 1.47.2.7.2.21
diff -C2 -r1.47.2.7.2.20 -r1.47.2.7.2.21
*** class.uiprojects.inc.php 16 Jun 2003 21:47:24 -0000 1.47.2.7.2.20
--- class.uiprojects.inc.php 20 Jun 2003 22:04:33 -0000 1.47.2.7.2.21
***************
*** 3,11 ****
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 3,12 ----
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/
*
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright 2000 - 2003 Free Software Foundation, Inc *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 24,27 ****
--- 25,29 ----
\*******************************************************************/
/* $Id$ */
+ // $Source$
class uiprojects
***************
*** 552,555 ****
--- 554,558 ----
{
$values =
$this->bo->read_single_project($project_id);
+
$GLOBALS['phpgw']->template->set_var('oldstatus',$values['status']);
$GLOBALS['phpgw']->template->set_var('lang_choose','');
$GLOBALS['phpgw']->template->set_var('choose','');
***************
*** 620,624 ****
$GLOBALS['phpgw']->template->set_var('month',$month['monthformatted']);
!
$GLOBALS['phpgw']->template->set_var('status_list',$this->status_format($values['status'],True));
$GLOBALS['phpgw']->template->set_var('access','<input
type="checkbox" name="values[access]" value="True"' . ($values['access'] ==
'private'?' checked':'') . '>');
--- 623,627 ----
$GLOBALS['phpgw']->template->set_var('month',$month['monthformatted']);
!
$GLOBALS['phpgw']->template->set_var('status_list',$this->status_format($values['status'],(($action
== 'mains' || $action == 'amains')?True:False)));
$GLOBALS['phpgw']->template->set_var('access','<input
type="checkbox" name="values[access]" value="True"' . ($values['access'] ==
'private'?' checked':'') . '>');
Index: class.uistatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uistatistics.inc.php,v
retrieving revision 1.10.2.2.2.6
retrieving revision 1.10.2.2.2.7
diff -C2 -r1.10.2.2.2.6 -r1.10.2.2.2.7
*** class.uistatistics.inc.php 15 Jun 2003 23:00:54 -0000 1.10.2.2.2.6
--- class.uistatistics.inc.php 20 Jun 2003 22:04:33 -0000 1.10.2.2.2.7
***************
*** 3,11 ****
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 3,12 ----
* phpGroupWare - Projects *
* http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/
*
* *
* Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright 2000 - 2003 Free Software Foundation, Inc *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 24,27 ****
--- 25,29 ----
\*******************************************************************/
/* $Id$ */
+ /* $Source$ */
class uistatistics
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.bobilling.inc.php,1.8,1.8.4.1 class.bodeliveries.inc.php,1.15.4.1,1.15.4.2 class.boprojecthours.inc.php,1.8.2.1.2.2,1.8.2.1.2.3 class.boprojects.inc.php,1.42.2.5.2.18,1.42.2.5.2.19 class.bostatistics.inc.php,1.3,1.3.4.1 class.sobilling.inc.php,1.11.2.1.2.3,1.11.2.1.2.4 class.sodeliveries.inc.php,1.15.2.1.2.2,1.15.2.1.2.3 class.soprojecthours.inc.php,1.8.4.7,1.8.4.8 class.soprojects.inc.php,1.34.2.6.2.18,1.34.2.6.2.19 class.sostatistics.inc.php,1.5.2.2,1.5.2.2.2.1 class.uibilling.inc.php,1.18.2.6.2.6,1.18.2.6.2.7 class.uideliveries.inc.php,1.21.2.3.2.6,1.21.2.3.2.7 class.uiprojecthours.inc.php,1.22.2.5.2.7,1.22.2.5.2.8 class.uiprojects.inc.php,1.47.2.7.2.20,1.47.2.7.2.21 class.uistatistics.inc.php,1.10.2.2.2.6,1.10.2.2.2.7,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: projects/setup phpgw_de.lang,1.17.2.4.2.10,1.17.2.4.2.11 phpgw_en.lang,1.25.2.4.2.19,1.25.2.4.2.20
- Next by Date:
[Phpgroupware-cvs] CVS: admin/setup phpgw_de.lang,1.14.2.9.2.8,1.14.2.9.2.9 phpgw_en.lang,1.23.2.18.2.9,1.23.2.18.2.10
- Previous by thread:
[Phpgroupware-cvs] CVS: projects/setup phpgw_de.lang,1.17.2.4.2.10,1.17.2.4.2.11 phpgw_en.lang,1.25.2.4.2.19,1.25.2.4.2.20
- Next by thread:
[Phpgroupware-cvs] CVS: admin/setup phpgw_de.lang,1.14.2.9.2.8,1.14.2.9.2.9 phpgw_en.lang,1.23.2.18.2.9,1.23.2.18.2.10
- Index(es):