[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bogab.inc.php,1.1,1.2 class.s
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bogab.inc.php,1.1,1.2 class.sogab.inc.php,1.2,1.3 class.soXport.inc.php,1.19,1.20 class.uigab.inc.php,1.1,1.2 |
|
Date: |
Wed, 07 May 2003 05:02:13 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv28670/inc
Modified Files:
class.bogab.inc.php class.sogab.inc.php class.soXport.inc.php
class.uigab.inc.php
Log Message:
no message
Index: class.bogab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bogab.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.bogab.inc.php 6 May 2003 18:55:00 -0000 1.1
--- class.bogab.inc.php 7 May 2003 09:02:10 -0000 1.2
***************
*** 82,85 ****
--- 82,90 ----
'gaards_nr' => $gaards_nr,'bruksnr' => $bruksnr,'feste_nr' =>
$feste_nr,'seksjons_nr' => $seksjons_nr,));
$this->total_records = $this->so->total_records;
+ for ($i=0;$i<count($gab);$i++)
+ {
+
$location_data=$this->socommon->read_location_data($gab[$i]['location_code']);
+ $gab[$i]=$gab[$i] + $location_data;
+ }
return $gab;
}
Index: class.sogab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sogab.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.sogab.inc.php 6 May 2003 20:01:01 -0000 1.2
--- class.sogab.inc.php 7 May 2003 09:02:10 -0000 1.3
***************
*** 103,107 ****
}
! $sql = "select location_code, gab_id
,count(location_code) as hits FROM fm_gab_location $filtermethod GROUP BY
gab_id";
$this->db2->query($sql,__LINE__,__FILE__);
--- 103,107 ----
}
! $sql = "select fm_gab_location.location_code, gab_id
,count(gab_id) as hits FROM fm_gab_location $filtermethod GROUP BY gab_id";
$this->db2->query($sql,__LINE__,__FILE__);
***************
*** 121,127 ****
$gab_list[] = array
(
! 'gab_id' =>
$this->db->f('gab_id'),
'location_code' =>
$this->db->f('location_code'),
! 'hits' => $this->db->f('hits')
);
}
--- 121,127 ----
$gab_list[] = array
(
! 'gab_id' =>
$this->db->f('gab_id'),
'location_code' =>
$this->db->f('location_code'),
! 'hits' =>
$this->db->f('hits')
);
}
Index: class.soXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soXport.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.soXport.inc.php 29 Apr 2003 12:20:06 -0000 1.19
--- class.soXport.inc.php 7 May 2003 09:02:10 -0000 1.20
***************
*** 566,570 ****
$bilagsnr =
$hoved_bilag_temp[$i]['bilagsnr'];
! $sql= "select
fm_ecobilag.*,t_ecobruker.initialer as saksbehandler from fm_ecobilag
$this->join t_ecobruker on
fm_ecobilag.budsjettansvarligid=t_ecobruker.spemp_code where
bilagsnr='$bilagsnr' ";
$this->db->query($sql,__LINE__,__FILE__);
--- 566,570 ----
$bilagsnr =
$hoved_bilag_temp[$i]['bilagsnr'];
! $sql= "select
fm_ecobilag.*,fm_ecobruker.initialer as saksbehandler from fm_ecobilag
$this->join fm_ecobruker on
fm_ecobilag.budsjettansvarligid=fm_ecobruker.spemp_code where
bilagsnr='$bilagsnr' ";
$this->db->query($sql,__LINE__,__FILE__);
***************
*** 722,726 ****
$godkjentbelop=$oRsBilag['godkjentbelop'];
! $sql="INSERT INTO t_ecoavvik
(bilagsnr,fakturadato,forfallsdato,oppsynsmannid,oppsynsigndato,saksbehandlerid,saksigndato,budsjettansvarligid,budsjettsigndato,artid,spvend_code,belop,godkjentbelop)
values "
.
"($bilagsnr','$fakturadato','$forfallsdato','$oppsynsmannid','$oppsynsigndato','$saksbehandlerid','$saksigndato','$budsjettansvarligid','$budsjettsigndato','$artid','$spvend_code','$belop','$godkjentbelop')";
$this->db->query($sql,__LINE__,__FILE__);
--- 722,726 ----
$godkjentbelop=$oRsBilag['godkjentbelop'];
! $sql="INSERT INTO fm_ecoavvik
(bilagsnr,fakturadato,forfallsdato,oppsynsmannid,oppsynsigndato,saksbehandlerid,saksigndato,budsjettansvarligid,budsjettsigndato,artid,spvend_code,belop,godkjentbelop)
values "
.
"($bilagsnr','$fakturadato','$forfallsdato','$oppsynsmannid','$oppsynsigndato','$saksbehandlerid','$saksigndato','$budsjettansvarligid','$budsjettsigndato','$artid','$spvend_code','$belop','$godkjentbelop')";
$this->db->query($sql,__LINE__,__FILE__);
***************
*** 729,733 ****
function delete_avvik($bilagsnr)
{
! $sql="delete from t_ecoavvik where
bilagsnr='$bilagsnr'";
$this->db->query($sql,__LINE__,__FILE__);
}
--- 729,733 ----
function delete_avvik($bilagsnr)
{
! $sql="delete from fm_ecoavvik where
bilagsnr='$bilagsnr'";
$this->db->query($sql,__LINE__,__FILE__);
}
***************
*** 748,752 ****
$location = split("-", $location_code);
$property_id = $location[0];
! $apartment_id = $location[3],
$sql= "select cat_id from fm_apartment where
fm_apartment.property_id='$property_id' and
fm_apartment.apartment_id='$apartment_id'";
--- 748,752 ----
$location = split("-", $location_code);
$property_id = $location[0];
! $apartment_id = $location[3];
$sql= "select cat_id from fm_apartment where
fm_apartment.property_id='$property_id' and
fm_apartment.apartment_id='$apartment_id'";
Index: class.uigab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uigab.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.uigab.inc.php 6 May 2003 18:55:00 -0000 1.1
--- class.uigab.inc.php 7 May 2003 09:02:10 -0000 1.2
***************
*** 101,104 ****
--- 101,105 ----
(
'hits'
=> $gab['hits'],
+ 'address'
=> $gab['street_name'],
'gaards_nr'
=> substr($gab['gab_id'],4,5),
'bruks_nr'
=> substr($gab['gab_id'],9,4),
***************
*** 129,132 ****
--- 130,134 ----
'district_id' =>
$this->district_id,
'filter'
=>$this->filter,
+
'allrows'
=> $this->allrows,
'query'
=>$this->query)
)),
***************
*** 141,147 ****
'district_id' =>
$this->district_id,
'filter'
=>$this->filter,
'query'
=>$this->query)
)),
! 'lang_hits' => lang('number'),
'lang_gaards_nr' => lang('gaards nr'),
'lang_bruksnr' => lang('bruks nr'),
--- 143,151 ----
'district_id' =>
$this->district_id,
'filter'
=>$this->filter,
+
'allrows'
=> $this->allrows,
'query'
=>$this->query)
)),
! 'lang_hits' =>
lang('number'),
! 'lang_address' => lang('Address'),
'lang_gaards_nr' => lang('gaards nr'),
'lang_bruksnr' => lang('bruks nr'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bogab.inc.php,1.1,1.2 class.sogab.inc.php,1.2,1.3 class.soXport.inc.php,1.19,1.20 class.uigab.inc.php,1.1,1.2,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup setup.inc.php,1.45,1.46 tables_current.inc.php,1.68,1.69
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default gab.xsl,1.1,1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup setup.inc.php,1.45,1.46 tables_current.inc.php,1.68,1.69
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default gab.xsl,1.1,1.2
- Index(es):