[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.11,1.42.2.5.2.12 class.uibilling.inc.php,1.18.2.6.2.1,1.18.2.6.2.2 class.uideliveries.inc.php,1.21.2.3.2.1,1.21.2.3.2.2 class.uiprojects.inc.php,1.47.2.7.2.8,1.47.2.7.2.9 class.uistatistics.inc.php,1.10.2.2.2.1,1.10.2.2.2.2 |
|
Date: |
Fri, 06 Jun 2003 21:05:05 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv23870/inc
Modified Files:
Tag: Version-0_9_16-branch
class.boprojects.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.11
retrieving revision 1.42.2.5.2.12
diff -C2 -r1.42.2.5.2.11 -r1.42.2.5.2.12
*** class.boprojects.inc.php 7 Jun 2003 00:21:39 -0000 1.42.2.5.2.11
--- class.boprojects.inc.php 7 Jun 2003 01:05:02 -0000 1.42.2.5.2.12
***************
*** 404,408 ****
'budget' =>
$pro['budget'],
'pcosts' =>
$pro['pcosts'],
! 'edate' =>
$pro['edate']
);
}
--- 404,409 ----
'budget' =>
$pro['budget'],
'pcosts' =>
$pro['pcosts'],
! 'edate' =>
$pro['edate'],
! 'status' =>
$pro['status']
);
}
Index: class.uibilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uibilling.inc.php,v
retrieving revision 1.18.2.6.2.1
retrieving revision 1.18.2.6.2.2
diff -C2 -r1.18.2.6.2.1 -r1.18.2.6.2.2
*** class.uibilling.inc.php 26 Apr 2003 01:33:45 -0000 1.18.2.6.2.1
--- class.uibilling.inc.php 7 Jun 2003 01:05:02 -0000 1.18.2.6.2.2
***************
*** 276,282 ****
{
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
- $title =
$GLOBALS['phpgw']->strip_html($pro[$i]['title']);
- if (! $title) $title = ' ';
-
$edate = $pro[$i]['edate'];
if ($edate == 0)
--- 276,279 ----
***************
*** 298,339 ****
if ($action == 'mains')
{
! if ($pro[$i]['customer'] != 0)
! {
! $customer =
$this->boprojects->read_single_contact($pro[$i]['customer']);
! if (!$customer[0]['org_name']) { $td_action =
$customer[0]['n_given'] . ' ' . $customer[0]['n_family']; }
! else { $td_action = $customer[0]['org_name'] .
' [ ' . $customer[0]['n_given'] . ' ' . $customer[0]['n_family'] . ' ]'; }
! }
! else { $td_action = ' '; }
}
else
{
! $sdate = $pro[$i]['sdate'];
! if ($sdate == 0) { $sdateout =
' '; }
! else
! {
! $month =
$GLOBALS['phpgw']->common->show_date(time(),'n');
! $day =
$GLOBALS['phpgw']->common->show_date(time(),'d');
! $year =
$GLOBALS['phpgw']->common->show_date(time(),'Y');
!
! $sdate = $sdate + (60*60) *
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
! $td_action =
$GLOBALS['phpgw']->common->show_date($sdate,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
! }
}
- $cached_data =
$this->boprojects->cached_accounts($pro[$i]['coordinator']);
- $coordinatorout =
$GLOBALS['phpgw']->strip_html($cached_data[$pro[$i]['coordinator']]['account_lid']
- . ' [' .
$cached_data[$pro[$i]['coordinator']]['firstname'] . ' '
- .
$cached_data[$pro[$i]['coordinator']]['lastname'] . ' ]');
-
// --------------- template declaration for list records
-------------------------------------
$GLOBALS['phpgw']->template->set_var(array
(
! 'number' =>
$GLOBALS['phpgw']->strip_html($pro[$i]['number']),
'td_action' => $td_action,
'status' =>
lang($pro[$i]['status']),
! 'title' => $title,
'end_date' => $edateout,
! 'coordinator' => $coordinatorout
));
--- 295,315 ----
if ($action == 'mains')
{
! $td_action =
($pro[$i]['customerout']?$pro[$i]['customerout']:' ');
}
else
{
! $td_action =
($pro[$i]['sdateout']?$pro[$i]['sdateout']:' ');
}
// --------------- template declaration for list records
-------------------------------------
$GLOBALS['phpgw']->template->set_var(array
(
! 'number' =>
$pro[$i]['number'],
'td_action' => $td_action,
'status' =>
lang($pro[$i]['status']),
! 'title' =>
($pro[$i]['title']?$pro[$i]['title']:' '),
'end_date' => $edateout,
! 'coordinator' =>
$pro[$i]['coordinatorout']
));
Index: class.uideliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uideliveries.inc.php,v
retrieving revision 1.21.2.3.2.1
retrieving revision 1.21.2.3.2.2
diff -C2 -r1.21.2.3.2.1 -r1.21.2.3.2.2
*** class.uideliveries.inc.php 26 Apr 2003 01:33:45 -0000 1.21.2.3.2.1
--- class.uideliveries.inc.php 7 Jun 2003 01:05:02 -0000 1.21.2.3.2.2
***************
*** 259,265 ****
{
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
- $title =
$GLOBALS['phpgw']->strip_html($pro[$i]['title']);
- if (! $title) $title = ' ';
-
$edate = $pro[$i]['edate'];
if ($edate == 0)
--- 259,262 ----
***************
*** 281,322 ****
if ($action == 'mains')
{
! if ($pro[$i]['customer'] != 0)
! {
! $customer =
$this->boprojects->read_single_contact($pro[$i]['customer']);
! if (!$customer[0]['org_name']) { $td_action =
$customer[0]['n_given'] . ' ' . $customer[0]['n_family']; }
! else { $td_action = $customer[0]['org_name'] .
' [ ' . $customer[0]['n_given'] . ' ' . $customer[0]['n_family'] . ' ]'; }
! }
! else { $td_action = ' '; }
}
else
{
! $sdate = $pro[$i]['sdate'];
! if ($sdate == 0) { $sdateout =
' '; }
! else
! {
! $month =
$GLOBALS['phpgw']->common->show_date(time(),'n');
! $day =
$GLOBALS['phpgw']->common->show_date(time(),'d');
! $year =
$GLOBALS['phpgw']->common->show_date(time(),'Y');
!
! $sdate = $sdate + (60*60) *
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
! $td_action =
$GLOBALS['phpgw']->common->show_date($sdate,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
! }
}
- $cached_data =
$this->boprojects->cached_accounts($pro[$i]['coordinator']);
- $coordinatorout =
$GLOBALS['phpgw']->strip_html($cached_data[$pro[$i]['coordinator']]['account_lid']
- . ' [' .
$cached_data[$pro[$i]['coordinator']]['firstname'] . ' '
- .
$cached_data[$pro[$i]['coordinator']]['lastname'] . ' ]');
-
// --------------- template declaration for list records
-------------------------------------
$GLOBALS['phpgw']->template->set_var(array
(
! 'number' =>
$GLOBALS['phpgw']->strip_html($pro[$i]['number']),
'td_action' => $td_action,
'status' =>
lang($pro[$i]['status']),
! 'title' => $title,
'end_date' => $edateout,
! 'coordinator' => $coordinatorout
));
--- 278,298 ----
if ($action == 'mains')
{
! $td_action =
($pro[$i]['customerout']?$pro[$i]['customerout']:' ');
}
else
{
! $td_action =
($pro[$i]['sdateout']?$pro[$i]['sdateout']:' ');
}
// --------------- template declaration for list records
-------------------------------------
$GLOBALS['phpgw']->template->set_var(array
(
! 'number' =>
$pro[$i]['number'],
'td_action' => $td_action,
'status' =>
lang($pro[$i]['status']),
! 'title' =>
($pro[$i]['title']?$pro[$i]['title']:' '),
'end_date' => $edateout,
! 'coordinator' =>
$pro[$i]['coordinatorout']
));
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.8
retrieving revision 1.47.2.7.2.9
diff -C2 -r1.47.2.7.2.8 -r1.47.2.7.2.9
*** class.uiprojects.inc.php 7 Jun 2003 00:21:39 -0000 1.47.2.7.2.8
--- class.uiprojects.inc.php 7 Jun 2003 01:05:02 -0000 1.47.2.7.2.9
***************
*** 775,783 ****
$GLOBALS['phpgw']->template->set_var('status',lang($values['status']));
$GLOBALS['phpgw']->template->set_var('budget',$values['budget']);
$GLOBALS['phpgw']->template->set_var('currency',$prefs['currency']);
! $GLOBALS['phpgw']->template->set_var('phours',$phours);
! $GLOBALS['phpgw']->template->set_var('uhours',$uhours);
$GLOBALS['phpgw']->template->set_var('sdate',$values['sdate_formatted']);
--- 775,784 ----
$GLOBALS['phpgw']->template->set_var('status',lang($values['status']));
$GLOBALS['phpgw']->template->set_var('budget',$values['budget']);
+
$GLOBALS['phpgw']->template->set_var('pcosts',$values['pcosts']);
$GLOBALS['phpgw']->template->set_var('currency',$prefs['currency']);
!
$GLOBALS['phpgw']->template->set_var('phours',$values['phours']);
!
$GLOBALS['phpgw']->template->set_var('uhours',$values['uhours']);
$GLOBALS['phpgw']->template->set_var('sdate',$values['sdate_formatted']);
***************
*** 1680,1684 ****
$prefs = $this->bo->get_prefs();
}
!
$GLOBALS['phpgw']->template->set_var('curreny',$prefs['currency']);
if (!$action)
--- 1681,1685 ----
$prefs = $this->bo->get_prefs();
}
!
$GLOBALS['phpgw']->template->set_var('currency',$prefs['currency']);
if (!$action)
Index: class.uistatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uistatistics.inc.php,v
retrieving revision 1.10.2.2.2.1
retrieving revision 1.10.2.2.2.2
diff -C2 -r1.10.2.2.2.1 -r1.10.2.2.2.2
*** class.uistatistics.inc.php 26 Apr 2003 01:33:45 -0000 1.10.2.2.2.1
--- class.uistatistics.inc.php 7 Jun 2003 01:05:02 -0000 1.10.2.2.2.2
***************
*** 248,254 ****
{
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
- $title =
$GLOBALS['phpgw']->strip_html($pro[$i]['title']);
- if (! $title) $title = ' ';
-
$edate = $pro[$i]['edate'];
if ($edate == 0)
--- 248,251 ----
***************
*** 270,311 ****
if ($action == 'mains')
{
! if ($pro[$i]['customer'] != 0)
! {
! $customer =
$this->boprojects->read_single_contact($pro[$i]['customer']);
! if ($customer[0]['org_name'] == '') {
$td_action = $customer[0]['n_given'] . ' ' . $customer[0]['n_family']; }
! else { $td_action = $customer[0]['org_name'] .
' [ ' . $customer[0]['n_given'] . ' ' . $customer[0]['n_family'] . ' ]'; }
! }
! else { $td_action = ' '; }
}
else
{
! $sdate = $pro[$i]['sdate'];
! if ($sdate == 0) { $sdateout =
' '; }
! else
! {
! $month =
$GLOBALS['phpgw']->common->show_date(time(),'n');
! $day =
$GLOBALS['phpgw']->common->show_date(time(),'d');
! $year =
$GLOBALS['phpgw']->common->show_date(time(),'Y');
!
! $sdate = $sdate + (60*60) *
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
! $td_action =
$GLOBALS['phpgw']->common->show_date($sdate,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
! }
}
- $cached_data =
$this->boprojects->cached_accounts($pro[$i]['coordinator']);
- $coordinatorout =
$GLOBALS['phpgw']->strip_html($cached_data[$pro[$i]['coordinator']]['account_lid']
- . ' [' .
$cached_data[$pro[$i]['coordinator']]['firstname'] . ' '
- .
$cached_data[$pro[$i]['coordinator']]['lastname'] . ' ]');
-
// --------------- template declaration for list records
-------------------------------------
$GLOBALS['phpgw']->template->set_var(array
(
! 'number' =>
$GLOBALS['phpgw']->strip_html($pro[$i]['number']),
'td_action' => $td_action,
'status' =>
lang($pro[$i]['status']),
! 'title' => $title,
'end_date' => $edateout,
! 'coordinator' => $coordinatorout
));
--- 267,287 ----
if ($action == 'mains')
{
! $td_action =
($pro[$i]['customerout']?$pro[$i]['customerout']:' ');
}
else
{
! $td_action =
($pro[$i]['sdateout']?$pro[$i]['sdateout']:' ');
}
// --------------- template declaration for list records
-------------------------------------
$GLOBALS['phpgw']->template->set_var(array
(
! 'number' =>
$pro[$i]['number'],
'td_action' => $td_action,
'status' =>
lang($pro[$i]['status']),
! 'title' =>
($pro[$i]['title']?$pro[$i]['title']:' '),
'end_date' => $edateout,
! 'coordinator' =>
$pro[$i]['coordinatorout']
));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2.11,1.42.2.5.2.12 class.uibilling.inc.php,1.18.2.6.2.1,1.18.2.6.2.2 class.uideliveries.inc.php,1.21.2.3.2.1,1.21.2.3.2.2 class.uiprojects.inc.php,1.47.2.7.2.8,1.47.2.7.2.9 class.uistatistics.inc.php,1.10.2.2.2.1,1.10.2.2.2.2,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2.10,1.42.2.5.2.11 class.soprojects.inc.php,1.34.2.6.2.9,1.34.2.6.2.10 class.uiprojects.inc.php,1.47.2.7.2.7,1.47.2.7.2.8
- Next by Date:
[Phpgroupware-cvs] CVS: projects/templates/default list_budget.tpl,1.1.2.1,1.1.2.2
- Previous by thread:
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2.10,1.42.2.5.2.11 class.soprojects.inc.php,1.34.2.6.2.9,1.34.2.6.2.10 class.uiprojects.inc.php,1.47.2.7.2.7,1.47.2.7.2.8
- Next by thread:
[Phpgroupware-cvs] CVS: projects/templates/default list_budget.tpl,1.1.2.1,1.1.2.2
- Index(es):