[Fmsystem-commits] [16244] more on integration

[sigurdne]

Revision: 16244
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16244
Author:   sigurdne
Date:     2017-02-03 09:09:56 -0500 (Fri, 03 Feb 2017)
Log Message:
-----------
more on integration

Modified Paths:
--------------
    trunk/property/inc/cron/default/Import_fra_agresso_X205_BK.php

Modified: trunk/property/inc/cron/default/Import_fra_agresso_X205_BK.php
===================================================================
--- trunk/property/inc/cron/default/Import_fra_agresso_X205_BK.php      
2017-02-03 11:35:17 UTC (rev 16243)
+++ trunk/property/inc/cron/default/Import_fra_agresso_X205_BK.php      
2017-02-03 14:09:56 UTC (rev 16244)
@@ -733,8 +733,7 @@
                                {
                                        $bilagsnr = 
$this->import_end_file($buffer);
                                        
-                                       $previous_received = 
$this->get_previous_received((int)$order_id);
-                                       $received_amount = (float) 
$previous_received + (float) $belop;
+                                       $received_amount = 
$this->get_total_received((int)$order_id);
                                        $order_type = 
$this->bocommon->socommon->get_order_type($order_id);
 
                                        switch ($order_type)
@@ -771,7 +770,7 @@
                        }
                }
 
-               function get_previous_received( $order_id )
+               function get_total_received( $order_id )
                {
                        $amount = 0;
                        $sql = "SELECT sum(godkjentbelop) AS amount FROM 
fm_ecobilag WHERE pmwrkord_code = {$order_id}";