[Fmsystem-commits] [11841] property: Agresso export

[Sigurd Nes]

Revision: 11841
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11841
Author:   sigurdne
Date:     2014-03-18 20:03:54 +0000 (Tue, 18 Mar 2014)
Log Message:
-----------
property: Agresso export

Modified Paths:
--------------
    trunk/property/inc/export/default/Agresso_X114

Modified: trunk/property/inc/export/default/Agresso_X114
===================================================================
--- trunk/property/inc/export/default/Agresso_X114      2014-03-17 22:04:38 UTC 
(rev 11840)
+++ trunk/property/inc/export/default/Agresso_X114      2014-03-18 20:03:54 UTC 
(rev 11841)
@@ -529,6 +529,11 @@
                        return $receipt;
                }
 
+               /**
+                * Abort transaction and log to database
+                * @param integer $batchid
+                * @param string $error_desr
+                */
                protected function errorhandler($batchid,$error_desr)
                {
                        if($this->db->get_transaction())
@@ -536,15 +541,21 @@
                                $this->db->transaction_abort();
                        }
 
-                       $meld = $error_desr;
-
                        //Vis feilmelding
-                       echo $meld;
+                       echo $error_desr;
 
                        //Lagre feilmelding
                        $this->log_error($batchid,$error_desr);
                }
 
+               /**
+                * RullTilbake er initiert fra import-filteret
+                * @param string $Filnavn
+                * @param string $date
+                * @param integer $rollback_voucher
+                * @param integer $rollback_internal_voucher
+                * @return array Receipt
+                */
                public function RullTilbake($Filnavn, 
$date,$rollback_voucher,$rollback_internal_voucher)
                {
                        $voucher = $this->select_invoice_rollback($date, 
$Filnavn,$rollback_voucher,$rollback_internal_voucher);
@@ -637,7 +648,6 @@
                        if(!$ref)
                        {
                                throw new Exception('Agresso_X114::LagFilnavn() 
Mangler SCANNINGNO' );
-               //              throw new Exception('Agresso_X114::LagFilnavn() 
Mangler KEY' );
                        }
                        $fil_katalog = 
$this->config->config_data['export']['path'];
 
@@ -703,12 +713,12 @@
 
                        $antall = count($oRsBilag);
 
-                       if ( $this->db->get_transaction() )
+//                     if ( $this->db->get_transaction() )
+//                     {
+//                             $this->global_lock = true;
+//                     }
+//                     else
                        {
-                               $this->global_lock = true;
-                       }
-                       else
-                       {
                                $this->db->transaction_begin();
                        }
 
@@ -1012,7 +1022,7 @@
                         
                                if($skip_agresso)
                                {
-                                       if ( !$this->global_lock )
+//                                     if ( !$this->global_lock )
                                        {
                                                $this->db->transaction_commit();
                                        }
@@ -1043,7 +1053,7 @@
                                {
                                        
$this->soXport->update_actual_cost_from_archive($this->orders_affected);
 
-                                       if ( !$this->global_lock )
+//                                     if ( !$this->global_lock )
                                        {
                                                $this->db->transaction_commit();
                                        }
@@ -1184,4 +1194,4 @@
                        $this->connection = $connection;
                        return $connection;
                }
-       }
+       }
\ No newline at end of file