[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.soapartment.inc.php,1.2,1.3 c
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.soapartment.inc.php,1.2,1.3 class.socommon.inc.php,1.14,1.15 class.soinvestment.inc.php,1.8,1.9 class.soinvoice.inc.php,1.16,1.17 class.solookup.inc.php,1.13,1.14 class.soproperty.inc.php,1.12,1.13 class.soXport.inc.php,1.15,1.16 class.uiequipment.inc.php,1.9,1.10 class.uiproject.inc.php,1.5,1.6 class.uiproperty.inc.php,1.13,1.14 class.uitts.inc.php,1.11,1.12 |
|
Date: |
Fri, 04 Apr 2003 14:07:35 -0500 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv23193/inc
Modified Files:
class.soapartment.inc.php class.socommon.inc.php
class.soinvestment.inc.php class.soinvoice.inc.php
class.solookup.inc.php class.soproperty.inc.php
class.soXport.inc.php class.uiequipment.inc.php
class.uiproject.inc.php class.uiproperty.inc.php
class.uitts.inc.php
Log Message:
no message
Index: class.soapartment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soapartment.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.soapartment.inc.php 27 Feb 2003 09:53:36 -0000 1.2
--- class.soapartment.inc.php 4 Apr 2003 19:07:33 -0000 1.3
***************
*** 111,115 ****
. " FROM fm_apartment $this->join"
. " fm_property ON fm_apartment.property_id =
fm_property.property_id $this->join"
! . " boei_bydel ON fm_property.bydel_id =
boei_bydel.bydel_id $this->join"
. " fm_streetaddress ON fm_apartment.street_id
= fm_streetaddress.street_id $this->join"
. " fm_apartment_category ON
fm_apartment.cat_id = fm_apartment_category.id "
--- 111,115 ----
. " FROM fm_apartment $this->join"
. " fm_property ON fm_apartment.property_id =
fm_property.property_id $this->join"
! . " fm_part_of_town ON
fm_property.part_of_town_id = fm_part_of_town.id $this->join"
. " fm_streetaddress ON fm_apartment.street_id
= fm_streetaddress.street_id $this->join"
. " fm_apartment_category ON
fm_apartment.cat_id = fm_apartment_category.id "
***************
*** 150,154 ****
. " FROM fm_apartment $this->join"
. " fm_property ON fm_apartment.property_id =
fm_property.property_id $this->join"
! . " boei_bydel ON fm_property.bydel_id =
boei_bydel.bydel_id $this->join"
. " fm_streetaddress ON fm_apartment.street_id
= fm_streetaddress.street_id"
. " where
fm_apartment.location_code='$location_code'";
--- 150,154 ----
. " FROM fm_apartment $this->join"
. " fm_property ON fm_apartment.property_id =
fm_property.property_id $this->join"
! . " fm_part_of_town ON
fm_property.part_of_town_id = fm_part_of_town.id $this->join"
. " fm_streetaddress ON fm_apartment.street_id
= fm_streetaddress.street_id"
. " where
fm_apartment.location_code='$location_code'";
Index: class.socommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.socommon.inc.php 16 Mar 2003 11:41:17 -0000 1.14
--- class.socommon.inc.php 4 Apr 2003 19:07:33 -0000 1.15
***************
*** 182,192 ****
{
! $this->db->query("SELECT bydel, bydel_id FROM
boei_bydel ORDER BY bydel ");
$i = 0;
while ($this->db->next_record())
{
! $part_of_town[$i]['id']
= $this->db->f('bydel_id');
! $part_of_town[$i]['name']
= stripslashes($this->db->f('bydel'));
$i++;
}
--- 182,192 ----
{
! $this->db->query("SELECT name, id FROM fm_part_of_town
ORDER BY name ");
$i = 0;
while ($this->db->next_record())
{
! $part_of_town[$i]['id'] =
$this->db->f('id');
! $part_of_town[$i]['name'] =
stripslashes($this->db->f('name'));
$i++;
}
Index: class.soinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvestment.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.soinvestment.inc.php 25 Feb 2003 11:29:29 -0000 1.8
--- class.soinvestment.inc.php 4 Apr 2003 19:07:33 -0000 1.9
***************
*** 78,82 ****
if ($part_of_town_id)
{
! $filtermethod = "and boei_bydel.bydel_id
='$part_of_town_id'";
}
--- 78,82 ----
if ($part_of_town_id)
{
! $filtermethod = "and fm_part_of_town.id
='$part_of_town_id'";
}
***************
*** 92,105 ****
if ($cat_id=='property')
{
! $sql = "SELECT fm_investment.entity_id as
entity_id, fm_investment.descr as descr,
fm_investment_value.invest_id,initial_value, fm_property.name,
boei_bydel.district_id, boei_bydel.bydel,"
. " fm_investment_value.value,
fm_investment_value.date, fm_investment_value.this_index, "
. " fm_investment_value.index_count"
. " FROM fm_property $this->join "
! . " boei_bydel ON fm_property.bydel_id =
boei_bydel.bydel_id $this->join "
. " fm_investment_value ON
fm_property.property_id = left(fm_investment_value.entity_id,4) $this->join "
. " fm_investment ON
fm_investment_value.entity_id = fm_investment.entity_id AND "
. " fm_investment_value.invest_id =
fm_investment.invest_id "
. " WHERE ( current_index = '1' or (this_index
= NULL and index_count= '1')) $filtermethod "
! . " ORDER BY
boei_bydel.bydel,fm_property.property_id ";
}
--- 92,105 ----
if ($cat_id=='property')
{
! $sql = "SELECT fm_investment.entity_id as
entity_id, fm_investment.descr as descr,
fm_investment_value.invest_id,initial_value, fm_property.name,
fm_part_of_town.district_id, fm_part_of_town.name as part_of_town,"
. " fm_investment_value.value,
fm_investment_value.date, fm_investment_value.this_index, "
. " fm_investment_value.index_count"
. " FROM fm_property $this->join "
! . " fm_part_of_town ON
fm_property.part_of_town_id = fm_part_of_town.id $this->join "
. " fm_investment_value ON
fm_property.property_id = left(fm_investment_value.entity_id,4) $this->join "
. " fm_investment ON
fm_investment_value.entity_id = fm_investment.entity_id AND "
. " fm_investment_value.invest_id =
fm_investment.invest_id "
. " WHERE ( current_index = '1' or (this_index
= NULL and index_count= '1')) $filtermethod "
! . " ORDER BY
fm_part_of_town.name,fm_property.property_id ";
}
***************
*** 134,138 ****
$investment[$i]['investment_id'] =
$this->db->f('invest_id');
$investment[$i]['district_id'] =
$this->db->f('district_id');
! $investment[$i]['part_of_town'] =
$this->db->f('bydel');
$investment[$i]['descr']
= $this->db->f('descr');
$investment[$i]['initial_value'] =
$this->db->f('initial_value');
--- 134,138 ----
$investment[$i]['investment_id'] =
$this->db->f('invest_id');
$investment[$i]['district_id'] =
$this->db->f('district_id');
! $investment[$i]['part_of_town'] =
$this->db->f('part_of_town');
$investment[$i]['descr']
= $this->db->f('descr');
$investment[$i]['initial_value'] =
$this->db->f('initial_value');
***************
*** 161,168 ****
$property_id =
substr($investment[$i]['location_code'],0,4);
! $this->db->query("select
bydel,district_id from fm_property $this->join boei_bydel on
fm_property.bydel_id=boei_bydel.bydel_id Where property_id= '$property_id'");
$this->db->next_record();
$investment[$i]['district_id'] =
$this->db->f('district_id');
! $investment[$i]['part_of_town'] =
$this->db->f('bydel');
}
--- 161,168 ----
$property_id =
substr($investment[$i]['location_code'],0,4);
! $this->db->query("select
fm_part_of_town.name as part_of_town,district_id from fm_property $this->join
fm_part_of_town on fm_property.part_of_town.name_id=fm_part_of_town.id Where
property_id= '$property_id'");
$this->db->next_record();
$investment[$i]['district_id'] =
$this->db->f('district_id');
! $investment[$i]['part_of_town'] =
$this->db->f('part_of_town');
}
Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.soinvoice.inc.php 18 Mar 2003 11:19:23 -0000 1.16
--- class.soinvoice.inc.php 4 Apr 2003 19:07:33 -0000 1.17
***************
*** 487,491 ****
$sql = "SELECT district_id,periode,sum(godkjentbelop)
as consume $select_account_class "
. " FROM t_ecobilagoverf $this->join
fm_property ON left(t_ecobilagoverf.dima,4) = fm_property.property_id
$this->join "
! . " boei_bydel ON fm_property.bydel_id =
boei_bydel.bydel_id "
. " $filtermethod group by district_id,periode
$group_account_class";
//echo $sql;
--- 487,491 ----
$sql = "SELECT district_id,periode,sum(godkjentbelop)
as consume $select_account_class "
. " FROM t_ecobilagoverf $this->join
fm_property ON left(t_ecobilagoverf.dima,4) = fm_property.property_id
$this->join "
! . " fm_part_of_town ON fm_property.fm_part_of_town_id =
fm_part_of_town.id "
. " $filtermethod group by district_id,periode
$group_account_class";
//echo $sql;
Index: class.solookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solookup.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.solookup.inc.php 18 Mar 2003 10:51:28 -0000 1.13
--- class.solookup.inc.php 4 Apr 2003 19:07:33 -0000 1.14
***************
*** 257,261 ****
. " FROM fm_apartment $this->join"
. " fm_property ON fm_apartment.property_id =
fm_property.property_id $this->join"
! . " boei_bydel ON fm_property.bydel_id =
boei_bydel.bydel_id $this->join"
. " fm_tenant ON fm_apartment.tenant_id =
fm_tenant.tenant_id $this->join"
. " fm_streetaddress ON fm_apartment.street_id =
fm_streetaddress.street_id $this->join"
--- 257,261 ----
. " FROM fm_apartment $this->join"
. " fm_property ON fm_apartment.property_id =
fm_property.property_id $this->join"
! . " fm_part_of_town ON fm_property.part_of_town_id =
fm_part_of_town.id $this->join"
. " fm_tenant ON fm_apartment.tenant_id =
fm_tenant.tenant_id $this->join"
. " fm_streetaddress ON fm_apartment.street_id =
fm_streetaddress.street_id $this->join"
***************
*** 475,479 ****
}
! $sql = "SELECT * FROM fm_property $this->join
boei_bydel on fm_property.bydel_id = boei_bydel.bydel_id "
. " WHERE $filtermethod $querymethod ";
--- 475,479 ----
}
! $sql = "SELECT fm_property.* FROM fm_property
$this->join fm_part_of_town on fm_property.part_of_town_id = fm_part_of_town.id
"
. " WHERE $filtermethod $querymethod ";
***************
*** 576,580 ****
. " FROM fm_building $this->join"
. " fm_property ON fm_building.property_id =
fm_property.property_id $this->join"
! . " boei_bydel ON fm_property.bydel_id =
boei_bydel.bydel_id "
. " WHERE $filtermethod $querymethod ";
--- 576,580 ----
. " FROM fm_building $this->join"
. " fm_property ON fm_building.property_id =
fm_property.property_id $this->join"
! . " fm_part_of_town ON fm_property.part_of_town_id =
fm_part_of_town.id "
. " WHERE $filtermethod $querymethod ";
***************
*** 679,683 ****
. " FROM fm_entrance $this->join"
. " fm_property ON fm_entrance.property_id =
fm_property.property_id $this->join"
! . " boei_bydel ON fm_property.bydel_id =
boei_bydel.bydel_id "
. " WHERE $filtermethod $querymethod ";
--- 679,683 ----
. " FROM fm_entrance $this->join"
. " fm_property ON fm_entrance.property_id =
fm_property.property_id $this->join"
! . " fm_part_of_town ON fm_property.part_of_town_id =
fm_part_of_town.id "
. " WHERE $filtermethod $querymethod ";
***************
*** 784,788 ****
. " FROM fm_apartment $this->join"
. " fm_property ON fm_apartment.property_id =
fm_property.property_id $this->join"
! . " boei_bydel ON fm_property.bydel_id =
boei_bydel.bydel_id $this->join"
. " fm_streetaddress ON fm_apartment.street_id =
fm_streetaddress.street_id $this->join"
. " fm_apartment_category ON fm_apartment.cat_id =
fm_apartment_category.id "
--- 784,788 ----
. " FROM fm_apartment $this->join"
. " fm_property ON fm_apartment.property_id =
fm_property.property_id $this->join"
! . " fm_part_of_town ON fm_property.part_of_town_id =
fm_part_of_town.id $this->join"
. " fm_streetaddress ON fm_apartment.street_id =
fm_streetaddress.street_id $this->join"
. " fm_apartment_category ON fm_apartment.cat_id =
fm_apartment_category.id "
***************
*** 895,899 ****
. " FROM fm_apartment $this->join"
. " fm_property ON fm_apartment.property_id =
fm_property.property_id $this->join"
! . " boei_bydel ON fm_property.bydel_id =
boei_bydel.bydel_id $this->join"
. " fm_tenant ON fm_apartment.tenant_id =
fm_tenant.tenant_id $this->join"
. " fm_streetaddress ON fm_apartment.street_id =
fm_streetaddress.street_id $this->join"
--- 895,899 ----
. " FROM fm_apartment $this->join"
. " fm_property ON fm_apartment.property_id =
fm_property.property_id $this->join"
! . " fm_part_of_town ON fm_property.part_of_town_id =
fm_part_of_town.id $this->join"
. " fm_tenant ON fm_apartment.tenant_id =
fm_tenant.tenant_id $this->join"
. " fm_streetaddress ON fm_apartment.street_id =
fm_streetaddress.street_id $this->join"
***************
*** 1007,1011 ****
. " FROM fm_equipment $this->join"
. " fm_property ON fm_equipment.property_id =
fm_property.property_id $this->join"
! . " boei_bydel ON fm_property.bydel_id =
boei_bydel.bydel_id $this->join"
. " fm_equipment_type ON fm_equipment.equipment_type_id
= fm_equipment_type.id "
. " WHERE $filtermethod $querymethod ";
--- 1007,1011 ----
. " FROM fm_equipment $this->join"
. " fm_property ON fm_equipment.property_id =
fm_property.property_id $this->join"
! . " fm_part_of_town ON fm_property.part_of_town_id =
fm_part_of_town.id $this->join"
. " fm_equipment_type ON fm_equipment.equipment_type_id
= fm_equipment_type.id "
. " WHERE $filtermethod $querymethod ";
Index: class.soproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproperty.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.soproperty.inc.php 4 Apr 2003 10:57:48 -0000 1.12
--- class.soproperty.inc.php 4 Apr 2003 19:07:33 -0000 1.13
***************
*** 31,37 ****
}
-
-
-
function get_district($property_id)
{
--- 31,34 ----
***************
*** 148,152 ****
function read_single($property_id)
{
! $sql = "SELECT * FROM fm_property $this->join
boei_bydel on fm_property.bydel_id = boei_bydel.bydel_id where
property_id='$property_id'";
$this->db->query($sql,__LINE__,__FILE__);
--- 145,149 ----
function read_single($property_id)
{
! $sql = "SELECT fm_property.*,fm_part_of_town.name as
part_of_town ,fm_part_of_town.id as part_of_town_id FROM fm_property
$this->join fm_part_of_town on fm_property.part_of_town_id = fm_part_of_town.id
where property_id='$property_id'";
$this->db->query($sql,__LINE__,__FILE__);
***************
*** 154,173 ****
if ($this->db->next_record())
{
! $property['property_id']
= (int)$this->db->f('property_id');
$property['owner']
= $this->db->f('owner');
$property['name']
= stripslashes($this->db->f('name'));
! $property['general_address'] =
stripslashes($this->db->f('general_address'));
$property['access']
= $this->db->f('access');
$property['date']
= $this->db->f('entry_date');
$property['cat_id']
= (int)$this->db->f('cat_id');
$property['district_id'] =
$this->db->f('district_id');
! $property['part_of_town'] =
$this->db->f('bydel');
! $property['part_of_town_id'] =
$this->db->f('bydel_id');
$property['property_type_id'] =
$this->db->f('property_type_id');
$property['location_code'] =
$this->db->f('location_code');
$property['generellinfo'] =
$this->db->f('generellinfo');
- return $property;
}
}
--- 151,170 ----
if ($this->db->next_record())
{
! $property['property_id'] =
$this->db->f('property_id');
$property['owner']
= $this->db->f('owner');
$property['name']
= stripslashes($this->db->f('name'));
! $property['general_address'] =
stripslashes($this->db->f('general_address'));
$property['access']
= $this->db->f('access');
$property['date']
= $this->db->f('entry_date');
$property['cat_id']
= (int)$this->db->f('cat_id');
$property['district_id'] =
$this->db->f('district_id');
! $property['part_of_town'] =
$this->db->f('part_of_town');
! $property['part_of_town_id'] =
$this->db->f('part_of_town_id');
$property['property_type_id'] =
$this->db->f('property_type_id');
$property['location_code'] =
$this->db->f('location_code');
$property['generellinfo'] =
$this->db->f('generellinfo');
}
+ return $property;
}
Index: class.soXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soXport.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.soXport.inc.php 23 Feb 2003 21:45:34 -0000 1.15
--- class.soXport.inc.php 4 Apr 2003 19:07:33 -0000 1.16
***************
*** 68,74 ****
function anleggsnr_to_objekt($anleggsnr)
{
! $this->db->query("select
fm_bms.point_name,fm_bms.property_id,fm_bms.building_id,fm_bms.entrance_id,boei_bydel.district_id
"
! . " from fm_bms $this->join fm_property ON
fm_bms.property_id = fm_property.property_id $this->join "
! . " boei_bydel ON fm_property.bydel_id = boei_bydel.bydel_id
where fm_bms.id='$anleggsnr'");
$this->db->next_record();
--- 68,74 ----
function anleggsnr_to_objekt($anleggsnr)
{
! $this->db->query("select
fm_meter.point_name,fm_meter.property_id,fm_meter.building_id,fm_meter.entrance_id,fm_part_of_town.district_id
"
! . " from fm_meter $this->join fm_property ON
fm_meter.property_id = fm_property.property_id $this->join "
! . " fm_part_of_town ON fm_property.part_of_town_id =
fm_part_of_town.id where fm_meter.id='$anleggsnr'");
$this->db->next_record();
Index: class.uiequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiequipment.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uiequipment.inc.php 27 Feb 2003 09:53:37 -0000 1.9
--- class.uiequipment.inc.php 4 Apr 2003 19:07:33 -0000 1.10
***************
*** 84,88 ****
while (is_array($equipment_list) && list(,$equipment) =
each($equipment_list))
{
! $text_attribute =
(isset($equipment['attribute'])?$equipment['attribute']:lang('Attribute'));
$content[] = array
--- 84,88 ----
while (is_array($equipment_list) && list(,$equipment) =
each($equipment_list))
{
! $value_attribute =
(isset($equipment['attribute'])?$equipment['attribute']:'');
$content[] = array
***************
*** 106,109 ****
--- 106,110 ----
'lang_delete_statustext' =>
lang('delete this equipment'),
'text_view'
=> lang('view'),
+ 'value_attribute'
=> $value_attribute,
'text_edit'
=> lang('edit'),
'text_delete'
=> lang('delete')
***************
*** 111,115 ****
}
-
$table_header[] = array
(
--- 112,115 ----
***************
*** 157,160 ****
--- 157,162 ----
'lang_street_num' => lang('Num'),
'lang_category' => lang('Category'),
+ 'attribute' =>
$value_attribute,
+ 'lang_attribute' => lang('Attribute'),
'lang_view' => lang('view'),
'lang_edit' => lang('edit'),
***************
*** 292,304 ****
}
if ($id)
{
$function_msg = lang('edit equipment');
- $location_type='view';
}
else
{
$function_msg = lang('add equipment');
- $location_type='form';
}
--- 294,306 ----
}
+ $location_type='form';
+
if ($id)
{
$function_msg = lang('edit equipment');
}
else
{
$function_msg = lang('add equipment');
}
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uiproject.inc.php 1 Apr 2003 16:37:37 -0000 1.5
--- class.uiproject.inc.php 4 Apr 2003 19:07:33 -0000 1.6
***************
*** 243,261 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('project',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
! $values['equipment_id'] =
get_var('equipment_id',array('POST'));
! $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['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'));
$values['start_date'] =
get_var('start_date',array('POST'));
$values['end_date'] =
get_var('end_date',array('POST'));
$this->config->read_repository();
--- 243,264 ----
$GLOBALS['phpgw']->xslttpl->add_file(array('project',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
! $bypass =
get_var('bypass',array('POST','GET'));
!
! $values['equipment_id'] =
get_var('equipment_id',array('POST','GET'));
! $values['property_id'] =
get_var('property_id',array('POST','GET'));
! $values['property_name'] =
get_var('property_name',array('POST','GET'));
! $values['building_id'] =
get_var('building_id',array('POST','GET'));
! $values['entrance_id'] =
get_var('entrance_id',array('POST','GET'));
! $values['floor'] =
get_var('floor',array('POST','GET'));
! $values['apartment_id'] =
get_var('apartment_id',array('POST','GET'));
! $values['street_name'] =
get_var('street_name',array('POST','GET'));
! $values['street_number'] =
get_var('street_number',array('POST','GET'));
! $values['tenant_id'] =
get_var('tenant_id',array('POST','GET'));
! $values['tenant_name'] =
get_var('tenant_name',array('POST','GET'));
! $values['tenant_phone'] =
get_var('tenant_phone',array('POST','GET'));
$values['start_date'] =
get_var('start_date',array('POST'));
$values['end_date'] =
get_var('end_date',array('POST'));
+ //_debug_array($values);
$this->config->read_repository();
***************
*** 335,339 ****
}
! if(!$receipt['error'])
{
$values = $this->bo->read_single($id);
--- 338,342 ----
}
! if(!$receipt['error'] && !$bypass)
{
$values = $this->bo->read_single($id);
Index: class.uiproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproperty.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.uiproperty.inc.php 4 Apr 2003 10:57:48 -0000 1.13
--- class.uiproperty.inc.php 4 Apr 2003 19:07:33 -0000 1.14
***************
*** 223,226 ****
--- 223,227 ----
{
$property =
$this->bo->read_single($property_id);
+ _debug_array($property);
$function_msg = lang('edit property');
$action='edit';
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uitts.inc.php 21 Feb 2003 10:28:59 -0000 1.11
--- class.uitts.inc.php 4 Apr 2003 19:07:33 -0000 1.12
***************
*** 456,462 ****
$order_link_data = array
(
! 'menuaction' =>
$this->currentapp.'.uitts.view',
! 'id' => $id,
! 'sub' => 'order',
'location_code' =>
$ticket['location_code'],
'property_id' =>
$ticket['property_id'],
--- 456,461 ----
$order_link_data = array
(
! 'menuaction' =>
$this->currentapp.'.uiproject.edit',
! 'bypass' => true,
'location_code' =>
$ticket['location_code'],
'property_id' =>
$ticket['property_id'],
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.soapartment.inc.php,1.2,1.3 class.socommon.inc.php,1.14,1.15 class.soinvestment.inc.php,1.8,1.9 class.soinvoice.inc.php,1.16,1.17 class.solookup.inc.php,1.13,1.14 class.soproperty.inc.php,1.12,1.13 class.soXport.inc.php,1.15,1.16 class.uiequipment.inc.php,1.9,1.10 class.uiproject.inc.php,1.5,1.6 class.uiproperty.inc.php,1.13,1.14 class.uitts.inc.php,1.11,1.12,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: sitemgr/inc class.Common_BO.inc.php,1.1,1.2
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default equipment.xsl,1.6,1.7 property.xsl,1.7,1.8
- Previous by thread:
[Phpgroupware-cvs] CVS: sitemgr/inc class.Common_BO.inc.php,1.1,1.2
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default equipment.xsl,1.6,1.7 property.xsl,1.7,1.8
- Index(es):