[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc/export Agresso,1.21
From: |
sigurdne |
Subject: |
[Phpgroupware-cvs] property/inc/export Agresso,1.21 |
Date: |
Wed, 20 Apr 2005 11:21:00 +0200 |
Update of property/inc/export
Modified Files:
Branch: MAIN
Agresso lines: +33 -4
Log Message:
no message
====================================================
Index: property/inc/export/Agresso
diff -u property/inc/export/Agresso:1.20 property/inc/export/Agresso:1.21
--- property/inc/export/Agresso:1.20 Tue Apr 12 14:14:54 2005
+++ property/inc/export/Agresso Wed Apr 20 09:21:03 2005
@@ -563,16 +563,35 @@
$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("%-9s",substr($oRsBilag[$k]['bilagsnr'],-8));// 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
+ // $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
if($pre_transfer)
{
+ if(abs(date(m,time()) - $periode) >1)
+ {
+ $temp_period = date(m,time())
-1;
+
+ if($temp_period == 0)
+ {
+ $temp_period =1;
+ }
+
+ $temp_year = date(Y,time());
+ }
+ else
+ {
+ $temp_period = $periode;
+ $temp_year =
date(Y,strtotime($oRsBilag[$k]['fakturadato']));
+ }
+
+ $Periode =
sprintf("%06s",$temp_year . sprintf("%02d",$temp_period));// verdi: Periode,
type: i4, plass: 276 - 281
$Bilagsart =
sprintf("%2s",'FF');// verdi: , type: c2, plass: 15 - 16
$Forfall = '20991231';// verdi:
Forfallsdato , type: date, plass: 298 - 305
}
else
{
+ $Periode =
sprintf("%06s",date(Y,strtotime($oRsBilag[$k]['fakturadato'])) .
sprintf("%02d",$periode));// verdi: Periode, type: i4, plass: 276 - 281
$Bilagsart =
sprintf("%2s",'FD');// verdi: , type: c2, plass: 15 - 16
$Forfall =
date(Ymd,strtotime($oRsBilag[$k]['forfallsdato']));// verdi: Forfallsdato ,
type: date, plass: 298 - 305
}
@@ -722,7 +741,17 @@
$Konto =
sprintf("%-8s",$oRsOverfBilag['spbudact_code']);// verdi: Art, type: c8, plass:
21 - 28
$Dim_1 = sprintf("%-8s",'');//
verdi: Ansvarssted, type: c8, plass: 29 - 36
$Dim_2 =
sprintf("%-8s",$oRsOverfBilag['kostra_id']);// verdi: Tjeneste, type: c8,
plass: 37 - 44
- $Dim_3 =
sprintf("%-8s",substr($oRsOverfBilag['dima'],0,6));// verdi: Objekt, type: c8,
plass: 45 - 52
+
+ if($pre_transfer)
+ {
+ $Dim_3 =
sprintf("%-8s",substr($oRsOverfBilag['dima'],0,4));// verdi: Objekt, type: c8,
plass: 45 - 52
+ }
+ else
+ {
+ $Dim_3 =
sprintf("%-8s",substr($oRsOverfBilag['dima'],0,6));// verdi: Objekt-bygg, type:
c8, plass: 45 - 52
+ }
+
+
$Dim_4 = sprintf("%-8s",'');//
verdi: Ressurs, type: c8, plass: 53 - 60
$Dim_5 =
sprintf("%-12s",$oRsOverfBilag['project_id']);// verdi: Prosjekt, type: c12,
plass: 61 - 72
$Dim_6 =
sprintf("%-4s",$oRsOverfBilag['dimd']);// verdi: Blank, type: c4, plass: 73 - 76
@@ -869,7 +898,7 @@
if($transfer_ok)
{
$this->db->transaction_commit();
- $message = 'Godkjent: periode:
'.$periode_aar.' antall bilag/underbilag overført:'.$antall . ' , fil: ' .
$Filnavn;
+ $message = 'Godkjent: periode:
'.$Periode.' antall bilag/underbilag overført:'.$antall . ' , fil: ' . $Filnavn;
}
else
{
@@ -901,7 +930,7 @@
if($transfer_ok)
{
$this->db->transaction_commit();
- $message = 'Ankomstregistrering:
periode: '.$periode_aar.' antall bilag/underbilag overført:'.$antall . ' , fil:
' . $Filnavn;
+ $message = 'Ankomstregistrering:
periode: '.$Periode.' antall bilag/underbilag overført:'.$antall . ' , fil: ' .
$Filnavn;
}
else
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc/export Agresso,1.21,
sigurdne <=
- Prev by Date:
[Phpgroupware-cvs] property/inc class.sotts.inc.php, 1.6 class.solocation.inc.php, 1.5 class.soproject.inc.php, 1.19 class.soworkorder.inc.php, 1.6
- Next by Date:
[Phpgroupware-cvs] developer_tools/inc class.uilangfile.inc.php, 1.10.2.1.2.10
- Previous by thread:
[Phpgroupware-cvs] property/inc class.sotts.inc.php, 1.6 class.solocation.inc.php, 1.5 class.soproject.inc.php, 1.19 class.soworkorder.inc.php, 1.6
- Next by thread:
[Phpgroupware-cvs] developer_tools/inc class.uilangfile.inc.php, 1.10.2.1.2.10
- Index(es):