[Fmsystem-commits] [11427] property: agresso integration export

[Sigurd Nes]

Revision: 11427
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11427
Author:   sigurdne
Date:     2013-11-04 11:41:05 +0000 (Mon, 04 Nov 2013)
Log Message:
-----------
property: agresso integration 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      2013-11-04 09:32:15 UTC 
(rev 11426)
+++ trunk/property/inc/export/default/Agresso_X114      2013-11-04 11:41:05 UTC 
(rev 11427)
@@ -632,7 +632,7 @@
                {
                        if(!$external_voucher_id)
                        {
-                               throw new Exception('Agresso_X114::LagFilnavn() 
Mangler SCANNINGNO' );
+                               throw new Exception('Agresso_X114::LagFilnavn() 
Mangler KEY' );
                        }
                        $fil_katalog = 
$this->config->config_data['export']['path'];
 
@@ -815,45 +815,13 @@
                        $comment = array();
                        foreach ($oRsBilag as $line)
                        {
-                               $comment[] = 
"{$line['belop']}::{$line['process_log']}";
-
-                               $BelopFelt = 'godkjentbelop';
-
-/*
-                               //Bestem belops felt
-                               if ($line['splitt'] == 0)
+                               if($line['process_log'])
                                {
-                                       //Bilaget er ikke splittet
-                                       if ($line['godkjentbelop'] <> 
$line['belop'])
-                                       {
-                                               $BelopFelt = 'godkjentbelop';
-                                               //Logg til avviks tabell
-                                               if ($download=='on')
-                                               {
-//                                                     
$this->soXport->log_to_deviation_table($line);
-                                               }
-                                       }
-                                       else
-                                       {
-                                               $BelopFelt = 'belop';
-                                       }
+                                       $comment[] = 
"{$line['belop']}::{$line['process_log']}";
                                }
 
-*/
-                               //Bilaget er splittet
-/*
-                               if ($line['godkjentbelop'] == $line['belop'])
-                               {
-                                       $BelopFelt = 'godkjentbelop';
-                               }
-                               else
-                               {
-                                        //Ikke lovlig
-                                       $message = lang('Avvik mellom 
fakturabelop og godkjent belop pa splittet faktura!');
-                                       $this->errorhandler($batchid,$message);
-                                       return $message;
-                               }
-*/
+                               $BelopFelt = 'godkjentbelop';
+
                                $amount =  $line[$BelopFelt] * 100;
                                $amount =  number_format($amount,0,'','');