[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.soinvoice.inc.php,1.28,1.29 c
From: |
Sigurd Nes <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.soinvoice.inc.php,1.28,1.29 class.soXport.inc.php,1.28,1.29 |
Date: |
Wed, 02 Jul 2003 14:57:49 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv4239/inc
Modified Files:
class.soinvoice.inc.php class.soXport.inc.php
Log Message:
no message
Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** class.soinvoice.inc.php 2 Jul 2003 11:32:57 -0000 1.28
--- class.soinvoice.inc.php 2 Jul 2003 18:57:47 -0000 1.29
***************
*** 481,485 ****
$sql = "SELECT district_id,periode,sum(godkjentbelop)
as consume $select_account_class "
! . " FROM fm_ecobilagoverf $this->join
fm_location1 ON (left(fm_ecobilagoverf.dima,4) = fm_location1.loc1) "
. " $this->join fm_part_of_town ON
(fm_location1.part_of_town_id = fm_part_of_town.part_of_town_id) "
. " $this->join fm_b_account ON
(fm_ecobilagoverf.spbudact_code = fm_b_account.id) "
--- 481,485 ----
$sql = "SELECT district_id,periode,sum(godkjentbelop)
as consume $select_account_class "
! . " FROM fm_ecobilagoverf $this->join
fm_location1 ON (fm_ecobilagoverf.loc1 = fm_location1.loc1) "
. " $this->join fm_part_of_town ON
(fm_location1.part_of_town_id = fm_part_of_town.part_of_town_id) "
. " $this->join fm_b_account ON
(fm_ecobilagoverf.spbudact_code = fm_b_account.id) "
Index: class.soXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soXport.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** class.soXport.inc.php 2 Jul 2003 11:32:57 -0000 1.28
--- class.soXport.inc.php 2 Jul 2003 18:57:47 -0000 1.29
***************
*** 22,42 ****
function anleggsnr_to_objekt($anleggsnr)
{
! $this->db->query("select
fm_meter.name,fm_meter.location_code,fm_part_of_town.district_id "
. " from fm_meter $this->join fm_location1 ON
fm_meter.loc1 = fm_location1.loc1 $this->join "
! . " fm_part_of_town ON fm_location1.part_of_town_id =
fm_part_of_town.part_of_town_id where fm_meter.id='$anleggsnr'");
$this->db->next_record();
! $location = split("-",
$this->db->f('location_code'));
! $loc1 = $location[0];
! $loc2 = $location[1];
! $loc3 = $location[2];
$dima=$loc1.$loc2.$loc3;
$maalerinfo['dima']=$dima;
$maalerinfo['maalernr']=$this->db->f('name');
$maalerinfo['district']=$this->db->f('district_id');
return $maalerinfo;
}
--- 22,44 ----
function anleggsnr_to_objekt($anleggsnr)
{
! $this->db->query("select
fm_meter.name,fm_meter.loc1,fm_meter.loc2,fm_meter.loc3,fm_part_of_town.district_id
"
. " from fm_meter $this->join fm_location1 ON
fm_meter.loc1 = fm_location1.loc1 $this->join "
! . " fm_part_of_town ON fm_location1.part_of_town_id =
fm_part_of_town.part_of_town_id where fm_meter.num='$anleggsnr'");
$this->db->next_record();
! // $location = split("-",
$this->db->f('location_code'));
! $loc1 = $this->db->f('loc1');
! $loc2 = $this->db->f('loc2');
! $loc3 = $this->db->f('loc3');
$dima=$loc1.$loc2.$loc3;
+ $maalerinfo['loc1']=$loc1;
$maalerinfo['dima']=$dima;
$maalerinfo['maalernr']=$this->db->f('name');
$maalerinfo['district']=$this->db->f('district_id');
return $maalerinfo;
+
}
***************
*** 49,67 ****
. "
substring(fm_gab_location.gab_id,18,3)='$sekjonnr' and "
. " fm_gab_location.loc1=fm_location1.loc1 and "
! . " fm_location1.owner_id=fm_owner.owner_id and "
! . " (fm_owner.category=0 or fm_owner.category=2)";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
$GLOBALS['phpgw']->db->next_record();
! // if ($GLOBALS['phpgw']->db->f(0))
! {
!
$dima=$GLOBALS['phpgw']->db->f('loc1').$GLOBALS['phpgw']->db->f('loc2').$GLOBALS['phpgw']->db->f('loc3');
! }
! // else
! {
! // $dima='';
! }
! return $dima;
}
--- 51,64 ----
. "
substring(fm_gab_location.gab_id,18,3)='$sekjonnr' and "
. " fm_gab_location.loc1=fm_location1.loc1 and "
! . " fm_location1.owner_id=fm_owner.owner_id ";
! // . " and (fm_owner.category=0 or
fm_owner.category=2)";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
$GLOBALS['phpgw']->db->next_record();
! $gabinfo['loc1']=$GLOBALS['phpgw']->db->f('loc1');
!
$gabinfo['dima']=$GLOBALS['phpgw']->db->f('loc1').$GLOBALS['phpgw']->db->f('loc2').$GLOBALS['phpgw']->db->f('loc3');
!
! return $gabinfo;
}
***************
*** 162,165 ****
--- 159,163 ----
}
+ $loc1=$fields['loc1'];
$dima=$fields['dima'];
if ($dima)
***************
*** 193,198 ****
$godkjentbelop=$this->bocommon->moneyformat($godkjentbelop);
! $sql= "INSERT INTO fm_ecobilag
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,fakturadato,forfallsdato,regtid,artid,godkjentbelop,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,dimd,mvakode,belop,periode,merknad,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato)"
! . " values
($pmwrkord_code_value,'$bilagsnr','$splitt','$kildeid','$kidnr','$typeid','$fakturadato','$forfallsdato','$regtid','$artid',$godkjentbelop,'$spvend_code',$dimb_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid','$fakturanr',$spbudact_code_value,$dima_value,$dimd_value,'$mvakode',$belop,'$periode','$merknad',NULL,NULL,NULL,NULL)";
}
--- 191,196 ----
$godkjentbelop=$this->bocommon->moneyformat($godkjentbelop);
! $sql= "INSERT INTO fm_ecobilag
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,fakturadato,forfallsdato,regtid,artid,godkjentbelop,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,loc1,dima,dimd,mvakode,belop,periode,merknad,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato)"
! . " values
($pmwrkord_code_value,'$bilagsnr','$splitt','$kildeid','$kidnr','$typeid','$fakturadato','$forfallsdato','$regtid','$artid',$godkjentbelop,'$spvend_code',$dimb_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid','$fakturanr',$spbudact_code_value,'$loc1',$dima_value,$dimd_value,'$mvakode',$belop,'$periode','$merknad',NULL,NULL,NULL,NULL)";
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.soinvoice.inc.php,1.28,1.29 class.soXport.inc.php,1.28,1.29,
Sigurd Nes <address@hidden> <=