[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc/export Ecolink,1.17,1.18
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] property/inc/export Ecolink,1.17,1.18 |
|
Date: |
Wed, 22 Oct 2003 17:01:14 +0000 |
Update of /cvsroot/phpgroupware/property/inc/export
In directory subversions:/tmp/cvs-serv5200/inc/export
Modified Files:
Ecolink
Log Message:
no message
Index: Ecolink
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/export/Ecolink,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Ecolink 21 Sep 2003 07:31:42 -0000 1.17
--- Ecolink 22 Oct 2003 17:01:12 -0000 1.18
***************
*** 95,99 ****
$sql="select * from fm_ecobilagoverf where
filnavn='$Filnavn' and $datepart_year=$year and $datepart_month=$month and
$datepart_day= $day";
$this->db->query($sql,__LINE__,__FILE__);
- //echo 'sql: '.$sql.'<br>';
$i = 0;
--- 95,98 ----
***************
*** 149,153 ****
$i++;
}
- // _debug_array($invoice_roleback);
return $invoice_roleback;
}
--- 148,151 ----
***************
*** 157,274 ****
function bilag_update_overf($BilagOverf)
{
! $pmwrkord_code=$BilagOverf['pmwrkord_code'];
! if ($pmwrkord_code)
! {
! $pmwrkord_code_value="'$pmwrkord_code'";
! }
! else
! {
! $pmwrkord_code_value="Null";
! }
! $bilagsnr=$BilagOverf['bilagsnr'];
! $splitt=$BilagOverf['splitt'];
! $kildeid=$BilagOverf['kildeid'];
! $kidnr=$BilagOverf['kidnr'];
! $typeid=$BilagOverf[typeid];
! $fakturadato=$BilagOverf['fakturadato'];
! $forfallsdato=$BilagOverf['forfallsdato'];
! $regtid=$BilagOverf['regtid'];
! $artid=$BilagOverf['artid'];
! $godkjentbelop=$BilagOverf['godkjentbelop'];
! $spvend_code=$BilagOverf['spvend_code'];
! $dimb=$BilagOverf['dimb'];
! if ($dimb)
! {
! $dimb_value="'$dimb'";
! }
! else
! {
! $dimb_value="Null";
! }
!
! $oppsynsmannid=$BilagOverf['oppsynsmannid'];
!
! if ($oppsynsmannid)
! {
! $oppsynsmannid_value="'$oppsynsmannid'";
! }
! else
! {
! $oppsynsmannid_value="Null";
! }
!
! $saksbehandlerid=$BilagOverf['saksbehandlerid'];
! if ($saksbehandlerid)
! {
! $saksbehandlerid_value="'$saksbehandlerid'";
! }
! else
! {
! $saksbehandlerid_value="Null";
! }
!
! $budsjettansvarligid=$BilagOverf['budsjettansvarligid'];
!
! $utbetalingid=$BilagOverf['utbetalingid'];
!
! if ($utbetalingid)
! {
! $utbetalingid_value="'$utbetalingid'";
! }
! else
! {
! $utbetalingid_value="Null";
! }
!
! $fakturanr=$BilagOverf['fakturanr'];
! $spbudact_code=$BilagOverf['spbudact_code'];
! $dima=$BilagOverf['dima'];
! $loc1=$BilagOverf['loc1'];
! $dimd=$BilagOverf['dimd'];
!
! if ($dimd)
! {
! $dimd_value="'$dimd'";
! }
! else
! {
! $dimd_value="Null";
! }
! $oppsynsigndato=$BilagOverf['oppsynsigndato'];
! if ($oppsynsigndato)
! {
! $oppsynsigndato_value="'$oppsynsigndato'";
! }
! else
! {
! $oppsynsigndato_value="Null";
! }
! $saksigndato=$BilagOverf['saksigndato'];
! if ($saksigndato)
! {
! $saksigndato_value="'$saksigndato'";
! }
! else
! {
! $saksigndato_value="Null";
! }
!
!
! $mvakode=$BilagOverf['mvakode'];
! $belop=$BilagOverf['belop'];
! $periode=$BilagOverf['periode'];
! $merknad=$BilagOverf['merknad'];
! $budsjettsigndato=$BilagOverf['budsjettsigndato'];
! $utbetalingsigndato=$BilagOverf['utbetalingsigndato'];
!
! $belop=$this->bocommon->moneyformat($belop);
!
$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,loc1,dimd,mvakode,belop,periode,merknad,utbetalingid,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','$dima','$loc1',$dimd_value,'$mvakode',$belop,'$periode','$merknad',$utbetalingid_value,$oppsynsigndato_value,$saksigndato_value,'$budsjettsigndato','$utbetalingsigndato')";
$this->db->query($sql,__LINE__,__FILE__);
-
}
--- 155,200 ----
function bilag_update_overf($BilagOverf)
{
+ $values= array(
+ $BilagOverf['pmwrkord_code'],
+ $BilagOverf['bilagsnr'],
+ $BilagOverf['splitt'],
+ $BilagOverf['kildeid'],
+ $BilagOverf['kidnr'],
+ $BilagOverf[typeid],
+ $BilagOverf['fakturadato'],
+ $BilagOverf['forfallsdato'],
+ $BilagOverf['regtid'],
+ $BilagOverf['artid'],
+ $BilagOverf['spvend_code'],
+ $BilagOverf['dimb'],
+ $BilagOverf['oppsynsmannid'],
+ $BilagOverf['saksbehandlerid'],
+ $BilagOverf['budsjettansvarligid'],
+ $BilagOverf['fakturanr'],
+ $BilagOverf['spbudact_code'],
+ $BilagOverf['dima'],
+ $BilagOverf['loc1'],
+ $BilagOverf['dimd'],
+ $BilagOverf['mvakode'],
+ $BilagOverf['periode'],
+ $BilagOverf['merknad'],
+ $BilagOverf['utbetalingid'],
+ $BilagOverf['oppsynsigndato'],
+ $BilagOverf['saksigndato'],
+ $BilagOverf['budsjettsigndato'],
+ $BilagOverf['utbetalingsigndato'],
+ );
+
+ $values = $this->bocommon->validate_db_insert($values);
! $sql= "INSERT INTO fm_ecobilag
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,"
! . "
fakturadato,forfallsdato,regtid,artid,spvend_code,dimb,oppsynsmannid,"
! . "
saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,loc1,dimd,mvakode,"
! . "
periode,merknad,utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,belop,godkjentbelop)"
! . " values ($values,"
! . $this->bocommon->moneyformat($BilagOverf['belop']) .
","
! .
$this->bocommon->moneyformat($BilagOverf['godkjentbelop']) . ")";
$this->db->query($sql,__LINE__,__FILE__);
}
***************
*** 310,314 ****
$periode =
$this->select_periods_with_invoice_to_transfer();
- //_debug_array($periode);
for ($i=0;$i<count($periode);$i++)
{
--- 236,239 ----
***************
*** 360,364 ****
$BilagOverf=$this->select_invoice_roleback($day,$month,$year,$Filnavn);
- // _debug_array($BilagOverf);
$this->db->transaction_begin();
--- 285,288 ----
***************
*** 415,419 ****
{
$this->db->transaction_abort();
! $message = 'Noe gikk galt!';
}
}
--- 339,343 ----
{
$this->db->transaction_abort();
! $receipt['message'][]= array('msg' =>
'Noe gikk galt!');
}
}
***************
*** 456,460 ****
function OverforPeriode($batchid,$periode,$download)
{
- // echo 'periode :' . $periode . '<BR>';
$BilagId = 'NULL';
--- 380,383 ----
***************
*** 484,488 ****
$oRsBilag=$this->soXport->hoved_bilag($periode);
! //_debug_array($oRsBilag);
$bilag_count= count($oRsBilag);
for ($k=0;$k<$bilag_count;$k++)
--- 407,412 ----
$oRsBilag=$this->soXport->hoved_bilag($periode);
! $this->db->transaction_begin();
!
$bilag_count= count($oRsBilag);
for ($k=0;$k<$bilag_count;$k++)
***************
*** 528,532 ****
{
$Belop = sprintf("%01.2f",
-$oRsBilag[$k][$BelopFelt]);
- // echo 'Belop :' . $Belop . '<BR>';
}
else
--- 452,455 ----
***************
*** 538,542 ****
$Belop =$Belop *100;
// $Belop = substr($Belop,0,strlen($Belop) - 3) +
substr($Belop, -2);
- //echo 'Belop :' . $Belop . '<BR>';
//Skriv hovedbilag
--- 461,464 ----
***************
*** 581,586 ****
//Velg ut alle underbilag
$oRsUnderbilag=$this->soXport->select_underbilag($oRsBilag[$k]['bilagsnr']);
- //print_r($oRsUnderbilag);
- $this->db->transaction_begin();
$underbilag_count= count($oRsUnderbilag);
--- 503,506 ----
***************
*** 592,596 ****
{
$Belop = sprintf("%01.2f",
$oRsUnderbilag[$i][$BelopFelt]);
- // echo 'Belop :' . $Belop . '<BR>';
}
else
--- 512,515 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc/export Ecolink,1.17,1.18,
Sigurd Nes <address@hidden> <=