|
| From: | Sigurd Nes <address@hidden> |
| Subject: | [Phpgroupware-cvs] CVS: property/inc/export Ecolink,1.2,1.3 |
| Date: | Tue, 29 Oct 2002 11:45:36 -0500 |
Update of /cvsroot/phpgroupware/property/inc/export
In directory subversions:/tmp/cvs-serv6575/inc/export
Modified Files:
Ecolink
Log Message:
no message
Index: Ecolink
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/export/Ecolink,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Ecolink 26 Oct 2002 09:03:39 -0000 1.2
--- Ecolink 29 Oct 2002 16:45:34 -0000 1.3
***************
*** 79,83 ****
$BilagOverf=$this->soXport->select_invoice_roleback($day,$month,$year,$Filnavn);
! // print_r($BilagOverf);
for ($i=0;$i<count($BilagOverf);$i++)
{
--- 79,83 ----
$BilagOverf=$this->soXport->select_invoice_roleback($day,$month,$year,$Filnavn);
! // print_r($BilagOverf);
for ($i=0;$i<count($BilagOverf);$i++)
{
***************
*** 89,97 ****
if ($BilagOverf[$i]['artid']==1)
{
! $Belop = sprintf("%01.2f",
$BilagOverf[$i][$ordrebelop])*100;
}
else
{
! $Belop = sprintf("%01.2f",
-$BilagOverf[$i][$ordrebelop])*100;
}
--- 89,97 ----
if ($BilagOverf[$i]['artid']==1)
{
! $Belop = sprintf("%01.2f",
$BilagOverf[$i]['ordrebelop'])*100;
}
else
{
! $Belop = sprintf("%01.2f",
-$BilagOverf[$i]['ordrebelop'])*100;
}
***************
*** 106,109 ****
--- 106,110 ----
$operator='-';
+
$this->soXport->correct_actual_cost($BilagOverf[$i]['pmwrkord_code'],$Belop,$actual_cost_field,$operator);
}
***************
*** 194,202 ****
$oRsBilag=$this->soXport->hoved_bilag($periode);
! for ($i=0;$i<count($oRsBilag);$i++)
{
//Hent leverandørklasse
! $pmlabor_code
=$this->soXport->select_vendor_class($oRsBilag[$i]['spvend_code']);
--- 195,203 ----
$oRsBilag=$this->soXport->hoved_bilag($periode);
! for ($k=0;$k<count($oRsBilag);$k++)
{
//Hent leverandørklasse
! $pmlabor_code
=$this->soXport->select_vendor_class($oRsBilag[$k]['spvend_code']);
***************
*** 213,220 ****
*/
//Bestem belops felt
! if ($oRsBilag[$i]['splitt']==0)
{
//Bilaget er ikke splittet
! if ($oRsBilag[$i]['godkjentbelop'] <>
$oRsBilag[$i]['belop'])
{
$BelopFelt = 'godkjentbelop';
--- 214,221 ----
*/
//Bestem belops felt
! if ($oRsBilag[$k]['splitt']==0)
{
//Bilaget er ikke splittet
! if ($oRsBilag[$k]['godkjentbelop'] <>
$oRsBilag[$k]['belop'])
{
$BelopFelt = 'godkjentbelop';
***************
*** 222,226 ****
if ($download=='on')
{
!
$this->soXport->log_to_deviation_table($oRsBilag[$i]);
}
}
--- 223,227 ----
if ($download=='on')
{
!
$this->soXport->log_to_deviation_table($oRsBilag[$k]);
}
}
***************
*** 232,236 ****
//Bilaget er splittet
! if ($oRsBilag[$i]['godkjentbelop'] ==
$oRsBilag[$i]['belop'])
{
$BelopFelt = 'godkjentbelop';
--- 233,237 ----
//Bilaget er splittet
! if ($oRsBilag[$k]['godkjentbelop'] ==
$oRsBilag[$k]['belop'])
{
$BelopFelt = 'godkjentbelop';
***************
*** 245,256 ****
//Formater beløp
! if ($oRsBilag[$i]['artid'] == 1)
{
! $Belop = sprintf("%01.2f",
-$oRsBilag[$i][$BelopFelt]);
// echo 'Belop :' . $Belop . '<BR>';
}
else
{
! $Belop = sprintf("%01.2f",
$oRsBilag[$i][$BelopFelt]);
}
--- 246,257 ----
//Formater beløp
! if ($oRsBilag[$k]['artid'] == 1)
{
! $Belop = sprintf("%01.2f",
-$oRsBilag[$k][$BelopFelt]);
// echo 'Belop :' . $Belop . '<BR>';
}
else
{
! $Belop = sprintf("%01.2f",
$oRsBilag[$k][$BelopFelt]);
}
***************
*** 262,293 ****
//Skriv hovedbilag
! $f1per =
date(ym,strtotime($oRsBilag[$i]['fakturadato']));
! $f1bilnr =
substr($oRsBilag[$i]['bilagsnr'],-6);
! $f1bildat =
date(ymd,strtotime($oRsBilag[$i]['fakturadato']));
! $f1bilart = $oRsBilag[$i]['artid'];
$f1belop = $Belop;
! $f1fordat =
date(ymd,strtotime($oRsBilag[$i]['forfallsdato']));
$f1tekst = '';
! $f1iper =
date(m,strtotime($oRsBilag[$i]['fakturadato']));
! $f1dime = $oRsBilag[$i]['spvend_code'];
! $f3per =
date(ym,strtotime($oRsBilag[$i]['fakturadato']));
! $f3bilnr =
substr($oRsBilag[$i]['bilagsnr'],-6);
! $f3rkonto = $oRsBilag[$i]['spvend_code'];
! $f3pnr =
substr($oRsBilag[$i]['bilagsnr'],-6);
$f3klasse = $pmlabor_code;
! $f3bildat =
date(ymd,strtotime($oRsBilag[$i]['fakturadato']));
! $f3bilart = $oRsBilag[$i]['artid'];
$f3belopr = $Belop;
! $f3fordat =
date(ymd,strtotime($oRsBilag[$i]['forfallsdato']));
! $f3sakb =
$oRsBilag[$i]['saksbehandler'];
! $f3idkode = $oRsBilag[$i]['kidnr'];
$f3tekst = '';
! $buffer = 'F3 7 1'. $f3per . $f3bilnr .
sprintf("%6s",$f3rkonto) . sprintf("%6s",$f3pnr)
. ' 0'. sprintf("%4s",$f3klasse). ' ' .
sprintf("%6s",$f3bildat).sprintf("%2s",$f3bilart)
. 'NOK 1000
10005'.sprintf("%14s",$f3belopr).' '.sprintf("%6s",$f3fordat)
. sprintf("%6s",$f3fordat).' 0 0 0
001 '
! . sprintf("%8s",$f3sakb).' 0 0 0
0 0 01 0 0'
. sprintf("%28s",$f3idkode).' 0'."\r\n"
.'F112
1'.sprintf("%4s",$f1per).sprintf("%6s",$f1bilnr).' 2001 2001 0
0 0'
--- 263,294 ----
//Skriv hovedbilag
! $f1per =
date(ym,strtotime($oRsBilag[$k]['fakturadato']));
! $f1bilnr =
substr($oRsBilag[$k]['bilagsnr'],-6);
! $f1bildat =
date(ymd,strtotime($oRsBilag[$k]['fakturadato']));
! $f1bilart = $oRsBilag[$k]['artid'];
$f1belop = $Belop;
! $f1fordat =
date(ymd,strtotime($oRsBilag[$k]['forfallsdato']));
$f1tekst = '';
! $f1iper =
date(m,strtotime($oRsBilag[$k]['fakturadato']));
! $f1dime = $oRsBilag[$k]['spvend_code'];
! $f3per =
date(ym,strtotime($oRsBilag[$k]['fakturadato']));
! $f3bilnr =
substr($oRsBilag[$k]['bilagsnr'],-6);
! $f3rkonto = $oRsBilag[$k]['spvend_code'];
! $f3pnr =
substr($oRsBilag[$k]['bilagsnr'],-6);
$f3klasse = $pmlabor_code;
! $f3bildat =
date(ymd,strtotime($oRsBilag[$k]['fakturadato']));
! $f3bilart = $oRsBilag[$k]['artid'];
$f3belopr = $Belop;
! $f3fordat =
date(ymd,strtotime($oRsBilag[$k]['forfallsdato']));
! $f3sakb =
$oRsBilag[$k]['saksbehandler'];
! $f3idkode = $oRsBilag[$k]['kidnr'];
$f3tekst = '';
! $buffer .= 'F3 7 1'. $f3per . $f3bilnr .
sprintf("%6s",$f3rkonto) . sprintf("%6s",$f3pnr)
. ' 0'. sprintf("%4s",$f3klasse). ' ' .
sprintf("%6s",$f3bildat).sprintf("%2s",$f3bilart)
. 'NOK 1000
10005'.sprintf("%14s",$f3belopr).' '.sprintf("%6s",$f3fordat)
. sprintf("%6s",$f3fordat).' 0 0 0
001 '
! . sprintf("%-8s",$f3sakb).' 0 0 0
0 0 01 0 0'
. sprintf("%28s",$f3idkode).' 0'."\r\n"
.'F112
1'.sprintf("%4s",$f1per).sprintf("%6s",$f1bilnr).' 2001 2001 0
0 0'
***************
*** 324,328 ****
//Velg ut alle underbilag
!
$oRsUnderbilag=$this->soXport->select_underbilag($oRsBilag[$i]['bilagsnr']);
for ($i=0;$i<count($oRsUnderbilag);$i++)
{
--- 325,330 ----
//Velg ut alle underbilag
!
$oRsUnderbilag=$this->soXport->select_underbilag($oRsBilag[$k]['bilagsnr']);
! //print_r($oRsUnderbilag);
for ($i=0;$i<count($oRsUnderbilag);$i++)
{
***************
*** 342,346 ****
//$Belop =
substr($Belop,0,strlen($Belop) - 3) + substr($Belop, -2);
! // echo 'Belop :' . $Belop . '<BR>';
if($oRsUnderbilag[$i]['pmwrkord_code'])
--- 344,348 ----
//$Belop =
substr($Belop,0,strlen($Belop) - 3) + substr($Belop, -2);
!
if($oRsUnderbilag[$i]['pmwrkord_code'])
***************
*** 352,355 ****
--- 354,358 ----
if ($download=='on')
{
+ // echo 'dimd :' . $oRsUnderbilag[$i]['dimd'] . '<BR>';
if
($oRsUnderbilag[$i]['dimd'] % 2 == 0)
{
***************
*** 360,363 ****
--- 363,368 ----
$actual_cost_field='act_vendor_cost';
}
+ // echo 'actual_cost_field :' . $actual_cost_field . '<BR>';
+ // echo 'Belop :' . $Belop . '<BR>';
$operator='+';
$this->soXport->correct_actual_cost($oRsUnderbilag[$i]['pmwrkord_code'],$Belop,$actual_cost_field,$operator);
***************
*** 375,379 ****
$oRsOverfBilag['ordrebelop']=$oRsUnderbilag[$i][$BelopFelt];
$oRsOverfBilag['dima']=substr($oRsOverfBilag['dima'],0,6);
!
//Kopier verdier
--- 380,385 ----
$oRsOverfBilag['ordrebelop']=$oRsUnderbilag[$i][$BelopFelt];
$oRsOverfBilag['dima']=substr($oRsOverfBilag['dima'],0,6);
! // print_r($oRsUnderbilag);
! // return;
//Kopier verdier
***************
*** 384,398 ****
//Skriv til fil
! $f1kto =
$oRsUnderbilag['spbudact_code'];
! $f1dima =
substr($oRsUnderbilag['dima'],0,6);
! $f1dimb =
$oRsUnderbilag['dimb'];
$f1dimc = $dimc;
! $f1dimd =
$oRsUnderbilag['dimd'];
! $f1avgkod =
$oRsUnderbilag['mvakode'];
$f1belop = $Belop;
! $f1tekst =
$oRsUnderbilag['merknad'];
! $buffer .='F1 2 1'.
sprintf("%4s",$f1per).sprintf("%6s",$f1bilnr).sprintf("%8s",$f1kto).' 0'
.sprintf("%6s",$f1dima).sprintf("%6s",$f1dimb).sprintf("%6s",$f1dimc).sprintf("%6s",$f1dimd).sprintf("%2s",$f1bilart).'0'
.sprintf("%6s",$f1bildat).sprintf("%6s",$f1fordat).'NOK 1000
1000'.sprintf("%6s",$f1dime).' 0 0 0 0 0 0 0'
--- 390,412 ----
//Skriv til fil
! $f1kto =
$oRsOverfBilag['spbudact_code'];
! $f1dima =
substr($oRsOverfBilag['dima'],0,6);
! $f1dimb =
$oRsOverfBilag['dimb'];
$f1dimc = $dimc;
! $f1dimd =
$oRsOverfBilag['dimd'];
! $f1avgkod =
$oRsOverfBilag['mvakode'];
$f1belop = $Belop;
! $f1tekst =
'';//$oRsOverfBilag['merknad'];
+ /* echo 'f1kto :' . $f1kto . '<BR>';
+ echo 'f1dima :' . $f1dima . '<BR>';
+ echo 'f1dimb :' . $f1dimb . '<BR>';
+ echo 'f1dimc :' . $f1dimc . '<BR>';
+ echo 'f1dimd :' . $f1dimd . '<BR>';
+ echo 'f1avgkod :' . $f1avgkod . '<BR>';
+ echo 'f1belop :' . $f1belop . '<BR>';
+ echo 'f1tekst :' . $f1tekst . '<BR>';
! */ $buffer .='F1 2 1'.
sprintf("%4s",$f1per).sprintf("%6s",$f1bilnr).sprintf("%8s",$f1kto).' 0'
.sprintf("%6s",$f1dima).sprintf("%6s",$f1dimb).sprintf("%6s",$f1dimc).sprintf("%6s",$f1dimd).sprintf("%2s",$f1bilart).'0'
.sprintf("%6s",$f1bildat).sprintf("%6s",$f1fordat).'NOK 1000
1000'.sprintf("%6s",$f1dime).' 0 0 0 0 0 0 0'
***************
*** 418,422 ****
$f9per = $periode;
! $buffer .='F999 1'.sprintf("%4s",$f9per).'
0 0 0 0 0 0
0 0 0 0 0 0 0 0
0 0 0 0 0 ';
--- 432,436 ----
$f9per = $periode;
! $buffer .='F999 1'.sprintf("%4s",$f9per).'
0 0 0 0 0 0
0 0 0 0 0 0 0 0
0 0 0 0 0
'."\r\n";
| [Prev in Thread] | Current Thread | [Next in Thread] |