[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2.17,1.42.2.5.2.18 class.soprojecthours.inc.php,1.8.4.6,1.8.4.7 class.soprojects.inc.php,1.34.2.6.2.16,1.34.2.6.2.17 class.uibilling.inc.php,1.18.2.6.2.5,1.18.2.6.2.6 class.uideliveries.inc.php,1.21.2.3.2.5,1.21.2.3.2.6 class.uiprojects.inc.php,1.47.2.7.2.18,1.47.2.7.2.19 class.uistatistics.inc.php,1.10.2.2.2.5,1.10.2.2.2.6 |
|
Date: |
Sun, 15 Jun 2003 19:00:56 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv10715/inc
Modified Files:
Tag: Version-0_9_16-branch
class.boprojects.inc.php class.soprojecthours.inc.php
class.soprojects.inc.php class.uibilling.inc.php
class.uideliveries.inc.php class.uiprojects.inc.php
class.uistatistics.inc.php
Log Message:
update
Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.42.2.5.2.17
retrieving revision 1.42.2.5.2.18
diff -C2 -r1.42.2.5.2.17 -r1.42.2.5.2.18
*** class.boprojects.inc.php 14 Jun 2003 23:14:30 -0000 1.42.2.5.2.17
--- class.boprojects.inc.php 15 Jun 2003 23:00:54 -0000 1.42.2.5.2.18
***************
*** 7,11 ****
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000,2001,2002 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 7,11 ----
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 785,796 ****
}
- if (!$values['billperae'])
- {
- $values['billperae'] = 0;
- }
-
if ($values['activity_id'])
{
! if ($values['activity_id'] != 0)
{
$this->so->edit_activity($values);
--- 785,791 ----
}
if ($values['activity_id'])
{
! if ($values['activity_id'] &&
intval($values['activity_id']) > 0)
{
$this->so->edit_activity($values);
Index: class.soprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojecthours.inc.php,v
retrieving revision 1.8.4.6
retrieving revision 1.8.4.7
diff -C2 -r1.8.4.6 -r1.8.4.7
*** class.soprojecthours.inc.php 12 Jun 2003 21:39:20 -0000 1.8.4.6
--- class.soprojecthours.inc.php 15 Jun 2003 23:00:54 -0000 1.8.4.7
***************
*** 158,162 ****
for ($i=0;$i<=count($hours);$i++)
{
! $this->db->query('UPDATE phpgw_p_hours
set minperae=' . intval($minperae) . ' WHERE id=' .
$hours[$i],__LINE__,__FILE__);
}
}
--- 158,162 ----
for ($i=0;$i<=count($hours);$i++)
{
! $this->db->query('UPDATE phpgw_p_hours
set minperae=' . intval($minperae) . ' WHERE id=' .
intval($hours[$i]),__LINE__,__FILE__);
}
}
Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.34.2.6.2.16
retrieving revision 1.34.2.6.2.17
diff -C2 -r1.34.2.6.2.16 -r1.34.2.6.2.17
*** class.soprojects.inc.php 15 Jun 2003 05:24:43 -0000 1.34.2.6.2.16
--- class.soprojects.inc.php 15 Jun 2003 23:00:54 -0000 1.34.2.6.2.17
***************
*** 886,891 ****
function add_activity($values)
{
! $values['number'] =
$this->db->db_addslashes($values['number']);
! $values['descr'] =
$this->db->db_addslashes($values['descr']);
$this->db->query("insert into phpgw_p_activities
(num,category,descr,remarkreq,billperae,minperae) values ('"
--- 886,892 ----
function add_activity($values)
{
! $values['number'] =
$this->db->db_addslashes($values['number']);
! $values['descr'] =
$this->db->db_addslashes($values['descr']);
! $values['billperae'] = $values['billperae'] + 0.0;
$this->db->query("insert into phpgw_p_activities
(num,category,descr,remarkreq,billperae,minperae) values ('"
***************
*** 896,901 ****
function edit_activity($values)
{
! $values['number'] =
$this->db->db_addslashes($values['number']);
! $values['descr'] =
$this->db->db_addslashes($values['descr']);
$this->db->query("update phpgw_p_activities set num='"
. $values['number'] . "', category=" . intval($values['cat'])
--- 897,903 ----
function edit_activity($values)
{
! $values['number'] =
$this->db->db_addslashes($values['number']);
! $values['descr'] =
$this->db->db_addslashes($values['descr']);
! $values['billperae'] = $values['billperae'] + 0.0;
$this->db->query("update phpgw_p_activities set num='"
. $values['number'] . "', category=" . intval($values['cat'])
Index: class.uibilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uibilling.inc.php,v
retrieving revision 1.18.2.6.2.5
retrieving revision 1.18.2.6.2.6
diff -C2 -r1.18.2.6.2.5 -r1.18.2.6.2.6
*** class.uibilling.inc.php 9 Jun 2003 22:56:41 -0000 1.18.2.6.2.5
--- class.uibilling.inc.php 15 Jun 2003 23:00:54 -0000 1.18.2.6.2.6
***************
*** 231,235 ****
{
$action_list= '<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data) . '" name="form">' . "\n"
! . '<select
name="cat_id" onChange="this.form.submit();"><option value="">' . lang('None')
. '</option>' . "\n"
.
$this->cats->formatted_list('select','all',$this->cat_id,True) . '</select>';
}
--- 231,235 ----
{
$action_list= '<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data) . '" name="form">' . "\n"
! . '<select
name="cat_id" onChange="this.form.submit();"><option value="">' . lang('Select
category') . '</option>' . "\n"
.
$this->cats->formatted_list('select','all',$this->cat_id,True) . '</select>';
}
Index: class.uideliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uideliveries.inc.php,v
retrieving revision 1.21.2.3.2.5
retrieving revision 1.21.2.3.2.6
diff -C2 -r1.21.2.3.2.5 -r1.21.2.3.2.6
*** class.uideliveries.inc.php 9 Jun 2003 22:56:41 -0000 1.21.2.3.2.5
--- class.uideliveries.inc.php 15 Jun 2003 23:00:54 -0000 1.21.2.3.2.6
***************
*** 212,216 ****
{
$action_list= '<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data) . '" name="form">' . "\n"
! . '<select
name="cat_id" onChange="this.form.submit();"><option value="">' . lang('None')
. '</option>' . "\n"
.
$this->cats->formatted_list('select','all',$this->cat_id,True) . '</select>';
$GLOBALS['phpgw']->template->set_var(lang_header,lang('Project list'));
--- 212,216 ----
{
$action_list= '<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data) . '" name="form">' . "\n"
! . '<select
name="cat_id" onChange="this.form.submit();"><option value="">' . lang('Select
category') . '</option>' . "\n"
.
$this->cats->formatted_list('select','all',$this->cat_id,True) . '</select>';
$GLOBALS['phpgw']->template->set_var(lang_header,lang('Project list'));
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.18
retrieving revision 1.47.2.7.2.19
diff -C2 -r1.47.2.7.2.18 -r1.47.2.7.2.19
*** class.uiprojects.inc.php 15 Jun 2003 21:39:37 -0000 1.47.2.7.2.18
--- class.uiprojects.inc.php 15 Jun 2003 23:00:54 -0000 1.47.2.7.2.19
***************
*** 98,101 ****
--- 98,103 ----
$GLOBALS['phpgw']->template->set_var('lang_category',lang('Category'));
$GLOBALS['phpgw']->template->set_var('lang_select',lang('Select'));
+
$GLOBALS['phpgw']->template->set_var('lang_select_category',lang('Select
category'));
+
$GLOBALS['phpgw']->template->set_var('lang_descr',lang('Description'));
$GLOBALS['phpgw']->template->set_var('lang_title',lang('Title'));
***************
*** 213,216 ****
--- 215,223 ----
$pro_parent = get_var('pro_parent',array('POST','GET'));
+ if ($_GET['cat_id'])
+ {
+ $this->cat_id = $_GET['cat_id'];
+ }
+
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_parent?lang('list jobs'):lang('list projects'));
***************
*** 1581,1585 ****
{
$action_list= '<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data) . '" name="form">' . "\n"
! . '<select
name="cat_id" onChange="this.form.submit();"><option value="">' . lang('None')
. '</option>' . "\n"
.
$this->cats->formatted_list('select','all',$this->cat_id,True) . '</select>';
$GLOBALS['phpgw']->template->set_var('lang_action',lang('Jobs'));
--- 1588,1592 ----
{
$action_list= '<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data) . '" name="form">' . "\n"
! . '<select
name="cat_id" onChange="this.form.submit();"><option value="">' . lang('Select
category') . '</option>' . "\n"
.
$this->cats->formatted_list('select','all',$this->cat_id,True) . '</select>';
$GLOBALS['phpgw']->template->set_var('lang_action',lang('Jobs'));
Index: class.uistatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uistatistics.inc.php,v
retrieving revision 1.10.2.2.2.5
retrieving revision 1.10.2.2.2.6
diff -C2 -r1.10.2.2.2.5 -r1.10.2.2.2.6
*** class.uistatistics.inc.php 9 Jun 2003 22:56:41 -0000 1.10.2.2.2.5
--- class.uistatistics.inc.php 15 Jun 2003 23:00:54 -0000 1.10.2.2.2.6
***************
*** 208,212 ****
{
$action_list= '<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data) . '" name="form">' . "\n"
! . '<select
name="cat_id" onChange="this.form.submit();"><option value="">' . lang('None')
. '</option>' . "\n"
.
$this->cats->formatted_list('select','all',$this->cat_id,True) . '</select>';
$GLOBALS['phpgw']->template->set_var(lang_header,lang('Project list'));
--- 208,212 ----
{
$action_list= '<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data) . '" name="form">' . "\n"
! . '<select
name="cat_id" onChange="this.form.submit();"><option value="">' . lang('Select
category') . '</option>' . "\n"
.
$this->cats->formatted_list('select','all',$this->cat_id,True) . '</select>';
$GLOBALS['phpgw']->template->set_var(lang_header,lang('Project list'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2.17,1.42.2.5.2.18 class.soprojecthours.inc.php,1.8.4.6,1.8.4.7 class.soprojects.inc.php,1.34.2.6.2.16,1.34.2.6.2.17 class.uibilling.inc.php,1.18.2.6.2.5,1.18.2.6.2.6 class.uideliveries.inc.php,1.21.2.3.2.5,1.21.2.3.2.6 class.uiprojects.inc.php,1.47.2.7.2.18,1.47.2.7.2.19 class.uistatistics.inc.php,1.10.2.2.2.5,1.10.2.2.2.6,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: projects/templates/default formactivity.tpl,1.14.4.2,1.14.4.3 listactivities.tpl,1.16.4.1,1.16.4.2
- Next by Date:
[Phpgroupware-cvs] CVS: projects/inc class.soprojects.inc.php,1.34.2.6.2.15,1.34.2.6.2.16
- Previous by thread:
[Phpgroupware-cvs] CVS: projects/templates/default formactivity.tpl,1.14.4.2,1.14.4.3 listactivities.tpl,1.16.4.1,1.16.4.2
- Next by thread:
[Phpgroupware-cvs] CVS: projects/inc class.soprojects.inc.php,1.34.2.6.2.15,1.34.2.6.2.16
- Index(es):