[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc/export Ecolink,1.15,1.16
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc/export Ecolink,1.15,1.16 |
|
Date: |
Thu, 18 Sep 2003 10:00:51 -0400 |
Update of /cvsroot/phpgroupware/property/inc/export
In directory subversions:/tmp/cvs-serv3608/inc/export
Modified Files:
Ecolink
Log Message:
no message
Index: Ecolink
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/export/Ecolink,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** Ecolink 11 Sep 2003 13:59:47 -0000 1.15
--- Ecolink 18 Sep 2003 14:00:49 -0000 1.16
***************
*** 202,218 ****
$pmlabor_code
=$this->soXport->select_vendor_class($oRsBilag[$k]['spvend_code']);
!
!
! /* // gammel kode fra kontroll mot FacilityCenter
! if (strlen($pmlabor_code) > 1)
! {
! $pmlabor_code = 'LE'. $pmlabor_code;
! }
! else
! {
! $pmlabor_code = 'LEV' . $pmlabor_code;
! }
!
! */
//Bestem belops felt
if ($oRsBilag[$k]['splitt']==0)
--- 202,206 ----
$pmlabor_code
=$this->soXport->select_vendor_class($oRsBilag[$k]['spvend_code']);
!
//Bestem belops felt
if ($oRsBilag[$k]['splitt']==0)
***************
*** 265,269 ****
//Skriv hovedbilag
! $f1per =
$periode;//date(ym,strtotime($oRsBilag[$k]['fakturadato']));
$f1bilnr =
substr($oRsBilag[$k]['bilagsnr'],-6);
$f1bildat =
date(ymd,strtotime($oRsBilag[$k]['fakturadato']));
--- 253,258 ----
//Skriv hovedbilag
! $periode_aar = date("y") .
sprintf("%02d",$periode);
! $f1per =
$periode_aar;//date(ym,strtotime($oRsBilag[$k]['fakturadato']));
$f1bilnr =
substr($oRsBilag[$k]['bilagsnr'],-6);
$f1bildat =
date(ymd,strtotime($oRsBilag[$k]['fakturadato']));
***************
*** 272,279 ****
$f1fordat =
date(ymd,strtotime($oRsBilag[$k]['forfallsdato']));
$f1tekst = '';
! $f1iper =
substr($periode,2,2);//date(m,strtotime($oRsBilag[$k]['fakturadato']));
$f1dime = $oRsBilag[$k]['spvend_code'];
! $f3per =
$periode;//date(ym,strtotime($oRsBilag[$k]['fakturadato']));
$f3bilnr =
substr($oRsBilag[$k]['bilagsnr'],-6);
$f3rkonto = $oRsBilag[$k]['spvend_code'];
--- 261,268 ----
$f1fordat =
date(ymd,strtotime($oRsBilag[$k]['forfallsdato']));
$f1tekst = '';
! $f1iper =
substr($periode_aar,2,2);//date(m,strtotime($oRsBilag[$k]['fakturadato']));
$f1dime = $oRsBilag[$k]['spvend_code'];
! $f3per =
$periode_aar;//date(ym,strtotime($oRsBilag[$k]['fakturadato']));
$f3bilnr =
substr($oRsBilag[$k]['bilagsnr'],-6);
$f3rkonto = $oRsBilag[$k]['spvend_code'];
***************
*** 300,332 ****
. sprintf("%6s",$f1bilnr).' 0
'."\r\n";
- /*
- echo 'f1per :' . $f1per . '<BR>';
- echo 'f1bilnr :' . $f1bilnr . '<BR>';
- echo 'f1bildat :' . $f1bildat . '<BR>';
- echo 'f1bilart :' . $f1bilart . '<BR>';
- echo 'f1belop :' . $f1belop . '<BR>';
- echo 'f1fordat :' . $f1fordat . '<BR>';
- echo 'f1tekst :' . $f1tekst . '<BR>';
- echo 'f1iper :' . $f1iper . '<BR>';
- echo 'f1dime :' . $f1dime . '<BR>';
-
- echo 'f3per :' . $f3per . '<BR>';
- echo 'f3bilnr :' . $f3bilnr . '<BR>';
- echo 'f3rkonto :' . $f3rkonto . '<BR>';
- echo 'f3pnr :' . $f3pnr . '<BR>';
- echo 'f3klasse :' . $f3klasse . '<BR>';
- echo 'f3bildat :' . $f3bildat . '<BR>';
- echo 'f3bilart :' . $f3bilart . '<BR>';
- echo 'f3belopr :' . $f3belopr . '<BR>';
- echo 'f3fordat :' . $f3fordat . '<BR>';
- echo 'f3sakb :' . $f3sakb . '<BR>';
- echo 'f3idkode :' . $f3idkode . '<BR>';
- echo 'f3tekst :' . $f3tekst . '<BR>';
- */
-
//Velg ut alle underbilag
$oRsUnderbilag=$this->soXport->select_underbilag($oRsBilag[$k]['bilagsnr']);
//print_r($oRsUnderbilag);
$underbilag_count= count($oRsUnderbilag);
for ($i=0;$i<$underbilag_count;$i++)
--- 289,298 ----
. sprintf("%6s",$f1bilnr).' 0
'."\r\n";
//Velg ut alle underbilag
$oRsUnderbilag=$this->soXport->select_underbilag($oRsBilag[$k]['bilagsnr']);
//print_r($oRsUnderbilag);
+ // $GLOBALS['phpgw']->db->transaction_begin();
+
$underbilag_count= count($oRsUnderbilag);
for ($i=0;$i<$underbilag_count;$i++)
***************
*** 397,410 ****
$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'
--- 363,367 ----
$f1tekst =
'';//$oRsOverfBilag['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'
***************
*** 424,435 ****
$antall = $antall + 1;
-
}
-
}
! $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";
-
//Fullfør transaksjon
--- 381,389 ----
$antall = $antall + 1;
}
}
! $f9per = $periode_aar;
$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";
//Fullfør transaksjon
***************
*** 439,443 ****
if ($download=='on')
{
! $message = 'Periode: '.$periode.' antall
bilag/underbilag overført:'.$antall . ' , fil: ' . $Filnavn;
$fp = fopen($Filnavn, "wb");
fwrite($fp,$buffer);
--- 393,397 ----
if ($download=='on')
{
! $message = 'periode: '.$periode_aar.' antall
bilag/underbilag overført:'.$antall . ' , fil: ' . $Filnavn;
$fp = fopen($Filnavn, "wb");
fwrite($fp,$buffer);
***************
*** 448,451 ****
--- 402,407 ----
$message = $buffer;
}
+ $GLOBALS['phpgw']->db->transaction_commit();
+
return $message;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc/export Ecolink,1.15,1.16,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default config.tpl, 1.12, 1.13 wo_hour.xsl, 1.15, 1.16 invoice.xsl, 1.33, 1.34 gab.xsl, 1.6, 1.7
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default invoice.xsl, 1.34, 1.35 values.xsl, 1.4, 1.5 lookup.xsl, 1.22, 1.23 location.xsl, 1.20, 1.21 equipment.xsl, 1.14, 1.15
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default config.tpl, 1.12, 1.13 wo_hour.xsl, 1.15, 1.16 invoice.xsl, 1.33, 1.34 gab.xsl, 1.6, 1.7
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default invoice.xsl, 1.34, 1.35 values.xsl, 1.4, 1.5 lookup.xsl, 1.22, 1.23 location.xsl, 1.20, 1.21 equipment.xsl, 1.14, 1.15
- Index(es):