[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc/export/Agresso, 1.10
|
From: |
nomail |
|
Subject: |
[Phpgroupware-cvs] property/inc/export/Agresso, 1.10 |
|
Date: |
Fri, 1 Oct 2004 13:51:05 +0200 |
Update of /property/inc/export
Modified Files:
Branch:
Agresso
date: 2004/10/01 11:51:05; author: sigurdne; state: Exp; lines: +45 -43
Log Message:
no message
=====================================================================
Index: property/inc/export/Agresso
diff -u property/inc/export/Agresso:1.9 property/inc/export/Agresso:1.10
--- property/inc/export/Agresso:1.9 Thu Sep 30 17:02:46 2004
+++ property/inc/export/Agresso Fri Oct 1 11:51:05 2004
@@ -163,7 +163,7 @@
}
- //roleback function
+ //rollback function
function bilag_update_overf($BilagOverf)
{
$values= array(
@@ -225,8 +225,8 @@
{
// $download = 'on';
+// $download = False;
$pre_transfer=True;
-
//Generer batch ID
$batchid = $this->soXport->next_batchid();
@@ -239,8 +239,19 @@
//Velg ut alle perioder som har bilag som skal overføres
+
+ $periode =
$this->select_periods_with_invoice_to_transfer($pre_transfer);
+
+ for ($i=0;$i<count($periode);$i++)
+ {
+
+ $receipt['message'][]= array('msg' =>
$this->OverforPeriode($batchid,$periode[$i],$download,$pre_transfer));
+ }
+
+
+ $pre_transfer=False;
+
$periode =
$this->select_periods_with_invoice_to_transfer($pre_transfer);
-//_debug_array($periode);
for ($i=0;$i<count($periode);$i++)
{
@@ -248,6 +259,8 @@
$receipt['message'][]= array('msg' =>
$this->OverforPeriode($batchid,$periode[$i],$download,$pre_transfer));
}
+
+
//Lagre melding
if ($download=='on' || $pre_transfer)
{
@@ -451,7 +464,7 @@
$bilag_count= count($oRsBilag);
for ($k=0;$k<$bilag_count;$k++)
{
- $pre_tranfser_bilag[] =
$oRsBilag[$k]['bilagsnr'];
+ $tranfser_bilag[] = $oRsBilag[$k]['bilagsnr'];
//Bestem belops felt
if ($oRsBilag[$k]['splitt']==0)
@@ -552,7 +565,6 @@
{
$BilagId = $oRsUnderbilag[$i]['id'];
- // $Belop = sprintf("%01.2f",
$oRsUnderbilag[$i][$BelopFelt])*100;
$Belop =
$oRsUnderbilag[$i][$BelopFelt]*100;
if($Belop < 0)
@@ -593,7 +605,7 @@
$dimc =
$this->soXport->select_dimc($oRsUnderbilag[$i]['pmwrkord_code']);
//Oppdater beløp på arbeidsordre
- if ($download=='on')
+ if ($download=='on' &&
!$pre_transfer)
{
if
($oRsUnderbilag[$i]['dimd'] % 2 == 0)
{
@@ -649,16 +661,6 @@
$this->soXport->add_OverfBilag($oRsOverfBilag);
}
-
- // Merking utgår : overføre alle kvar
gong.
-
- /* if ($download=='on' && $pre_transfer)
- {
- $this->db->query("update
fm_ecobilag set pre_transfer = 1 where id =" . $oRsOverfBilag['id']);
- }
- */
-
-
//Skriv til fil
$buffer .= $Buntnr . $Forsystem .
$Bilagsart . $Transtype . $Firmakode . $Konto . $Dim_1 . $Dim_2 . $Dim_3 .
$Dim_4 .
@@ -734,40 +736,46 @@
if ($download=='on' && !$pre_transfer):
{
- $message = 'periode: '.$periode_aar.' antall
bilag/underbilag overført:'.$antall . ' , fil: ' . $Filnavn;
$fp = fopen($Filnavn, "wb");
fwrite($fp,$buffer);
if(fclose($fp))
{
+ $transfer_ok =
$this->transfer($buffer,$Filnavn,$batchid,$tranfser_bilag);
+ }
+
+ if($transfer_ok)
+ {
$this->db->transaction_commit();
-
+ $message = 'Godkjent: periode:
'.$periode_aar.' antall bilag/underbilag overført:'.$antall . ' , fil: ' .
$Filnavn;
}
else
{
$this->db->transaction_abort();
- $message = 'Noe gikk galt!';
+ $message = 'Noe gikk galt med
overføring av godkjendte fakturaer!';
}
}
elseif($download=='on' && $pre_transfer):
{
- //filoverføring
- $pre_transfer_ok =
$this->pre_transfer($buffer,$Filnavn,$batchid,$pre_tranfser_bilag);
- if($pre_transfer_ok)
+ $fp = fopen($Filnavn, "wb");
+ fwrite($fp,$buffer);
+ if(fclose($fp))
{
- $this->db->transaction_commit();
+ $transfer_ok =
$this->transfer($buffer,$Filnavn,$batchid,$tranfser_bilag);
+ }
- $message = 'Jepp!';
+ if($transfer_ok)
+ {
+ $this->db->transaction_commit();
+ $message = 'Ankomstregistrering:
periode: '.$periode_aar.' antall bilag/underbilag overført:'.$antall . ' , fil:
' . $Filnavn;
}
else
{
$this->db->transaction_abort();
- $message = 'Noe gikk galt!';
+ $message = 'Noe gikk galt med
ankomstregistrering!';
}
-
}
else:
{
-//_debug_array($buffer);
$message = $buffer;
$this->db->transaction_abort();
@@ -777,14 +785,8 @@
return $message;
}
- function
pre_transfer($buffer,$Filnavn,$batchid,$pre_tranfser_bilag)
+ function transfer($buffer,$Filnavn,$batchid,$tranfser_bilag)
{
- $fp = fopen($Filnavn, "wb");
- fwrite($fp,$buffer);
- if(fclose($fp))
- {
- $pre_transfer_ok = True;
- }
if($this->config->config_data['invoice_export_method']=='ftp')
{
@@ -802,28 +804,28 @@
if (ftp_put($ftp,$newfile, $Filnavn,
FTP_BINARY))
{
- for
($i=0;$i<count($pre_tranfser_bilag);$i++)
+ for
($i=0;$i<count($tranfser_bilag);$i++)
{
-
$this->soXport->log_transaction($batchid,$pre_tranfser_bilag[$i],lang('Invoice
pre_transferred %1',basename($Filnavn)));
+
$this->soXport->log_transaction($batchid,$tranfser_bilag[$i],lang('Invoice
pre_transferred %1',basename($Filnavn)));
}
- $pre_transfer_ok = True;
+ $transfer_ok = True;
}
else
{
- for
($i=0;$i<count($pre_tranfser_bilag);$i++)
+ for
($i=0;$i<count($tranfser_bilag);$i++)
{
-
$this->soXport->log_transaction($batchid,$pre_tranfser_bilag[$i],lang('Failed
to pre_transfere %1 to agresso',basename($Filnavn)));
+
$this->soXport->log_transaction($batchid,$tranfser_bilag[$i],lang('Failed to
pre_transfere %1 to agresso',basename($Filnavn)));
}
- $pre_transfer_ok = False;
+ $transfer_ok = False;
}
- if(!$pre_transfer_ok)
+ if(!$transfer_ok)
{
unlink($Filnavn);
}
ftp_quit($ftp);
}
- return $pre_transfer_ok;
+ return $transfer_ok;
}
function phpftp_connect()
@@ -843,4 +845,4 @@
}
}
}
-?>
+?>
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc/export/Agresso, 1.10,
nomail <=