[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.11,1.12 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.11,1.12 class.botts.inc.php,1.4,1.5 class.sotts.inc.php,1.5,1.6 class.sotts2.inc.php,1.1,1.2 class.uilookup.inc.php,1.6,1.7 class.uitts.inc.php,1.7,1.8 |
|
Date: |
Tue, 11 Feb 2003 09:19:57 -0500 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv12993/inc
Modified Files:
class.bocommon.inc.php class.botts.inc.php class.sotts.inc.php
class.sotts2.inc.php class.uilookup.inc.php
class.uitts.inc.php
Log Message:
no message
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.bocommon.inc.php 11 Feb 2003 10:01:57 -0000 1.11
--- class.bocommon.inc.php 11 Feb 2003 14:19:54 -0000 1.12
***************
*** 201,204 ****
--- 201,205 ----
function initiate_ui_location($data)
{
+ //_debug_array($data);
if($data['equipment'])
***************
*** 221,234 ****
}
-
$location['overlib_source']
= './'.$this->currentapp.'/inc/overlib.js';
$location['value_property_id']
= $data['property_id'];
$location['value_building_id']
= $data['building_id'];
$location['value_entrance_id']
= $data['entrance_id'];
$location['value_apartment_id']
= $data['apartment_id'];
$location['value_tenant_id']
= $data['tenant_id'];
$location['value_equipment_id']
= $data['equipment_id'];
-
$location['lang_location']
= lang('Location');
$location['location_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=property');
--- 222,239 ----
}
$location['overlib_source']
= './'.$this->currentapp.'/inc/overlib.js';
$location['value_property_id']
= $data['property_id'];
+ $location['value_property_name']
= $data['property_name'];
$location['value_building_id']
= $data['building_id'];
$location['value_entrance_id']
= $data['entrance_id'];
+ $location['value_floor']
= $data['floor'];
+ $location['value_street_name']
= $data['street_name'];
+ $location['value_street_number']
= $data['street_number'];
$location['value_apartment_id']
= $data['apartment_id'];
$location['value_tenant_id']
= $data['tenant_id'];
+ $location['value_tenant_name']
= $data['tenant_name'];
+ $location['value_tenant_phone']
= $data['tenant_phone'];
$location['value_equipment_id']
= $data['equipment_id'];
$location['lang_location']
= lang('Location');
$location['location_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=property');
***************
*** 246,250 ****
$location['lang_select_equipment_help'] =
lang('Klick this link to select equipment');
-
$location['lang_property_name']
= lang('Property Name');
$location['lang_building']
= lang('Building');
--- 251,254 ----
***************
*** 254,257 ****
--- 258,262 ----
$location['lang_apartment']
= lang('Apartment');
+ //_debug_array($location);
return $location;
Index: class.botts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.botts.inc.php 6 Feb 2003 14:05:57 -0000 1.4
--- class.botts.inc.php 11 Feb 2003 14:19:54 -0000 1.5
***************
*** 554,566 ****
$mail_method=
$this->config->config_data['fmwrkorder_mail'];
! echo 'mail_method: '.$mail_method .'<BR>';
if ($mail_method=='smtp'):
{
! // $rc = $this->send->msg('email', $to, $subject,
stripslashes($body), '', $cc, $bcc,$user_address,$user_name,'txt');
}
elseif ($mail_method=='sendmail'):
{
! // $rc= mail($to,$subject,stripslashes($body),
$headers);
}
else:
--- 554,566 ----
$mail_method=
$this->config->config_data['fmwrkorder_mail'];
! // echo 'mail_method: '.$mail_method .'<BR>';
if ($mail_method=='smtp'):
{
! $rc = $this->send->msg('email', $to, $subject,
stripslashes($body), '', $cc, $bcc,$user_address,$user_name,'txt');
}
elseif ($mail_method=='sendmail'):
{
! $rc= @mail($to,$subject,stripslashes($body),
$headers);
}
else:
***************
*** 587,591 ****
}
! _debug_array($receipt);
return $receipt;
}
--- 587,591 ----
}
! //_debug_array($receipt);
return $receipt;
}
Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.sotts.inc.php 7 Feb 2003 11:18:44 -0000 1.5
--- class.sotts.inc.php 11 Feb 2003 14:19:54 -0000 1.6
***************
*** 106,110 ****
}
! $sql = "SELECT * FROM phpgw_fm_tts_tickets WHERE
$filtermethod $querymethod";
//echo $sql;
--- 106,110 ----
}
! $sql = "SELECT * FROM fm_tts_tickets WHERE
$filtermethod $querymethod";
//echo $sql;
***************
*** 123,127 ****
$tickets[$i]['location_code'] =
$this->db->f('location_code');
$tickets[$i]['owner'] =
$this->db->f('owner');
! $tickets[$i]['address'] =
$this->db->f('street');
$tickets[$i]['assignedto'] =
$this->db->f('assignedto');
$tickets[$i]['status'] =
$this->db->f('status');
--- 123,127 ----
$tickets[$i]['location_code'] =
$this->db->f('location_code');
$tickets[$i]['owner'] =
$this->db->f('owner');
! $tickets[$i]['address'] =
$this->db->f('street_name') . ' ' . $this->db->f('street_number');
$tickets[$i]['assignedto'] =
$this->db->f('assignedto');
$tickets[$i]['status'] =
$this->db->f('status');
***************
*** 129,133 ****
$tickets[$i]['grants'] =
$ngrants;
! $this->db2->query("select count(*) from
phpgw_fm_tts_views where id='" . $this->db->f('id')
. "' and account_id='" .
$GLOBALS['phpgw_info']['user']['account_id'] . "'",__LINE__,__FILE__);
$this->db2->next_record();
--- 129,133 ----
$tickets[$i]['grants'] =
$ngrants;
! $this->db2->query("select count(*) from
fm_tts_views where id='" . $this->db->f('id')
. "' and account_id='" .
$GLOBALS['phpgw_info']['user']['account_id'] . "'",__LINE__,__FILE__);
$this->db2->next_record();
***************
*** 146,150 ****
function read_single($id)
{
! $sql = "SELECT * FROM phpgw_fm_tts_tickets WHERE
id=$id";
$this->db->query($sql,__LINE__,__FILE__);
--- 146,150 ----
function read_single($id)
{
! $sql = "SELECT * FROM fm_tts_tickets WHERE id=$id";
$this->db->query($sql,__LINE__,__FILE__);
***************
*** 164,168 ****
$ticket['entrance_id'] =
$this->db->f('entrance_id');
$ticket['apartment_id'] =
$this->db->f('apartment_id');
! $ticket['street'] =
$this->db->f('street');
$owner_id=(int)$this->db->f('owner');
--- 164,169 ----
$ticket['entrance_id'] =
$this->db->f('entrance_id');
$ticket['apartment_id'] =
$this->db->f('apartment_id');
! $ticket['street_name'] =
$this->db->f('street_name');
! $ticket['street_number'] =
$this->db->f('street_number');
$owner_id=(int)$this->db->f('owner');
***************
*** 184,188 ****
{
// Have they viewed this ticket before ?
! $this->db->query("select count(*) from
phpgw_fm_tts_views where id='$id' "
. "and account_id='" .
$GLOBALS['phpgw_info']['user']['account_id'] . "'",__LINE__,__FILE__);
$this->db->next_record();
--- 185,189 ----
{
// Have they viewed this ticket before ?
! $this->db->query("select count(*) from fm_tts_views
where id='$id' "
. "and account_id='" .
$GLOBALS['phpgw_info']['user']['account_id'] . "'",__LINE__,__FILE__);
$this->db->next_record();
***************
*** 190,194 ****
if (! $this->db->f(0))
{
! $this->db->query("insert into
phpgw_fm_tts_views (id,account_id,time) values ('$id','"
.
$GLOBALS['phpgw_info']['user']['account_id'] . "','" . time() .
"')",__LINE__,__FILE__);
}
--- 191,195 ----
if (! $this->db->f(0))
{
! $this->db->query("insert into fm_tts_views
(id,account_id,time) values ('$id','"
.
$GLOBALS['phpgw_info']['user']['account_id'] . "','" . time() .
"')",__LINE__,__FILE__);
}
***************
*** 199,205 ****
{
! $this->db->query("insert into phpgw_fm_tts_tickets
(priority,owner,"
.
"assignedto,subject,cat_id,status,details,location_code,"
! .
"property_id,property_name,building_id,building_name,entrance_id,floor,apartment_id,street,tenant_id,tenant_name,contact_phone)
values ('"
. $ticket['priority'] . "','"
. $GLOBALS['phpgw_info']['user']['account_id']
. "','"
--- 200,206 ----
{
! $this->db->query("insert into fm_tts_tickets
(priority,owner,"
.
"assignedto,subject,cat_id,status,details,location_code,"
! .
"property_id,property_name,building_id,entrance_id,floor,apartment_id,street_name,street_number,tenant_id,tenant_name,contact_phone)
values ('"
. $ticket['priority'] . "','"
. $GLOBALS['phpgw_info']['user']['account_id']
. "','"
***************
*** 212,225 ****
. $ticket['property_name'] . "','"
. $ticket['building_id'] . "','"
- . $ticket['building_name'] . "','"
. $ticket['entrance_id'] . "','"
. $ticket['floor'] . "','"
. $ticket['apartment_id'] . "','"
! . $ticket['street'] . "','"
. $ticket['tenant_id'] . "','"
. $ticket['tenant_name'] . "','"
! . $ticket['contact_phone'] .
"')",__LINE__,__FILE__);
! $id =
$this->db->get_last_insert_id('phpgw_fm_tts_tickets','id');
$this->historylog =
createobject('phpgwapi.historylog',$this->currentapp);
--- 213,226 ----
. $ticket['property_name'] . "','"
. $ticket['building_id'] . "','"
. $ticket['entrance_id'] . "','"
. $ticket['floor'] . "','"
. $ticket['apartment_id'] . "','"
! . $ticket['street_name'] . "','"
! . $ticket['street_number'] . "','"
. $ticket['tenant_id'] . "','"
. $ticket['tenant_name'] . "','"
! . $ticket['tenant_phone'] .
"')",__LINE__,__FILE__);
! $id =
$this->db->get_last_insert_id('fm_tts_tickets','id');
$this->historylog =
createobject('phpgwapi.historylog',$this->currentapp);
Index: class.sotts2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts2.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.sotts2.inc.php 6 Feb 2003 14:05:58 -0000 1.1
--- class.sotts2.inc.php 11 Feb 2003 14:19:54 -0000 1.2
***************
*** 22,26 ****
{
// DB Content is fresher than http posted value.
! $this->db->query("select * from phpgw_fm_tts_tickets
where id='$id'",__LINE__,__FILE__);
$this->db->next_record();
--- 22,26 ----
{
// DB Content is fresher than http posted value.
! $this->db->query("select * from fm_tts_tickets where
id='$id'",__LINE__,__FILE__);
$this->db->next_record();
***************
*** 69,73 ****
$this->historylog->add('R',$id,$ticket['status'],$old_status);
! $this->db->query("update
phpgw_fm_tts_tickets set status='O' where id='$id'",__LINE__,__FILE__);
}
else
--- 69,73 ----
$this->historylog->add('R',$id,$ticket['status'],$old_status);
! $this->db->query("update fm_tts_tickets
set status='O' where id='$id'",__LINE__,__FILE__);
}
else
***************
*** 75,79 ****
$this->historylog->add($ticket['status'],$id,$ticket['status'],$old_status);
! $this->db->query("update
phpgw_fm_tts_tickets set status='"
. $ticket['status'] . "' where
id='$id'",__LINE__,__FILE__);
}
--- 75,79 ----
$this->historylog->add($ticket['status'],$id,$ticket['status'],$old_status);
! $this->db->query("update fm_tts_tickets
set status='"
. $ticket['status'] . "' where
id='$id'",__LINE__,__FILE__);
}
***************
*** 83,87 ****
{
$fields_updated = True;
! $this->db->query("update phpgw_fm_tts_tickets
set assignedto='" . $ticket['assignedto']
. "' where id='$id'",__LINE__,__FILE__);
$this->historylog->add('A',$id,$ticket['assignedto'],$oldassigned);
--- 83,87 ----
{
$fields_updated = True;
! $this->db->query("update fm_tts_tickets set
assignedto='" . $ticket['assignedto']
. "' where id='$id'",__LINE__,__FILE__);
$this->historylog->add('A',$id,$ticket['assignedto'],$oldassigned);
***************
*** 91,95 ****
{
$fields_updated = True;
! $this->db->query("update phpgw_fm_tts_tickets
set priority='" . $ticket['priority']
. "' where id='$id'",__LINE__,__FILE__);
$this->historylog->add('P',$id,$ticket['priority'],$oldpriority);
--- 91,95 ----
{
$fields_updated = True;
! $this->db->query("update fm_tts_tickets set
priority='" . $ticket['priority']
. "' where id='$id'",__LINE__,__FILE__);
$this->historylog->add('P',$id,$ticket['priority'],$oldpriority);
***************
*** 99,103 ****
{
$fields_updated = True;
! $this->db->query("update phpgw_fm_tts_tickets
set cat_id='" . $ticket['cat_id']
. "' where id='$id'",__LINE__,__FILE__);
$this->historylog->add('T',$id,$ticket['cat_id'],$oldcat_id);
--- 99,103 ----
{
$fields_updated = True;
! $this->db->query("update fm_tts_tickets set
cat_id='" . $ticket['cat_id']
. "' where id='$id'",__LINE__,__FILE__);
$this->historylog->add('T',$id,$ticket['cat_id'],$oldcat_id);
***************
*** 107,111 ****
{
$fields_updated = True;
! $this->db->query("update phpgw_fm_tts_tickets
set billable_hours='" . $ticket['billable_hours']
. "' where id='$id'",__LINE__,__FILE__);
$this->historylog->add('H',$id,$ticket['billable_hours'],$old_billable_hours);
--- 107,111 ----
{
$fields_updated = True;
! $this->db->query("update fm_tts_tickets set
billable_hours='" . $ticket['billable_hours']
. "' where id='$id'",__LINE__,__FILE__);
$this->historylog->add('H',$id,$ticket['billable_hours'],$old_billable_hours);
***************
*** 115,119 ****
{
$fields_updated = True;
! $this->db->query("update phpgw_fm_tts_tickets
set billable_rate='" . $ticket['billable_rate']
. "' where id='$id'",__LINE__,__FILE__);
$this->historylog->add('B',$id,$ticket['billable_rate'],$old_billable_rate);
--- 115,119 ----
{
$fields_updated = True;
! $this->db->query("update fm_tts_tickets set
billable_rate='" . $ticket['billable_rate']
. "' where id='$id'",__LINE__,__FILE__);
$this->historylog->add('B',$id,$ticket['billable_rate'],$old_billable_rate);
Index: class.uilookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilookup.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.uilookup.inc.php 10 Feb 2003 16:46:15 -0000 1.6
--- class.uilookup.inc.php 11 Feb 2003 14:19:54 -0000 1.7
***************
*** 254,260 ****
'cat_id'
=>$this->cat_id,
'district_id' =>
$this->district_id,
!
'list'
=> $list)
)),
'lang_property' => lang('Property'),
'lang_property_name'=> lang('Property name'),
'lang_building' => lang('Building'),
--- 254,270 ----
'cat_id'
=>$this->cat_id,
'district_id' =>
$this->district_id,
!
'list'
=> $list)
)),
'lang_property' => lang('Property'),
+ 'sort_property_name' =>
$this->nextmatchs->show_sort_order(array
+
(
+
'sort' => $this->sort,
+
'var' => 'navn',
+
'order' => $this->order,
+
'extra' => array('menuaction' =>
$this->currentapp.'.uilookup.location',
+
'cat_id'
=>$this->cat_id,
+
'district_id' =>
$this->district_id,
+
'list'
=> $list)
+
)),
'lang_property_name'=> lang('Property name'),
'lang_building' => lang('Building'),
***************
*** 270,274 ****
'cat_id'
=>$this->cat_id,
'district_id' =>
$this->district_id,
!
'list'
=> $list)
)),
'lang_street_name' => lang('Street
Name'),
--- 280,284 ----
'cat_id'
=>$this->cat_id,
'district_id' =>
$this->district_id,
!
'list'
=> $list)
)),
'lang_street_name' => lang('Street
Name'),
***************
*** 282,286 ****
'cat_id'
=>$this->cat_id,
'district_id' =>
$this->district_id,
!
'list'
=> $list)
)),
'lang_tenant' => lang('Tenant'),
--- 292,296 ----
'cat_id'
=>$this->cat_id,
'district_id' =>
$this->district_id,
!
'list'
=> $list)
)),
'lang_tenant' => lang('Tenant'),
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uitts.inc.php 11 Feb 2003 10:01:57 -0000 1.7
--- class.uitts.inc.php 11 Feb 2003 14:19:54 -0000 1.8
***************
*** 251,266 ****
--- 251,282 ----
$values['property_id'] =
get_var('property_id',array('POST'));
+ $values['property_name'] =
get_var('property_name',array('POST'));
$values['building_id'] =
get_var('building_id',array('POST'));
$values['entrance_id'] =
get_var('entrance_id',array('POST'));
+ $values['floor'] =
get_var('floor',array('POST'));
$values['apartment_id'] =
get_var('apartment_id',array('POST'));
$values['equipment_id'] =
get_var('equipment_id',array('POST'));
+ $values['street_name'] =
get_var('street_name',array('POST'));
+ $values['street_number'] =
get_var('street_number',array('POST'));
+ $values['tenant_id'] =
get_var('tenant_id',array('POST'));
+ $values['tenant_name'] =
get_var('tenant_name',array('POST'));
+ $values['tenant_phone'] =
get_var('tenant_phone',array('POST'));
$location_data=$this->bocommon->initiate_ui_location(array('equipment'
=> False,
'tenant'
=> True,
'property_id'
=> $values['property_id'],
+
'property_name'
=> $values['property_name'],
'building_id'
=> $values['building_id'],
'entrance_id'
=> $values['entrance_id'],
+
'floor'
=> $values['floor'],
+
'street_name'
=> $values['street_name'],
+
'street_number'
=> $values['street_number'],
'apartment_id'
=> $values['apartment_id'],
+
'tenant_id'
=> $values['tenant_id'],
+
'tenant_name'
=> $values['tenant_name'],
+
'tenant_phone'
=> $values['tenant_phone'],
'equipment_id'
=> $values['equipment_id']));
+
+
//_debug_array($values);
if ($values['save'])
***************
*** 280,284 ****
if(!$values['cat_id'])
{
! //
$receipt['error'][$errorcount++]=array('msg'=>lang('Please select a category
!'));
}
--- 296,300 ----
if(!$values['cat_id'])
{
!
$receipt['error'][$errorcount++]=array('msg'=>lang('Please select a category
!'));
}
***************
*** 290,294 ****
if(!$values['property_id'] &&
!$values['equipment_id'])
{
! //
$receipt['error'][$errorcount++]=array('msg'=>lang('Pleace select a location -
or an equipment !'));
}
--- 306,310 ----
if(!$values['property_id'] &&
!$values['equipment_id'])
{
!
$receipt['error'][$errorcount++]=array('msg'=>lang('Pleace select a location -
or an equipment !'));
}
***************
*** 332,355 ****
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.index&sub='
. $sub),
'lang_subject'
=> lang('Subject'),
- 'value_subject'
=> $values['subject'],
'lang_subject_statustext' =>
lang('Enter the subject of this ticket'),
'lang_details'
=> lang('Details'),
- 'value_details'
=> $values['details'],
'lang_details_statustext' =>
lang('Enter the details of this ticket'),
'lang_category'
=> lang('category'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
! 'value_property_id'
=> $property_id,
! 'value_building_id'
=> $building_id,
! 'value_cat'
=> $building['cat'],
'error'
=> $receipt['error'],
'message'
=> $receipt['message'],
! 'lang_name_statustext' =>
lang('Enter the name of the building'),
! 'lang_property_id_statustext' => lang('Enter
Property ID'),
! 'lang_building_id_statustext' => lang('Enter
Building ID'),
! 'lang_generaladdress_statustext'=> lang('Enter
the general address'),
! 'lang_done_statustext' =>
lang('Back to the list'),
! 'lang_save_statustext' =>
lang('Save the building'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY'),
--- 348,364 ----
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.index&sub='
. $sub),
'lang_subject'
=> lang('Subject'),
'lang_subject_statustext' =>
lang('Enter the subject of this ticket'),
'lang_details'
=> lang('Details'),
'lang_details_statustext' =>
lang('Enter the details of this ticket'),
'lang_category'
=> lang('category'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
! 'value_details'
=> $values['details'],
! 'value_subject'
=> $values['subject'],
'error'
=> $receipt['error'],
'message'
=> $receipt['message'],
! 'lang_done_statustext' =>
lang('Back to the ticket list'),
! 'lang_save_statustext' =>
lang('Save the ticket'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY'),
***************
*** 358,366 ****
'lang_part_of_town'
=> lang('Part of town'),
'lang_no_part_of_town' =>
lang('No part of town'),
! 'cat_list'
=> $this->cats->formatted_xslt_list(array('format' =>
'select','selected' => $values['cat_id'],'globals' => True)),
! 'building_type_id'
=> $building['building_type_id'],
! 'location_code'
=> $building['location_code'],
!
!
);
--- 367,371 ----
'lang_part_of_town'
=> lang('Part of town'),
'lang_no_part_of_town' =>
lang('No part of town'),
! 'cat_list'
=> $this->cats->formatted_xslt_list(array('format' =>
'select','selected' => $values['cat_id'],'globals' => True))
);
***************
*** 441,445 ****
'floor' =>
$ticket['floor'],
'apartment_id' =>
$ticket['apartment_id'],
! 'street' =>
$ticket['street'],
'tenant_id' =>
$ticket['tenant_id'],
'contact_phone' =>
$ticket['contact_phone']
--- 446,451 ----
'floor' =>
$ticket['floor'],
'apartment_id' =>
$ticket['apartment_id'],
! 'street_name' =>
$ticket['street_name'],
! 'street_number' =>
$ticket['street_number'],
'tenant_id' =>
$ticket['tenant_id'],
'contact_phone' =>
$ticket['contact_phone']
***************
*** 459,463 ****
'floor' =>
$ticket['floor'],
'apartment_id' =>
$ticket['apartment_id'],
! 'street' =>
$ticket['street'],
'tenant_id' =>
$ticket['tenant_id'],
'contact_phone' =>
$ticket['contact_phone']
--- 465,470 ----
'floor' =>
$ticket['floor'],
'apartment_id' =>
$ticket['apartment_id'],
! 'street_name' =>
$ticket['street_name'],
! 'street_number' =>
$ticket['street_number'],
'tenant_id' =>
$ticket['tenant_id'],
'contact_phone' =>
$ticket['contact_phone']
***************
*** 503,507 ****
'value_entrance_id'
=> $ticket['entrance_id'],
'value_apartment_id' =>
$ticket['apartment_id'],
! 'value_street'
=> $ticket['street'],
'lang_ticket'
=> lang('Ticket'),
--- 510,514 ----
'value_entrance_id'
=> $ticket['entrance_id'],
'value_apartment_id' =>
$ticket['apartment_id'],
! 'value_street'
=> $ticket['street_name'] . ' ' . $ticket['street_number'],
'lang_ticket'
=> lang('Ticket'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.11,1.12 class.botts.inc.php,1.4,1.5 class.sotts.inc.php,1.5,1.6 class.sotts2.inc.php,1.1,1.2 class.uilookup.inc.php,1.6,1.7 class.uitts.inc.php,1.7,1.8,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.29,1.30
- Next by Date:
[Phpgroupware-cvs] CVS: property/setup setup.inc.php,1.18,1.19 tables_current.inc.php,1.30,1.31
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.29,1.30
- Next by thread:
[Phpgroupware-cvs] CVS: property/setup setup.inc.php,1.18,1.19 tables_current.inc.php,1.30,1.31
- Index(es):