[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.soprojects.inc.php,1.34.2.6.2
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.soprojects.inc.php,1.34.2.6.2.12,1.34.2.6.2.13 class.uibilling.inc.php,1.18.2.6.2.4,1.18.2.6.2.5 class.uideliveries.inc.php,1.21.2.3.2.4,1.21.2.3.2.5 class.uiprojecthours.inc.php,1.22.2.5.2.3,1.22.2.5.2.4 class.uistatistics.inc.php,1.10.2.2.2.4,1.10.2.2.2.5 |
|
Date: |
Mon, 09 Jun 2003 18:56:44 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv8462/inc
Modified Files:
Tag: Version-0_9_16-branch
class.soprojects.inc.php class.uibilling.inc.php
class.uideliveries.inc.php class.uiprojecthours.inc.php
class.uistatistics.inc.php
Log Message:
update
Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.34.2.6.2.12
retrieving revision 1.34.2.6.2.13
diff -C2 -r1.34.2.6.2.12 -r1.34.2.6.2.13
*** class.soprojects.inc.php 9 Jun 2003 22:05:16 -0000 1.34.2.6.2.12
--- class.soprojects.inc.php 9 Jun 2003 22:56:41 -0000 1.34.2.6.2.13
***************
*** 450,454 ****
}
! $this->db2->query('SELECT activity_id from
phpgw_p_projectactivities WHERE project_id=' . $project_id .
$bill_filter,__LINE__,__FILE__);
while ($this->db2->next_record())
{
--- 450,454 ----
}
! $this->db2->query('SELECT activity_id from
phpgw_p_projectactivities WHERE project_id=' . intval($project_id) .
$bill_filter,__LINE__,__FILE__);
while ($this->db2->next_record())
{
***************
*** 457,461 ****
$this->db->query('SELECT a.id, a.num, a.descr,
a.billperae, pa.activity_id FROM phpgw_p_activities as a,
phpgw_p_projectactivities as pa'
! . ' WHERE
pa.project_id=' . $pro_parent . $bill_filter . ' AND pa.activity_id=a.id ORDER
BY a.descr asc');
while ($this->db->next_record())
{
--- 457,461 ----
$this->db->query('SELECT a.id, a.num, a.descr,
a.billperae, pa.activity_id FROM phpgw_p_activities as a,
phpgw_p_projectactivities as pa'
! . ' WHERE
pa.project_id=' . intval($pro_parent) . $bill_filter . ' AND
pa.activity_id=a.id ORDER BY a.descr asc');
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.4
retrieving revision 1.18.2.6.2.5
diff -C2 -r1.18.2.6.2.4 -r1.18.2.6.2.5
*** class.uibilling.inc.php 9 Jun 2003 22:25:34 -0000 1.18.2.6.2.4
--- class.uibilling.inc.php 9 Jun 2003 22:56:41 -0000 1.18.2.6.2.5
***************
*** 129,132 ****
--- 129,133 ----
{
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
+
$GLOBALS['phpgw']->template->set_var('break1',' | ');
$GLOBALS['phpgw']->template->set_var('space1',' ');
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
***************
*** 139,143 ****
{
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!
$GLOBALS['phpgw']->template->set_var('break',' | ');
$GLOBALS['phpgw']->template->set_var('space2',' ');
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
--- 140,144 ----
{
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!
$GLOBALS['phpgw']->template->set_var('break2',' | ');
$GLOBALS['phpgw']->template->set_var('space2',' ');
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
Index: class.uideliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uideliveries.inc.php,v
retrieving revision 1.21.2.3.2.4
retrieving revision 1.21.2.3.2.5
diff -C2 -r1.21.2.3.2.4 -r1.21.2.3.2.5
*** class.uideliveries.inc.php 9 Jun 2003 22:25:34 -0000 1.21.2.3.2.4
--- class.uideliveries.inc.php 9 Jun 2003 22:56:41 -0000 1.21.2.3.2.5
***************
*** 127,130 ****
--- 127,131 ----
{
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
+
$GLOBALS['phpgw']->template->set_var('break1',' | ');
$GLOBALS['phpgw']->template->set_var('space1',' ');
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
***************
*** 137,141 ****
{
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!
$GLOBALS['phpgw']->template->set_var('break',' | ');
$GLOBALS['phpgw']->template->set_var('space2',' ');
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
--- 138,142 ----
{
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!
$GLOBALS['phpgw']->template->set_var('break2',' | ');
$GLOBALS['phpgw']->template->set_var('space2',' ');
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.22.2.5.2.3
retrieving revision 1.22.2.5.2.4
diff -C2 -r1.22.2.5.2.3 -r1.22.2.5.2.4
*** class.uiprojecthours.inc.php 9 Jun 2003 22:25:34 -0000
1.22.2.5.2.3
--- class.uiprojecthours.inc.php 9 Jun 2003 22:56:41 -0000
1.22.2.5.2.4
***************
*** 132,135 ****
--- 132,136 ----
{
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
+
$GLOBALS['phpgw']->template->set_var('break1',' | ');
$GLOBALS['phpgw']->template->set_var('space1',' ');
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
***************
*** 142,146 ****
{
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!
$GLOBALS['phpgw']->template->set_var('break',' | ');
$GLOBALS['phpgw']->template->set_var('space2',' ');
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
--- 143,147 ----
{
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!
$GLOBALS['phpgw']->template->set_var('break2',' | ');
$GLOBALS['phpgw']->template->set_var('space2',' ');
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
Index: class.uistatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uistatistics.inc.php,v
retrieving revision 1.10.2.2.2.4
retrieving revision 1.10.2.2.2.5
diff -C2 -r1.10.2.2.2.4 -r1.10.2.2.2.5
*** class.uistatistics.inc.php 9 Jun 2003 22:25:34 -0000 1.10.2.2.2.4
--- class.uistatistics.inc.php 9 Jun 2003 22:56:41 -0000 1.10.2.2.2.5
***************
*** 124,127 ****
--- 124,128 ----
{
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
+
$GLOBALS['phpgw']->template->set_var('break1',' | ');
$GLOBALS['phpgw']->template->set_var('space1',' ');
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
***************
*** 134,138 ****
{
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!
$GLOBALS['phpgw']->template->set_var('break',' | ');
$GLOBALS['phpgw']->template->set_var('space2',' ');
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
--- 135,139 ----
{
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!
$GLOBALS['phpgw']->template->set_var('break2',' | ');
$GLOBALS['phpgw']->template->set_var('space2',' ');
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.soprojects.inc.php,1.34.2.6.2.12,1.34.2.6.2.13 class.uibilling.inc.php,1.18.2.6.2.4,1.18.2.6.2.5 class.uideliveries.inc.php,1.21.2.3.2.4,1.21.2.3.2.5 class.uiprojecthours.inc.php,1.22.2.5.2.3,1.22.2.5.2.4 class.uistatistics.inc.php,1.10.2.2.2.4,1.10.2.2.2.5,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: projects/setup phpgw_de.lang,1.17.2.4,1.17.2.4.2.1 phpgw_en.lang,1.25.2.4.2.7,1.25.2.4.2.8
- Next by Date:
[Phpgroupware-cvs] CVS: admin/setup phpgw_en.lang,1.23.2.18.2.8,1.23.2.18.2.9
- Previous by thread:
[Phpgroupware-cvs] CVS: projects/setup phpgw_de.lang,1.17.2.4,1.17.2.4.2.1 phpgw_en.lang,1.25.2.4.2.7,1.25.2.4.2.8
- Next by thread:
[Phpgroupware-cvs] CVS: admin/setup phpgw_en.lang,1.23.2.18.2.8,1.23.2.18.2.9
- Index(es):