[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.boequipment.inc.php,1.6,1.7 c
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.boequipment.inc.php,1.6,1.7 class.boproject.inc.php,1.2,1.3 class.soequipment.inc.php,1.10,1.11 class.soproject.inc.php,1.5,1.6 class.uiequipment.inc.php,1.11,1.12 class.uiproject.inc.php,1.7,1.8 |
|
Date: |
Wed, 09 Apr 2003 16:14:13 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv4740/inc
Modified Files:
class.boequipment.inc.php class.boproject.inc.php
class.soequipment.inc.php class.soproject.inc.php
class.uiequipment.inc.php class.uiproject.inc.php
Log Message:
no message
Index: class.boequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boequipment.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.boequipment.inc.php 18 Feb 2003 09:13:57 -0000 1.6
--- class.boequipment.inc.php 9 Apr 2003 20:14:11 -0000 1.7
***************
*** 186,189 ****
--- 186,194 ----
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$equipment['date'] =
$GLOBALS['phpgw']->common->show_date($equipment['date'],$dateformat);
+
+
$location_data=$this->socommon->read_location_data($equipment['location_code']);
+
+ $equipment=$equipment + $location_data;
+
return $equipment;
}
***************
*** 196,199 ****
--- 201,205 ----
function save($equipment,$action='')
{
+
$equipment['location_code']=$this->bocommon->location_code($equipment['property_id'],$equipment['building_id'],$equipment['entrance_id'],$equipment['apartment_id']);
$date =
$this->bocommon->date_array($equipment['date']);
***************
*** 221,225 ****
if(!$receipt['error'])
{
-
$equipment['location_code']=$this->bocommon->location_code($equipment['property_id'],$equipment['building_id'],$equipment['entrance_id'],$equipment['apartment_id']);
$receipt = $this->so->add($equipment);
}
--- 227,230 ----
Index: class.boproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boproject.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.boproject.inc.php 18 Mar 2003 10:51:28 -0000 1.2
--- class.boproject.inc.php 9 Apr 2003 20:14:11 -0000 1.3
***************
*** 303,310 ****
}
! //
$location_data=$this->socommon->read_location_data($project['location_code']);
//
$project['power_meter']=$location_data['power_meter_id'];
! //_debug_array($project);
return $project;
}
--- 303,313 ----
}
!
$location_data=$this->socommon->read_location_data($project['location_code']);
!
! $project=$project + $location_data;
!
//
$project['power_meter']=$location_data['power_meter_id'];
! //_debug_array($location_data);
return $project;
}
Index: class.soequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soequipment.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.soequipment.inc.php 4 Apr 2003 11:12:02 -0000 1.10
--- class.soequipment.inc.php 9 Apr 2003 20:14:11 -0000 1.11
***************
*** 124,131 ****
$query = ereg_replace('"','',$query);
! $querymethod = " AND fm_equipment.property_id
LIKE '%$query%' or fm_equipment.descr LIKE '%$query%'";
}
! $sql = "SELECT equipment_id,fm_equipment.descr,
fm_property.name,fm_equipment.property_id,building_id,entrance_id,floor,apartment_id,street_name,street_number,
fm_equipment_type.name as category"
. " FROM fm_equipment $this->join"
. " fm_property ON fm_equipment.property_id =
fm_property.property_id $this->join"
--- 124,131 ----
$query = ereg_replace('"','',$query);
! $querymethod = " AND fm_equipment.property_id
LIKE '%$query%' or fm_equipment.descr LIKE '%$query%' or fm_equipment.address
LIKE '%$query%'";
}
! $sql = "SELECT
equipment_id,fm_equipment.location_code,fm_equipment.descr,fm_equipment.address
as address, fm_equipment_type.name as category"
. " FROM fm_equipment $this->join"
. " fm_property ON fm_equipment.property_id =
fm_property.property_id $this->join"
***************
*** 144,156 ****
(
'equipment_id' =>
$this->db->f('equipment_id'),
! 'property_id' =>
$this->db->f('property_id'),
! 'property_name' => $this->db->f('name'),
! 'building_id' =>
$this->db->f('building_id'),
! 'entrance_id' =>
$this->db->f('entrance_id'),
! 'floor' =>
$this->db->f('floor'),
! 'apartment_id' =>
$this->db->f('apartment_id'),
! 'street' =>
$this->db->f('street_name') .' ' . $this->db->f('street_number'),
! 'street_name' =>
$this->db->f('street_name'),
! 'street_number' =>
$this->db->f('street_number'),
'category' =>
$this->db->f('category'),
'descr' =>
$this->db->f('descr'),
--- 144,149 ----
(
'equipment_id' =>
$this->db->f('equipment_id'),
! 'location_code' =>
$this->db->f('location_code'),
! 'address' =>
$this->db->f('address'),
'category' =>
$this->db->f('category'),
'descr' =>
$this->db->f('descr'),
***************
*** 158,161 ****
--- 151,155 ----
);
}
+ //_debug_array($equipment_list);
if($filter)
***************
*** 178,190 ****
(
'equipment_id' =>
$equipment['equipment_id'],
! 'property_id' =>
$equipment['property_id'],
! 'property_name' =>
$equipment['property_name'],
! 'building_id' =>
$equipment['building_id'],
! 'entrance_id' =>
$equipment['entrance_id'],
! 'floor'
=> $equipment['floor'],
! 'apartment_id' =>
$equipment['apartment_id'],
! 'street'
=> $equipment['street'],
! 'street_name' =>
$equipment['street_name'],
! 'street_number' =>
$equipment['street_number'],
'category'
=> $equipment['category'],
'descr'
=> $equipment['descr'],
--- 172,177 ----
(
'equipment_id' =>
$equipment['equipment_id'],
! 'location_code' =>
$equipment['location_code'],
! 'address'
=> $equipment['address'],
'category'
=> $equipment['category'],
'descr'
=> $equipment['descr'],
***************
*** 204,209 ****
function read_single($equipment_id)
{
! $sql = "SELECT
property_id,property_name,building_id,entrance_id,floor,apartment_id,street_name,street_number,"
! . " equipment_type_id, descr,lifetime,
org_name,vendor_id , e.status as status, e.date as date,cost from "
. " fm_equipment as e $this->join phpgw_addressbook as
a on e.vendor_id=a.id where equipment_id='$equipment_id'";
--- 191,195 ----
function read_single($equipment_id)
{
! $sql = "SELECT location_code,equipment_type_id,
descr,lifetime, org_name,vendor_id , e.status as status, e.date as date,cost
from "
. " fm_equipment as e $this->join phpgw_addressbook as
a on e.vendor_id=a.id where equipment_id='$equipment_id'";
***************
*** 213,222 ****
{
$equipment['equipment_id'] =
$equipment_id;
! $equipment['property_id'] =
$this->db->f('property_id');
! $equipment['property_name'] =
$this->db->f('property_name');
! $equipment['building_id'] =
$this->db->f('building_id');
! $equipment['entrance_id'] =
$this->db->f('entrance_id');
! $equipment['apartment_id'] =
$this->db->f('apartment_id');
! $equipment['floor']
= $this->db->f('floor');
$equipment['descr']
= $this->db->f('descr');
$equipment['status'] =
$this->db->f('status');
--- 199,203 ----
{
$equipment['equipment_id'] =
$equipment_id;
! $equipment['location_code'] =
$this->db->f('location_code');
$equipment['descr']
= $this->db->f('descr');
$equipment['status'] =
$this->db->f('status');
***************
*** 225,230 ****
$equipment['vendor_name'] =
$this->db->f('org_name');
$equipment['lifetime'] =
$this->db->f('lifetime');
- $equipment['street_name'] =
$this->db->f('street_name');
- $equipment['street_number'] =
$this->db->f('street_number');
$equipment['owner']
= $this->db->f('owner');
$equipment['access'] =
$this->db->f('access');
--- 206,209 ----
***************
*** 278,284 ****
{
$equipment['descr'] =
$this->db->db_addslashes($equipment['descr']);
//_debug_array($equipment);
! $this->db->query("INSERT INTO fm_equipment
(equipment_id,lifetime,status,equipment_type_id,cost,date,descr,location_code,
property_id,property_name,building_id,entrance_id,floor,apartment_id,street_name,street_number,vendor_id,owner)
"
. "VALUES ('"
. $equipment['equipment_id']. "','"
--- 257,272 ----
{
+ if($equipment['street_number'])
+ {
+ $address= $equipment['street_name'] . ' ' .
$equipment['street_number'];
+ }
+ else
+ {
+ $address= $equipment['street_name'];
+ }
+
$equipment['descr'] =
$this->db->db_addslashes($equipment['descr']);
//_debug_array($equipment);
! $this->db->query("INSERT INTO fm_equipment
(equipment_id,lifetime,status,equipment_type_id,cost,date,descr,location_code,property_id,address,vendor_id,owner)
"
. "VALUES ('"
. $equipment['equipment_id']. "','"
***************
*** 291,305 ****
. $equipment['location_code']. "','"
. $equipment['property_id']. "','"
! . $equipment['property_name']. "','"
! . $equipment['building_id']. "','"
! . $equipment['entrance_id']. "','"
! . $equipment['floor']. "','"
! . $equipment['apartment_id'] . "','"
! . $equipment['street_name'] . "','"
! . $equipment['street_number'] . "','"
. $equipment['vendor_id'] . "','"
. $this->account. "')",__LINE__,__FILE__);
! $receipt['message'][] = array('msg'=>lang('equipment
has been saved'));
return $receipt;
}
--- 279,287 ----
. $equipment['location_code']. "','"
. $equipment['property_id']. "','"
! . $address . "','"
. $equipment['vendor_id'] . "','"
. $this->account. "')",__LINE__,__FILE__);
! $receipt['message'][] = array('msg'=>lang('Equipment %1
has been saved',$equipment['equipment_id']));
return $receipt;
}
***************
*** 307,310 ****
--- 289,302 ----
function edit($equipment)
{
+ //_debug_array($equipment);
+ if($equipment['street_number'])
+ {
+ $address= $equipment['street_name'] . ' ' .
$equipment['street_number'];
+ }
+ else
+ {
+ $address= $equipment['street_name'];
+ }
+
$equipment['descr'] =
$this->db->db_addslashes($equipment['descr']);
***************
*** 318,332 ****
location_code='" . $equipment['location_code']
. "',
property_id='" . $equipment['property_id'] . "',
! property_name='" . $equipment['property_name']
. "',
! building_id='" . $equipment['building_id'] . "',
! entrance_id='" . $equipment['entrance_id'] . "',
! floor='" . $equipment['floor'] . "',
! apartment_id='" . $equipment['apartment_id'] .
"',
! street_name='" . $equipment['street_name'] . "',
! street_number='" . $equipment['street_number']
. "',
vendor_id='" . $equipment['vendor_id']
. "' WHERE equipment_id= '" .
$equipment['equipment_id'] ."'",__LINE__,__FILE__);
! $receipt['message'][] = array('msg'=>lang('equipment
has been edited'));
return $receipt;
}
--- 310,318 ----
location_code='" . $equipment['location_code']
. "',
property_id='" . $equipment['property_id'] . "',
! address='" . $address . "',
vendor_id='" . $equipment['vendor_id']
. "' WHERE equipment_id= '" .
$equipment['equipment_id'] ."'",__LINE__,__FILE__);
! $receipt['message'][] = array('msg'=>lang('equipment %1
has been edited',$equipment['equipment_id']));
return $receipt;
}
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.soproject.inc.php 21 Mar 2003 22:35:48 -0000 1.5
--- class.soproject.inc.php 9 Apr 2003 20:14:11 -0000 1.6
***************
*** 161,168 ****
$query = ereg_replace('"','',$query);
! $querymethod = " AND fm_wo_project.name LIKE
'%$query%' or fm_wo_project.descr LIKE '%$query%' or fm_wo_project.street_name
LIKE '%$query%' or fm_wo_project.location_code LIKE '%$query%'";
}
! $sql = "SELECT * FROM fm_wo_project $this->join
phpgw_accounts ON fm_wo_project.owner = phpgw_accounts.account_id WHERE
$filtermethod $querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
--- 161,168 ----
$query = ereg_replace('"','',$query);
! $querymethod = " AND fm_wo_project.name LIKE
'%$query%' or fm_wo_project.descr LIKE '%$query%' or fm_wo_project.address LIKE
'%$query%' or fm_wo_project.location_code LIKE '%$query%'";
}
! $sql = "SELECT * FROM fm_wo_project WHERE
$filtermethod $querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
***************
*** 175,179 ****
$project_list[] = array
(
! 'project_id' =>
$this->db->f('id'),
'name' =>
stripslashes($this->db->f('name')),
'start_date' =>
$this->db->f('start_date'),
--- 175,179 ----
$project_list[] = array
(
! 'project_id' => $this->db->f('id'),
'name' =>
stripslashes($this->db->f('name')),
'start_date' =>
$this->db->f('start_date'),
***************
*** 181,192 ****
'equipment_id' =>
$this->db->f('equipment_id'),
'location_code' =>
$this->db->f('location_code'),
- 'property_id' =>
$this->db->f('property_id'),
- 'building_id' =>
$this->db->f('building_id'),
- 'entrance_id' =>
$this->db->f('entrance_id'),
'floor' =>
$this->db->f('floor'),
! 'apartment_id' =>
$this->db->f('apartment_id'),
! 'street' =>
$this->db->f('street_name') .' ' . $this->db->f('street_number'),
! 'street_name' =>
$this->db->f('street_name'),
! 'street_number' =>
$this->db->f('street_number'),
'category' =>
$this->db->f('category'),
'title' =>
$this->db->f('title'),
--- 181,186 ----
'equipment_id' =>
$this->db->f('equipment_id'),
'location_code' =>
$this->db->f('location_code'),
'floor' =>
$this->db->f('floor'),
! 'address' =>
$this->db->f('address'),
'category' =>
$this->db->f('category'),
'title' =>
$this->db->f('title'),
***************
*** 194,197 ****
--- 188,192 ----
);
}
+ //_debug_array($project_list);
return $project_list;
}
***************
*** 205,219 ****
if ($this->db->next_record())
{
! $project['project_id']
= $this->db->f('id');
$project['title']
= $this->db->f('title');
$project['name']
= $this->db->f('name');
$project['equipment_id'] =
$this->db->f('equipment_id');
$project['location_code'] =
$this->db->f('location_code');
- $project['property_id'] =
$this->db->f('property_id');
- $project['property_name'] =
$this->db->f('property_name');
- $project['building_id'] =
$this->db->f('building_id');
- $project['entrance_id'] =
$this->db->f('entrance_id');
- $project['apartment_id'] =
$this->db->f('apartment_id');
- $project['floor']
= $this->db->f('floor');
$project['contact_phone'] =
$this->db->f('contact_phone');
$project['key_fetch'] =
$this->db->f('key_fetch');
--- 200,208 ----
if ($this->db->next_record())
{
! $project['project_id'] =
$this->db->f('id');
$project['title']
= $this->db->f('title');
$project['name']
= $this->db->f('name');
$project['equipment_id'] =
$this->db->f('equipment_id');
$project['location_code'] =
$this->db->f('location_code');
$project['contact_phone'] =
$this->db->f('contact_phone');
$project['key_fetch'] =
$this->db->f('key_fetch');
***************
*** 227,232 ****
$project['actual_cost'] =
$this->db->f('actual_cost');
$project['tenant_id'] =
$this->db->f('tenant_id');
- $project['street_name'] =
$this->db->f('street_name');
- $project['street_number'] =
$this->db->f('street_number');
$project['owner']
= $this->db->f('owner');
$project['coordinator'] =
$this->db->f('coordinator');
--- 216,219 ----
***************
*** 330,333 ****
--- 317,329 ----
$this->historylog->add('CO',$project['project_id'],$project['coordinator']);
+ if($project['street_number'])
+ {
+ $address= $project['street_name'] . ' ' .
$project['street_number'];
+ }
+ else
+ {
+ $address= $project['street_name'];
+ }
+
$project['descr'] =
$this->db->db_addslashes($project['descr']);
$project['name'] =
$this->db->db_addslashes($project['name']);
***************
*** 335,340 ****
//_debug_array($project);
$this->db->query("INSERT INTO fm_wo_project
(id,name,equipment_id,access,category,entry_date,start_date,end_date,coordinator,status,"
! .
"descr,title,budget,location_code,property_id,property_name,building_id,entrance_id,floor,apartment_id,"
! .
"street_name,street_number,key_deliver,key_fetch,other_branch,key_responsible,tenant_id,charge_tenant,owner)
"
. "VALUES ('"
. $project['project_id']. "','"
--- 331,335 ----
//_debug_array($project);
$this->db->query("INSERT INTO fm_wo_project
(id,name,equipment_id,access,category,entry_date,start_date,end_date,coordinator,status,"
! .
"descr,title,budget,location_code,floor,address,key_deliver,key_fetch,other_branch,key_responsible,tenant_id,charge_tenant,owner)
"
. "VALUES ('"
. $project['project_id']. "','"
***************
*** 352,363 ****
. $project['budget']. "','"
. $project['location_code']. "','"
! . $project['property_id']. "','"
! . $project['property_name']. "','"
! . $project['building_id']. "','"
! . $project['entrance_id']. "','"
! . $project['floor']. "','"
! . $project['apartment_id'] . "','"
! . $project['street_name'] . "','"
! . $project['street_number'] . "','"
. $project['key_deliver']. "','"
. $project['key_fetch']. "','"
--- 347,352 ----
. $project['budget']. "','"
. $project['location_code']. "','"
! . $project['floor'] . "','"
! . $project['address'] . "','"
. $project['key_deliver']. "','"
. $project['key_fetch']. "','"
***************
*** 452,455 ****
--- 441,453 ----
}
+ if($project['street_number'])
+ {
+ $address= $project['street_name'] . ' ' .
$project['street_number'];
+ }
+ else
+ {
+ $address= $project['street_name'];
+ }
+
$project['descr'] =
$this->db->db_addslashes($project['descr']);
$project['name'] =
$this->db->db_addslashes($project['name']);
***************
*** 474,486 ****
charge_tenant ='" . $project['charge_tenant']
. "',
location_code ='" . $project['location_code']
. "',
- equipment_id ='" . $project['equipment_id']
. "',
- property_id ='" .
$project['property_id'] . "',
- property_name ='" . $project['property_name']
. "',
- building_id ='" .
$project['building_id'] . "',
- entrance_id ='" .
$project['entrance_id'] . "',
floor ='" . $project['floor']
. "',
! apartment_id ='" . $project['apartment_id']
. "',
! street_name ='" .
$project['street_name'] . "',
! street_number ='" . $project['street_number']
. "' WHERE id= '" . $project['project_id']
."'",__LINE__,__FILE__);
--- 472,478 ----
charge_tenant ='" . $project['charge_tenant']
. "',
location_code ='" . $project['location_code']
. "',
floor ='" . $project['floor']
. "',
! equipment_id ='" . $project['equipment_id']
. "',
! address ='" . $address
. "' WHERE id= '" . $project['project_id']
."'",__LINE__,__FILE__);
Index: class.uiequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiequipment.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uiequipment.inc.php 8 Apr 2003 12:38:09 -0000 1.11
--- class.uiequipment.inc.php 9 Apr 2003 20:14:11 -0000 1.12
***************
*** 86,99 ****
$value_attribute =
(isset($equipment['attribute'])?$equipment['attribute']:'');
$content[] = array
(
'equipment_id'
=> $equipment['equipment_id'],
'descr'
=> $equipment['descr'],
! 'property_id'
=> $equipment['property_id'],
! 'building_id'
=> $equipment['building_id'],
! 'entrance_id'
=> $equipment['entrance_id'],
'floor'
=> $equipment['floor'],
! 'apartment_id'
=> $equipment['apartment_id'],
! 'street'
=> $equipment['street'],
'category'
=> $equipment['category'],
'date'
=> $equipment['date'],
--- 86,101 ----
$value_attribute =
(isset($equipment['attribute'])?$equipment['attribute']:'');
+ $location = split("-",
$equipment['location_code']);
+
$content[] = array
(
'equipment_id'
=> $equipment['equipment_id'],
'descr'
=> $equipment['descr'],
! 'property_id'
=> $location[0],
! 'building_id'
=> $location[1],
! 'entrance_id'
=> $location[2],
'floor'
=> $equipment['floor'],
! 'apartment_id'
=> $location[3],
! 'address'
=> $equipment['address'],
'category'
=> $equipment['category'],
'date'
=> $equipment['date'],
***************
*** 143,150 ****
'lang_floor' => lang('Floor'),
'lang_apartment' => lang('Apartment'),
! 'sort_street_name' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'street_name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiequipment.index',
--- 145,152 ----
'lang_floor' => lang('Floor'),
'lang_apartment' => lang('Apartment'),
! 'sort_address' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'address',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiequipment.index',
***************
*** 154,159 ****
'query'
=>$this->query)
)),
! 'lang_street_name' => lang('Street Name'),
! 'lang_street_num' => lang('Num'),
'lang_category' => lang('Category'),
'attribute' =>
$value_attribute,
--- 156,160 ----
'query'
=>$this->query)
)),
! 'lang_address' => lang('Address'),
'lang_category' => lang('Category'),
'attribute' =>
$value_attribute,
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uiproject.inc.php 8 Apr 2003 12:38:09 -0000 1.7
--- class.uiproject.inc.php 9 Apr 2003 20:14:11 -0000 1.8
***************
*** 85,88 ****
--- 85,90 ----
while (is_array($project_list) && list(,$project) =
each($project_list))
{
+ $location = split("-",
$project['location_code']);
+
$content[] = array
(
***************
*** 90,99 ****
'project_id'
=> $project['project_id'],
'descr'
=> $project['descr'],
! 'property_id'
=> $project['property_id'],
! 'building_id'
=> $project['building_id'],
! 'entrance_id'
=> $project['entrance_id'],
'floor'
=> $project['floor'],
! 'apartment_id'
=> $project['apartment_id'],
! 'street'
=> $project['street'],
'start_date'
=> $project['start_date'],
'coordinator'
=> $project['coordinator'],
--- 92,101 ----
'project_id'
=> $project['project_id'],
'descr'
=> $project['descr'],
! 'property_id'
=> $location[0],
! 'building_id'
=> $location[1],
! 'entrance_id'
=> $location[2],
'floor'
=> $project['floor'],
! 'apartment_id'
=> $location[3],
! 'address'
=> $project['address'],
'start_date'
=> $project['start_date'],
'coordinator'
=> $project['coordinator'],
***************
*** 144,151 ****
'lang_floor' => lang('Floor'),
'lang_apartment' => lang('Apartment'),
! 'sort_street_name' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'street_name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiproject.index',
--- 146,153 ----
'lang_floor' => lang('Floor'),
'lang_apartment' => lang('Apartment'),
! 'sort_address' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'address',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiproject.index',
***************
*** 156,161 ****
'query'
=>$this->query)
)),
! 'lang_street_name' => lang('Street Name'),
! 'lang_street_num' => lang('Num'),
'lang_start_date' => lang('Start date'),
'lang_coordinator' => lang('Coordinator'),
--- 158,162 ----
'query'
=>$this->query)
)),
! 'lang_address' => lang('Address'),
'lang_start_date' => lang('Start date'),
'lang_coordinator' => lang('Coordinator'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.boequipment.inc.php,1.6,1.7 class.boproject.inc.php,1.2,1.3 class.soequipment.inc.php,1.10,1.11 class.soproject.inc.php,1.5,1.6 class.uiequipment.inc.php,1.11,1.12 class.uiproject.inc.php,1.7,1.8,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default equipment.xsl,1.7,1.8 project.xsl,1.5,1.6
- Next by Date:
[Phpgroupware-cvs] CVS: phpbrain/setup phpgw_en.lang,1.4,1.5
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default equipment.xsl,1.7,1.8 project.xsl,1.5,1.6
- Next by thread:
[Phpgroupware-cvs] CVS: phpbrain/setup phpgw_en.lang,1.4,1.5
- Index(es):