[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.soXport.inc.php,1.3,1.4
From: |
Sigurd Nes <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.soXport.inc.php,1.3,1.4 |
Date: |
Tue, 29 Oct 2002 11:45:36 -0500 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv6575/inc
Modified Files:
class.soXport.inc.php
Log Message:
no message
Index: class.soXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soXport.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.soXport.inc.php 26 Oct 2002 09:03:39 -0000 1.3
--- class.soXport.inc.php 29 Oct 2002 16:45:34 -0000 1.4
***************
*** 95,99 ****
. " boei_gabnr.objekt_id=boei_objekt.objekt_id and
"
. " boei_objekt.eier_id=boei_eier.eier_id and "
! . " (boei_eier.eiertype_id=0 or
boei_eier.eiertype_id=1)";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
--- 95,99 ----
. " boei_gabnr.objekt_id=boei_objekt.objekt_id and
"
. " boei_objekt.eier_id=boei_eier.eier_id and "
! . " (boei_eier.eiertype_id=0 or
boei_eier.eiertype_id=2)";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
***************
*** 111,114 ****
--- 111,128 ----
}
+
+ function dima_to_address($dima)
+ {
+ $objekt_id=substr($dima,0,4);
+ $bygg_id=substr($dima,4,2);
+ $seksjons_id=substr($dima,6,2);
+ $sql = "select beskrivelse from boei_seksjon where
objekt_id = '$objekt_id' and bygg_id= '$bygg_id' and seksjons_id =
'$seksjons_id' ";
+ $GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
+ $GLOBALS['phpgw']->db->next_record();
+ $adresse=$GLOBALS['phpgw']->db->f('beskrivelse');
+ return $adresse;
+
+ }
+
function check_pmwrkord_code($pmwrkord_code)
{
***************
*** 271,275 ****
$invoice_roleback[$i]['merknad'] =
$this->db->f('merknad');
$invoice_roleback[$i]['splitt'] =
$this->db->f('splitt');
! // $invoice_roleback[$i]['ordrebelop'] =
$this->db->f('ordrebelop');
// $invoice_roleback[$i]['filnavn'] =
$this->db->f('filnavn');
$invoice_roleback[$i]['utbetalingid'] =
$this->db->f('utbetalingid');
--- 285,289 ----
$invoice_roleback[$i]['merknad'] =
$this->db->f('merknad');
$invoice_roleback[$i]['splitt'] =
$this->db->f('splitt');
! $invoice_roleback[$i]['ordrebelop'] =
$this->db->f('ordrebelop');
// $invoice_roleback[$i]['filnavn'] =
$this->db->f('filnavn');
$invoice_roleback[$i]['utbetalingid'] =
$this->db->f('utbetalingid');
***************
*** 396,399 ****
--- 410,422 ----
$kildeid =
$oRsOverfBilag['kildeid'];
$pmwrkord_code =
$oRsOverfBilag['pmwrkord_code'];
+ if ($pmwrkord_code)
+ {
+ $pmwrkord_code_value="'$pmwrkord_code'";
+ }
+ else
+ {
+ $pmwrkord_code_value="Null";
+ }
+
$belop =
$oRsOverfBilag['belop'];
$fakturadato =
$oRsOverfBilag['fakturadato'];
***************
*** 408,415 ****
--- 431,479 ----
$dima =
$oRsOverfBilag['dima'];
$dimb =
$oRsOverfBilag['dimb'];
+ if ($dimb)
+ {
+ $dimb_value="'$dimb'";
+ }
+ else
+ {
+ $dimb_value="Null";
+ }
+
$mvakode =
$oRsOverfBilag['mvakode'];
$dimd =
$oRsOverfBilag['dimd'];
+ if ($dimd)
+ {
+ $dimd_value="'$dimd'";
+ }
+ else
+ {
+ $dimd_value="Null";
+ }
+ $oppsynsmannid = $oRsOverfBilag['oppsynsmannid'];
+
+ if ($oppsynsmannid)
+ {
+ $oppsynsmannid_value="'$oppsynsmannid'";
+ }
+ else
+ {
+ $oppsynsmannid_value="Null";
+ }
+
+
$saksbehandlerid =
$oRsOverfBilag['saksbehandlerid'];
+
+ if ($saksbehandlerid)
+ {
+ $saksbehandlerid_value="'$saksbehandlerid'";
+ }
+ else
+ {
+ $saksbehandlerid_value="Null";
+ }
+
$budsjettansvarligid=
$oRsOverfBilag['budsjettansvarligid'];
+
+ $oppsynsigndato =
$oRsOverfBilag['oppsynsigndato'];
$saksigndato =
$oRsOverfBilag['saksigndato'];
$budsjettsigndato =
$oRsOverfBilag['budsjettsigndato'];
***************
*** 429,434 ****
//print_r($bilag_field_values);
! $sql="INSERT INTO t_ecobilagoverf
(id,bilagsnr,kidnr,typeid,kildeid,pmwrkord_code,belop,fakturadato,periode,forfallsdato,fakturanr,spbudact_code,regtid,artid,godkjentbelop,spvend_code,dima,dimb,mvakode,dimd,saksbehandlerid,budsjettansvarligid,saksigndato,budsjettsigndato,merknad,splitt,utbetalingid,utbetalingsigndato,filnavn,ordrebelop,overftid)"
! . "values
('$id','$bilagsnr','$kidnr','$typeid','$kildeid','$pmwrkord_code',CONVERT(MONEY,"."'$belop'".",0),'$fakturadato','$periode','$forfallsdato','$fakturanr','$spbudact_code','$regtid','$artid',CONVERT(MONEY,"."'$godkjentbelop'".",0),'$spvend_code','$dima','$dimb','$mvakode','$dimd','$saksbehandlerid','$budsjettansvarligid','$saksigndato','$budsjettsigndato','$merknad','$splitt','$utbetalingid','$utbetalingsigndato','$filnavn',CONVERT(MONEY,"."'$ordrebelop'".",0),'$overftid')
";
$this->db->query($sql,__LINE__,__FILE__);
//echo 'sql ' . $sql.'<br>';
--- 493,498 ----
//print_r($bilag_field_values);
! $sql="INSERT INTO t_ecobilagoverf
(id,bilagsnr,kidnr,typeid,kildeid,pmwrkord_code,belop,fakturadato,periode,forfallsdato,fakturanr,spbudact_code,regtid,artid,godkjentbelop,spvend_code,dima,dimb,mvakode,dimd,oppsynsmannid,saksbehandlerid,budsjettansvarligid,oppsynsigndato,saksigndato,budsjettsigndato,merknad,splitt,utbetalingid,utbetalingsigndato,filnavn,ordrebelop,overftid)"
! . "values
('$id','$bilagsnr','$kidnr','$typeid','$kildeid',$pmwrkord_code_value,CONVERT(MONEY,"."'$belop'".",0),'$fakturadato','$periode','$forfallsdato','$fakturanr','$spbudact_code','$regtid','$artid',CONVERT(MONEY,"."'$godkjentbelop'".",0),'$spvend_code','$dima',$dimb_value,'$mvakode',$dimd_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid','$oppsynsigndato','$saksigndato','$budsjettsigndato','$merknad','$splitt','$utbetalingid','$utbetalingsigndato','$filnavn',CONVERT(MONEY,"."'$ordrebelop'".",0),'$overftid')
";
$this->db->query($sql,__LINE__,__FILE__);
//echo 'sql ' . $sql.'<br>';
***************
*** 444,448 ****
function hoved_bilag ($periode)
{
! $sql= "select v_ecohovedbilag.*,t_ecobruker.initialer as
saksbehandler from v_ecohovedbilag left outer join t_ecobruker on
v_ecohovedbilag.budsjettansvarligid=t_ecobruker.spemp_code where
periode='$periode' and not budsjettsigndato is null and (not saksigndato is
null or not oppsynsigndato is null)";
$this->db->query($sql,__LINE__,__FILE__);
$i = 0;
--- 508,512 ----
function hoved_bilag ($periode)
{
! $sql= "select v_ecohovedbilag.*,t_ecobruker.initialer as
saksbehandler from v_ecohovedbilag left outer join t_ecobruker on
v_ecohovedbilag.budsjettansvarligid=t_ecobruker.spemp_code where
periode='$periode' and not budsjettsigndato is null and (not saksigndato is
null or not oppsynsigndato is null) and not utbetalingsigndato is null ";
$this->db->query($sql,__LINE__,__FILE__);
$i = 0;
***************
*** 647,650 ****
--- 711,715 ----
$sql="update fm_wo_wrkorders set
$actual_cost_field=$actual_cost_field $operator $Belop where
id='$pmwrkord_code'";
+ //echo 'sql :' . $sql . '<BR>';
$this->db->query($sql,__LINE__,__FILE__);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.soXport.inc.php,1.3,1.4,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property invoice_detail.php,1.7,1.8
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.174,1.175 functions.inc.php,1.160,1.161
- Previous by thread:
[Phpgroupware-cvs] CVS: property invoice_detail.php,1.7,1.8
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.174,1.175 functions.inc.php,1.160,1.161
- Index(es):