[Fmsystem-commits] [16076] more on integration

[sigurdne]

Revision: 16076
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16076
Author:   sigurdne
Date:     2016-12-12 16:06:32 +0000 (Mon, 12 Dec 2016)
Log Message:
-----------
more on integration

Modified Paths:
--------------
    trunk/property/inc/class.soproject.inc.php
    trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
    trunk/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2016-12-12 15:26:41 UTC (rev 
16075)
+++ trunk/property/inc/class.soproject.inc.php  2016-12-12 16:06:32 UTC (rev 
16076)
@@ -3426,6 +3426,7 @@
                                        'deadline' => ''
                                );
 
+                               //approval_substitute
                                
if(!execMethod('property.sopending_action.get_pending_action', $action_params))
                                {
                                        
execMethod('property.sopending_action.set_pending_action', $action_params);

Modified: trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
===================================================================
--- trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php      
2016-12-12 15:26:41 UTC (rev 16075)
+++ trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php      
2016-12-12 16:06:32 UTC (rev 16076)
@@ -51,7 +51,9 @@
                var $connection;
                var $order_id;
                var $voucher_type;
+               var $batchid;
 
+
                public function __construct( $param )
                {
                        $this->db = & $GLOBALS['phpgw']->db;
@@ -233,9 +235,9 @@
 
                public function transfer( $debug )
                {
-
+                       $batchid = $this->soXport->increment_batchid();
+                       $this->batchid = $batchid;
                        $filename = $this->create_file_name($this->order_id);
-                       $batchid = $this->soXport->increment_batchid();
                        $content = $this->transfer_xml;
 
                        if($debug) // keep a copy?

Modified: 
trunk/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
===================================================================
--- 
trunk/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php    
    2016-12-12 15:26:41 UTC (rev 16075)
+++ 
trunk/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php    
    2016-12-12 16:06:32 UTC (rev 16076)
@@ -164,6 +164,7 @@
                var $connection;
                var $order_id;
                var $voucher_type;
+               var $batch_id;
 
                public function __construct( $param )
                {
@@ -209,7 +210,7 @@
 
                protected function create_file_name( $ref = '' )
                {
-                       if (!$ref)
+                       if (!$this->batchid)
                        {
                                throw new 
Exception('BkBygg_exporter_data_til_Agresso::create_file_name() Mangler 
referanse');
                        }
@@ -221,7 +222,7 @@
 
                        $fil_katalog = 
$this->config->config_data['export']['path'];
 
-                       $filename = 
"{$fil_katalog}/{$voucher_type}_varemottak_{$ref}.xml";
+                       $filename = 
"{$fil_katalog}/{$voucher_type}_varemottak_{$this->batchid}.xml";
 
                        //Sjekk om filen eksisterer
                        if (file_exists($filename))