[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.boproject.inc.php class.bowo...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.boproject.inc.php class.bowo... |
|
Date: |
Tue, 20 Feb 2007 22:22:20 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 07/02/20 22:22:20
Modified files:
inc : class.boproject.inc.php
class.boworkorder.inc.php
class.soproject.inc.php class.sotts.inc.php
class.sowo_hour.inc.php class.uiproject.inc.php
class.uitts.inc.php
Log message:
notices
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boproject.inc.php?cvsroot=phpgroupware&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boworkorder.inc.php?cvsroot=phpgroupware&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soproject.inc.php?cvsroot=phpgroupware&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.sotts.inc.php?cvsroot=phpgroupware&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.sowo_hour.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiproject.inc.php?cvsroot=phpgroupware&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uitts.inc.php?cvsroot=phpgroupware&r1=1.54&r2=1.55
Patches:
Index: class.boproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boproject.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- class.boproject.inc.php 26 Jan 2007 14:53:46 -0000 1.21
+++ class.boproject.inc.php 20 Feb 2007 22:22:20 -0000 1.22
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.boproject.inc.php,v 1.21 2007/01/26 14:53:46
sigurdne Exp $
+ * @version $Id: class.boproject.inc.php,v 1.22 2007/02/20 22:22:20
sigurdne Exp $
*/
/**
@@ -253,6 +253,11 @@
$project['end_date'] =
$GLOBALS['phpgw']->common->show_date($project['end_date'],$dateformat);
$workorder_data =
$this->so->project_workorder_data($project_id);
+ $sum_workorder_budget = 0;
+ $sum_deviation = 0;
+ $sum_workorder_calculation = 0;
+ $sum_workorder_actual_cost = 0;
+
for ($i=0;$i<count($workorder_data);$i++)
{
$sum_workorder_budget=
$sum_workorder_budget+$workorder_data[$i]['budget'];
Index: class.boworkorder.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boworkorder.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- class.boworkorder.inc.php 26 Jan 2007 14:53:46 -0000 1.21
+++ class.boworkorder.inc.php 20 Feb 2007 22:22:20 -0000 1.22
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.boworkorder.inc.php,v 1.21 2007/01/26 14:53:46
sigurdne Exp $
+ * @version $Id: class.boworkorder.inc.php,v 1.22 2007/02/20 22:22:20
sigurdne Exp $
*/
/**
@@ -192,7 +192,6 @@
function select_branch_p_list($project_id='')
{
-
$selected =
$this->so->branch_p_list($project_id);
$branch_entries = $this->so->select_branch_list();
@@ -212,18 +211,9 @@
$j++;
}
- for ($i=0;$i<count($branch_list);$i++)
- {
- if ($branch_list[$i]['selected'] != 'selected')
- {
- unset($branch_list[$i]['selected']);
- }
- }
-
return $branch_list;
}
-
function select_key_location_list($selected='')
{
$key_location_entries=
$this->so->select_key_location_list();
Index: class.soproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- class.soproject.inc.php 19 Feb 2007 21:02:41 -0000 1.40
+++ class.soproject.inc.php 20 Feb 2007 22:22:20 -0000 1.41
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.soproject.inc.php,v 1.40 2007/02/19 21:02:41
sigurdne Exp $
+ * @version $Id: class.soproject.inc.php,v 1.41 2007/02/20 22:22:20
sigurdne Exp $
*/
/**
@@ -385,6 +385,7 @@
$this->db->query($sql,__LINE__,__FILE__);
+ $last_type = false;
$i=-1;
while ($this->db->next_record())
{
Index: class.sotts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- class.sotts.inc.php 26 Jan 2007 14:53:47 -0000 1.22
+++ class.sotts.inc.php 20 Feb 2007 22:22:20 -0000 1.23
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.sotts.inc.php,v 1.22 2007/01/26 14:53:47 sigurdne
Exp $
+ * @version $Id: class.sotts.inc.php,v 1.23 2007/02/20 22:22:20 sigurdne
Exp $
*/
/**
@@ -286,15 +286,14 @@
$date_info['date_info'][$i]['entry_date']=
$GLOBALS['phpgw']->common->show_date($this->db->f('entry_date'),$this->dateformat);
if($cat_id)
{
-
$date_info['date_info'][$i]['link']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.view&entity_id='.$entity_id.'&cat_id='
. $cat_id . '&id=' . $this->db->f('destination_id'));
+
$date_info['date_info'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uientity.view','entity_id'=> $entity_id,'cat_id'=>
$cat_id, 'id'=> $this->db->f('destination_id')));
$date_info['date_info'][$i]['descr']=$this->soadmin_entity->read_category_name($entity_id,$cat_id);
}
else
{
-
$date_info['date_info'][$i]['link']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.ui'
. $type . '.view&id=' . $this->db->f('destination_id'));
+
$date_info['date_info'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.ui' . $type . '.view','id'=>
$this->db->f('destination_id')));
$date_info['date_info'][$i]['descr']=lang($type);
}
-
$i++;
}
//_debug_array($date_info);
@@ -341,11 +340,11 @@
}
-
$sql = "SELECT * FROM fm_origin WHERE origin = 'tts'
AND origin_id='$id' ORDER by destination DESC ";
$this->db->query($sql,__LINE__,__FILE__);
+ $last_type = false;
$i=-1;
while ($this->db->next_record())
{
Index: class.sowo_hour.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.sowo_hour.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.sowo_hour.inc.php 26 Jan 2007 14:53:47 -0000 1.17
+++ class.sowo_hour.inc.php 20 Feb 2007 22:22:20 -0000 1.18
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.sowo_hour.inc.php,v 1.17 2007/01/26 14:53:47
sigurdne Exp $
+ * @version $Id: class.sowo_hour.inc.php,v 1.18 2007/02/20 22:22:20
sigurdne Exp $
*/
/**
@@ -111,7 +111,6 @@
$workorder_id =
(isset($data['workorder_id'])?$data['workorder_id']:0);
}
-
$ordermethod = ' order by grouping_id, record , id asc
';
$sql = "SELECT fm_wo_hours.*,
fm_wo_hours_category.descr as wo_hour_category"
@@ -120,6 +119,7 @@
$this->db->query($sql . $ordermethod,__LINE__,__FILE__);
$this->total_records = $this->db->num_rows();
+ $hour_list = array();
while ($this->db->next_record())
{
$hour_list[] = array
Index: class.uiproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- class.uiproject.inc.php 19 Feb 2007 21:02:41 -0000 1.50
+++ class.uiproject.inc.php 20 Feb 2007 22:22:20 -0000 1.51
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uiproject.inc.php,v 1.50 2007/02/19 21:02:41
sigurdne Exp $
+ * @version $Id: class.uiproject.inc.php,v 1.51 2007/02/20 22:22:20
sigurdne Exp $
*/
/**
@@ -1186,7 +1186,7 @@
'tenant' =>
$values['location_data']['tenant_id'],
'lookup_type' => 'view',
'lookup_entity' =>
$this->bocommon->get_lookup_entity('project'),
- 'entity_data' => $values['p']
+ 'entity_data' =>
isset($values['p'])?$values['p']:''
));
if($values['contact_phone'])
@@ -1239,8 +1239,8 @@
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
'value_origin' =>
$values['origin'],
- 'value_origin_type' =>
$origin,
- 'value_origin_id' =>
$origin_id,
+ // 'value_origin_type' =>
$origin,
+ // 'value_origin_id' =>
$origin_id,
'table_header_workorder_budget' =>
$table_header_workorder_budget,
'lang_no_workorders' =>
lang('No workorder budget'),
@@ -1257,7 +1257,7 @@
'value_end_date' =>
$values['end_date'],
'lang_charge_tenant' =>
lang('Charge tenant'),
- 'charge_tenant' =>
$values['charge_tenant'],
+ 'charge_tenant' =>
isset($values['charge_tenant'])?$values['charge_tenant']:'',
'lang_power_meter' =>
lang('Power meter'),
'value_power_meter' =>
$values['power_meter'],
@@ -1270,10 +1270,10 @@
'lang_reserve_statustext' =>
lang('Enter the reserve'),
'lang_reserve_remainder' =>
lang('reserve remainder'),
- 'value_reserve_remainder' =>
$reserve_remainder,
- 'value_reserve_remainder_percent' =>
$remainder_percent,
+ 'value_reserve_remainder' =>
isset($reserve_remainder)?$reserve_remainder:'',
+ 'value_reserve_remainder_percent' =>
isset($remainder_percent)?$remainder_percent:'',
- 'vendor_data' =>
$vendor_data,
+ 'vendor_data' =>
isset($vendor_data)?$vendor_data:'',
'location_data' =>
$location_data,
'location_type' =>
'view',
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.index')),
Index: class.uitts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- class.uitts.inc.php 26 Jan 2007 14:53:47 -0000 1.54
+++ class.uitts.inc.php 20 Feb 2007 22:22:20 -0000 1.55
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.uitts.inc.php,v 1.54 2007/01/26 14:53:47 sigurdne
Exp $
+ * @version $Id: class.uitts.inc.php,v 1.55 2007/02/20 22:22:20 sigurdne
Exp $
*/
/**
@@ -1591,7 +1591,7 @@
$entity_id = $type[1];
$cat_id = $type[2];
- if(!is_object($boadmin_entity))
+ if(!isset($boadmin_entity) ||
!is_object($boadmin_entity))
{
$boadmin_entity =
CreateObject($this->currentapp.'.boadmin_entity');
}
@@ -1684,7 +1684,7 @@
'lang_assignedfrom' =>
lang('Assigned from'),
'value_assignedfrom' =>
$ticket['user_name'],
'lang_assignedto' =>
lang('Assigned to'),
- 'value_assignedto' =>
$ticket['assignedto_name'],
+ 'value_assignedto' =>
isset($ticket['assignedto_name'])?$ticket['assignedto_name']:'',
'lang_no_additional_notes' =>
lang('No additional notes'),
'lang_history' =>
lang('History'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.boproject.inc.php class.bowo...,
Sigurd Nes <=