[Fmsystem-commits] [15789] more on Agresso

[sigurdne]

Revision: 15789
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15789
Author:   sigurdne
Date:     2016-10-03 15:22:21 +0000 (Mon, 03 Oct 2016)
Log Message:
-----------
more on Agresso

Modified Paths:
--------------
    trunk/property/inc/class.uitts.inc.php
    trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
    trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2016-10-03 08:36:54 UTC (rev 
15788)
+++ trunk/property/inc/class.uitts.inc.php      2016-10-03 15:22:21 UTC (rev 
15789)
@@ -2048,7 +2048,7 @@
 
                                $need_approval = 
isset($this->bo->config->config_data['workorder_approval']) ? 
$this->bo->config->config_data['workorder_approval'] : '';
 
-                               $supervisor_email = 
$this->get_supervisor_email($supervisor_id,  $need_approval);
+               //              $supervisor_email = 
$this->get_supervisor_email($supervisor_id,  $need_approval);
                                // approval
                        }
 
@@ -2940,7 +2940,7 @@
                                'year_list' => array('options' => 
$this->bocommon->select_list($ticket['actual_cost_year'] ? 
$ticket['actual_cost_year'] : date('Y'), $year_list)),
                                'period_list' => array('options' => 
execMethod('property.boinvoice.period_list', date('Ym'))),
                                'need_approval' => $need_approval,
-                               'value_approval_mail_address' => 
$supervisor_email,
+       //                      'value_approval_mail_address' => 
$supervisor_email,
                                'contact_data' => $contact_data,
                                'lookup_type' => $lookup_type,
                                'simple' => $this->simple,
@@ -3065,11 +3065,18 @@
 
                public function check_purchase_right()
                {
+                       $need_approval = 
isset($this->bo->config->config_data['workorder_approval']) ? 
$this->bo->config->config_data['workorder_approval'] : '';
+                       if(!$need_approval)
+                       {
+                               return;
+                       }
+
                        $config         = CreateObject('admin.soconfig', 
$GLOBALS['phpgw']->locations->get_id('property', '.ticket'));
                        $check_external_register= 
!!$config->config_data['external_register']['check_external_register'];
-                       $id = phpgw::get_var('ecodimb');
-               //      $id ='013000';
 
+                       $id = sprintf("%06s", phpgw::get_var('ecodimb'));
+       //              $id ='013000';
+
                        $amount =phpgw::get_var('amount', 'int');
 
                        if($check_external_register && $id)
@@ -3193,6 +3200,14 @@
                                                'required'      => true
                                        );
                                }
+                               else
+                               {
+                                       $supervisor_email[] = array(
+                                               'id' => $supervisor_id,
+                                               'address' => 
$GLOBALS['phpgw']->accounts->id2name($supervisor_id) . '@bergen.kommune.no',
+                                               'required'      => true
+                                       );
+                               }
 
                                if (isset($prefs['approval_from']) && 
$prefs['approval_from'])
                                {

Modified: trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
===================================================================
--- trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php      
2016-10-03 08:36:54 UTC (rev 15788)
+++ trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php      
2016-10-03 15:22:21 UTC (rev 15789)
@@ -222,7 +222,7 @@
                        return $filename;
                }
 
-               public function transfer( )
+               public function transfer( $debug )
                {
                        $this->db->transaction_begin();
 
@@ -244,7 +244,7 @@
 
                        $transfer_ok = false;
 //                     if ($this->config->config_data['common']['method'] == 
'ftp' || $this->config->config_data['common']['method'] == 'ssh')
-                       if (false)//Not yet...
+                       if (!$debug)//Not yet...
                        {
                                if (!$connection = $this->connection)
                                {
@@ -292,6 +292,18 @@
                        //              @unlink($filename);
                                }
                        }
+                       else
+                       {
+                               $transfer_ok = true;
+
+                               $GLOBALS['phpgw_info']['flags']['noheader'] = 
true;
+                               $GLOBALS['phpgw_info']['flags']['nofooter'] = 
true;
+                               $GLOBALS['phpgw_info']['flags']['xslt_app'] = 
false;
+                               $size = strlen($content);
+                               $browser = CreateObject('phpgwapi.browser');
+                               $browser->content_header(basename($filename), 
'', $size);
+                               echo $content;
+                       }
                        return $transfer_ok;
                }
 

Modified: 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php
===================================================================
--- trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php  
2016-10-03 08:36:54 UTC (rev 15788)
+++ trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php  
2016-10-03 15:22:21 UTC (rev 15789)
@@ -40,6 +40,7 @@
        class lag_agresso_ordre_fra_melding
        {
 
+               var $debug = true;
                function __construct()
                {
                        
@@ -48,7 +49,7 @@
                public function transfer( $id )
                {
                        $_ticket = ExecMethod('property.sotts.read_single', 
$id);
-                       if ($_ticket['order_sent'])
+                       if (!$this->debug && $_ticket['order_sent'])
                        {
                                return 2;
                        }
@@ -153,9 +154,9 @@
 
                        $exporter_ordre = new 
BkBygg_exporter_data_til_Agresso(array('order_id' => $_ticket['order_id']));
                        $exporter_ordre->create_transfer_xml($param);
-                       $exporter_ordre->output();
-                       die();
-                       $export_ok = $exporter_ordre->transfer();
+
+                       $export_ok = $exporter_ordre->transfer($this->debug);
+
                        if ($export_ok)
                        {
                                $this->log_transfer( $id );