[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc/export/Agresso, 1.13
|
From: |
nomail |
|
Subject: |
[Phpgroupware-cvs] property/inc/export/Agresso, 1.13 |
|
Date: |
Thu, 21 Oct 2004 21:54:14 +0200 |
Update of /property/inc/export
Modified Files:
Branch:
Agresso
date: 2004/10/21 19:54:14; author: sigurdne; state: Exp; lines: +27 -9
Log Message:
no message
=====================================================================
Index: property/inc/export/Agresso
diff -u property/inc/export/Agresso:1.12 property/inc/export/Agresso:1.13
--- property/inc/export/Agresso:1.12 Tue Oct 12 13:51:41 2004
+++ property/inc/export/Agresso Thu Oct 21 19:54:14 2004
@@ -82,6 +82,20 @@
$this->db->query($sql,__LINE__,__FILE__);
}
+ function get_vendor_info($vendor_id='')
+ {
+ $sql = "select org_nr,konto_nr from fm_vendor where
id='$vendor_id'";
+ $this->db->query($sql);
+ $this->db->next_record();
+
+ $vendor_info= array(
+ 'org_nr' => $this->db->f('org_nr'),
+ 'konto_nr' => $this->db->f('konto_nr')
+ );
+
+ return $vendor_info;
+ }
+
function select_invoice_roleback($day,$month,$year,$Filnavn)
{
@@ -384,7 +398,7 @@
{
for ($i=0;$i<13;$i++)
{
- @unlink($fil_katalog .
'/FDVankomst_' . $i. '.TXT');
+ @unlink($fil_katalog .
'/DVankomst_' . $i. '.TXT');
}
$this->old_files_deleted= True;
@@ -394,7 +408,7 @@
$i = 1;
do
{
- $Filnavn = $fil_katalog .
'/FDVankomst_' . $i. '.TXT';
+ $Filnavn = $fil_katalog . '/DVankomst_'
. $i. '.TXT';
//Sjekk om filen eksisterer
If (!file_exists($Filnavn))
@@ -414,7 +428,7 @@
$i = 1;
do
{
- $Filnavn = $fil_katalog . '/FDV' .
date("dmY") . '_' . $i. '.TXT';
+ $Filnavn = $fil_katalog . '/DV' .
date("dmY") . '_' . $i. '.TXT';
//Sjekk om filen eksisterer
If (!file_exists($Filnavn))
@@ -504,7 +518,8 @@
//Skriv hovedbilag
- $Buntnr =
sprintf("%-12s",date("md",time()) . 'F' .
substr($oRsBilag[$k]['bilagsnr'],-6));// verdi: MMDDFL, type: c12, plass: 1 - 12
+ // $Buntnr =
sprintf("%-12s",date("md",time()) . 'F' .
substr($oRsBilag[$k]['bilagsnr'],-6));// verdi: MMDDFL, type: c12, plass: 1 - 12
+ $Buntnr =
sprintf("%-12s",basename($Filnavn,".TXT"));// verdi: MMDDFL, type: c12, plass:
1 - 12
$Forsystem = 'BI';// verdi: BI, type: c2,
plass: 13 - 14
$Transtype = 'GL';// verdi: GL, type: c2,
plass: 17 - 18
@@ -512,7 +527,7 @@
$Valuteringsdato=
date(Ymd,strtotime($oRsBilag[$k]['fakturadato']));// verdi: Dato, type: date,
plass: 251 - 258
$Bilagsdato =
date(Ymd,strtotime($oRsBilag[$k]['fakturadato'])) ;// verdi: Dato, type: date,
plass: 259 - 266
- $Bilagsnr =
sprintf("%09s",substr($oRsBilag[$k]['bilagsnr'],-6));// verdi: Bilagsnummer,
type: i4, plass: 267 - 275
+ $Bilagsnr =
sprintf("%-9s",substr($oRsBilag[$k]['bilagsnr'],-6));// verdi: Bilagsnummer,
type: i4, plass: 267 - 275
$Periode =
sprintf("%06s",date(Y,strtotime($oRsBilag[$k]['fakturadato'])) .
sprintf("%02d",$periode));// verdi: Periode, type: i4, plass: 276 - 281
$ESL = sprintf("%1s",'');// verdi:
Blank, type: i+C481, plass: 282 - 282
@@ -535,7 +550,7 @@
$Bet_overforing = sprintf("%-2s",'');// verdi:
Blank, type: c2, plass: 378 - 379
$Status = 'N';// verdi: N, type: c1,
plass: 380 - 380
$Resk_type = 'P';// verdi: Blank, type:
c1, plass: 381 - 381
- $Resk_nr =
sprintf("%09s",$oRsBilag[$k]['spvend_code']);// verdi: Blank., type: i4, plass:
382 - 390
+ $Resk_nr =
sprintf("%-9s",$oRsBilag[$k]['spvend_code']);// verdi: Blank., type: i4, plass:
382 - 390
$Forskudd = '0';// verdi: 0, type: i1,
plass: 391 - 391
$Fakturaref = '000000000';// verdi: 0,
type: i4, plass: 392 - 400
$Fakturaref = '000000000';// verdi: 0,
type: i4, plass: 401 - 409
@@ -544,11 +559,13 @@
$Att_ansvarlig =
sprintf("%-6s",$oRsBilag[$k]['saksbehandler']);// verdi: Blank, type: c6,
plass: 424 - 429
- $Resk_navn = sprintf("%-50s",'');// verdi:
Fødselsnr, type: c50, plass: 430 - 479
+ $vendor_info =
$this->get_vendor_info($oRsBilag[$k]['spvend_code']);
+
+ $Resk_navn =
sprintf("%-50s",$vendor_info['org_nr']);// verdi: Fødselsnr, type: c50, plass:
430 - 479
$Postadresse = sprintf("%-160s",'');//
verdi: Blank, type: c160, plass: 480 - 639
$Stat_Provins = sprintf("%-50s",'');// verdi:
Blank, type: c50, plass: 640 - 689
$Sted = sprintf("%-50s",'');// verdi:
Blank, type: c50, plass: 690 - 739
- $Bank_Postgiro_kontonr = sprintf("%-35s",'');//
verdi: Blank, type: c35, plass: 740 - 774
+ $Bank_Postgiro_kontonr =
sprintf("%-35s",str_replace(" ","",$vendor_info['konto_nr']));// verdi:
konto_nr, type: c35, plass: 740 - 774
$Betalingsmåte = sprintf("%-2s",'');// verdi:
Blank, type: c2, plass: 775 - 776
$Mva_reg_nr = sprintf("%-25s",'');// verdi:
Blank, type: c25, plass: 777 - 801
$Postnummer = sprintf("%-15s",'');// verdi:
Blank, type: c15, plass: 802 - 816
@@ -661,7 +678,7 @@
$Tekst =
sprintf("%-50s",'');//sprintf("%-50s",substr($oRsOverfBilag['merknad'],0,50));//
verdi: Tekst, type: text (50), plass: 201 - 250
$Fakturanr =
sprintf("%-15s",$oRsOverfBilag['fakturanr']);// verdi: Fakturanr, type: c15,
plass: 283 - 297
- $Ordrenummer =
sprintf("%09s",$oRsOverfBilag['pmwrkord_code']);// verdi: Infodoc ordrenr,
type: i4, plass: 342 - 350
+ $Ordrenummer =
sprintf("%-9s",$oRsOverfBilag['pmwrkord_code']);// verdi: Infodoc ordrenr,
type: i4, plass: 342 - 350
//Kopier verdier
if ($download=='on' && !$pre_transfer
&& !$this->debug)
@@ -690,6 +707,7 @@
$Dim_6 =
sprintf("%-4s",'');// verdi: Blank, type: c4, plass: 73 - 76
$Dim_7 =
sprintf("%-4s",'');// verdi: Blank, type: c4, plass: 77 - 80
$Fakturanr =
sprintf("%-15s",'');// verdi: Fakturanr, type: c15, plass: 283 - 297
+ $Ordrenummer =
sprintf("%-9s",'');// verdi: Infodoc ordrenr, type: i4, plass: 342 - 350
if($Belop_motpost < 0)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc/export/Agresso, 1.13,
nomail <=