[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.soprojecthours.inc.php,1.8.4
From: |
Bettina Gille <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.soprojecthours.inc.php,1.8.4.3,1.8.4.4 class.soprojects.inc.php,1.34.2.6.2.11,1.34.2.6.2.12 class.uibilling.inc.php,1.18.2.6.2.2,1.18.2.6.2.3 class.uideliveries.inc.php,1.21.2.3.2.2,1.21.2.3.2.3 class.uiprojecthours.inc.php,1.22.2.5.2.1,1.22.2.5.2.2 class.uistatistics.inc.php,1.10.2.2.2.2,1.10.2.2.2.3 |
Date: |
Mon, 09 Jun 2003 18:05:18 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv24020/inc
Modified Files:
Tag: Version-0_9_16-branch
class.soprojecthours.inc.php 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.soprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojecthours.inc.php,v
retrieving revision 1.8.4.3
retrieving revision 1.8.4.4
diff -C2 -r1.8.4.3 -r1.8.4.4
*** class.soprojecthours.inc.php 7 Jun 2003 23:34:03 -0000 1.8.4.3
--- class.soprojecthours.inc.php 9 Jun 2003 22:05:16 -0000 1.8.4.4
***************
*** 48,52 ****
}
! $filtermethod = ' project_id =' . $project_id;
if ($state != 'all')
--- 48,52 ----
}
! $filtermethod = ' project_id =' . intval($project_id);
if ($state != 'all')
Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.34.2.6.2.11
retrieving revision 1.34.2.6.2.12
diff -C2 -r1.34.2.6.2.11 -r1.34.2.6.2.12
*** class.soprojects.inc.php 7 Jun 2003 23:34:03 -0000 1.34.2.6.2.11
--- class.soprojects.inc.php 9 Jun 2003 22:05:16 -0000 1.34.2.6.2.12
***************
*** 490,499 ****
{
$this->db->query('SELECT activity_id,num,
descr,billperae,billable FROM phpgw_p_projectactivities,phpgw_p_activities
WHERE project_id ='
! . $project_id . ' AND
phpgw_p_projectactivities.activity_id=phpgw_p_activities.id order by descr
asc',__LINE__,__FILE__);
while ($this->db->next_record())
{
$hours_act .= '<option value="' .
$this->db->f('activity_id') . '"';
! if($this->db->f('activity_id') == $activity)
{
$hours_act .= ' selected';
--- 490,499 ----
{
$this->db->query('SELECT activity_id,num,
descr,billperae,billable FROM phpgw_p_projectactivities,phpgw_p_activities
WHERE project_id ='
! . intval($project_id) .
' AND phpgw_p_projectactivities.activity_id=phpgw_p_activities.id order by
descr asc',__LINE__,__FILE__);
while ($this->db->next_record())
{
$hours_act .= '<option value="' .
$this->db->f('activity_id') . '"';
! if($this->db->f('activity_id') ==
intval($activity))
{
$hours_act .= ' selected';
Index: class.uibilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uibilling.inc.php,v
retrieving revision 1.18.2.6.2.2
retrieving revision 1.18.2.6.2.3
diff -C2 -r1.18.2.6.2.2 -r1.18.2.6.2.3
*** class.uibilling.inc.php 7 Jun 2003 01:05:02 -0000 1.18.2.6.2.2
--- class.uibilling.inc.php 9 Jun 2003 22:05:16 -0000 1.18.2.6.2.3
***************
*** 132,135 ****
--- 132,137 ----
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));
+
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
+
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('budget'));
}
Index: class.uideliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uideliveries.inc.php,v
retrieving revision 1.21.2.3.2.2
retrieving revision 1.21.2.3.2.3
diff -C2 -r1.21.2.3.2.2 -r1.21.2.3.2.3
*** class.uideliveries.inc.php 7 Jun 2003 01:05:02 -0000 1.21.2.3.2.2
--- class.uideliveries.inc.php 9 Jun 2003 22:05:16 -0000 1.21.2.3.2.3
***************
*** 130,133 ****
--- 130,135 ----
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));
+
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
+
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('budget'));
}
Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.22.2.5.2.1
retrieving revision 1.22.2.5.2.2
diff -C2 -r1.22.2.5.2.1 -r1.22.2.5.2.2
*** class.uiprojecthours.inc.php 26 Apr 2003 01:33:45 -0000
1.22.2.5.2.1
--- class.uiprojecthours.inc.php 9 Jun 2003 22:05:16 -0000
1.22.2.5.2.2
***************
*** 135,138 ****
--- 135,140 ----
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));
+
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
+
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('budget'));
}
Index: class.uistatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uistatistics.inc.php,v
retrieving revision 1.10.2.2.2.2
retrieving revision 1.10.2.2.2.3
diff -C2 -r1.10.2.2.2.2 -r1.10.2.2.2.3
*** class.uistatistics.inc.php 7 Jun 2003 01:05:02 -0000 1.10.2.2.2.2
--- class.uistatistics.inc.php 9 Jun 2003 22:05:16 -0000 1.10.2.2.2.3
***************
*** 127,130 ****
--- 127,132 ----
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));
+
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
+
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('budget'));
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.soprojecthours.inc.php,1.8.4.3,1.8.4.4 class.soprojects.inc.php,1.34.2.6.2.11,1.34.2.6.2.12 class.uibilling.inc.php,1.18.2.6.2.2,1.18.2.6.2.3 class.uideliveries.inc.php,1.21.2.3.2.2,1.21.2.3.2.3 class.uiprojecthours.inc.php,1.22.2.5.2.1,1.22.2.5.2.2 class.uistatistics.inc.php,1.10.2.2.2.2,1.10.2.2.2.3,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup phpgw_fr.lang,1.3,1.4
- Next by Date:
[Phpgroupware-cvs] CVS: projects/inc class.uibilling.inc.php,1.18.2.6.2.3,1.18.2.6.2.4 class.uideliveries.inc.php,1.21.2.3.2.3,1.21.2.3.2.4 class.uiprojecthours.inc.php,1.22.2.5.2.2,1.22.2.5.2.3 class.uistatistics.inc.php,1.10.2.2.2.3,1.10.2.2.2.4
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup phpgw_fr.lang,1.3,1.4
- Next by thread:
[Phpgroupware-cvs] CVS: projects/inc class.uibilling.inc.php,1.18.2.6.2.3,1.18.2.6.2.4 class.uideliveries.inc.php,1.21.2.3.2.3,1.21.2.3.2.4 class.uiprojecthours.inc.php,1.22.2.5.2.2,1.22.2.5.2.3 class.uistatistics.inc.php,1.10.2.2.2.3,1.10.2.2.2.4
- Index(es):