[Fmsystem-commits] [16266] Stable: Merge 16264:16265 from trunk

[sigurdne]

Revision: 16266
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16266
Author:   sigurdne
Date:     2017-02-07 08:50:18 -0500 (Tue, 07 Feb 2017)
Log Message:
-----------
Stable: Merge 16264:16265 from trunk

Modified Paths:
--------------
    
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php

Property Changed:
----------------
    branches/Version-2_0-branch/

Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-02-07 13:48:43 UTC (rev 16265)
+++ branches/Version-2_0-branch 2017-02-07 13:50:18 UTC (rev 16266)

Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/dev-syncromind:13653
 /branches/dev-syncromind-2:14933-16188
 /branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265
\ No newline at end of property
Modified: 
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
===================================================================
--- 
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
        2017-02-07 13:48:43 UTC (rev 16265)
+++ 
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
        2017-02-07 13:50:18 UTC (rev 16266)
@@ -55,6 +55,7 @@
                        var $voucher_type;
                        var $voucher_id;
                        var $batchid;
+                       protected $global_lock = false;
 
 
                        public function __construct( $param )
@@ -262,7 +263,14 @@
                                $transfer_ok = false;
                                if (!$debug && 
($this->config->config_data['common']['method'] == 'ftp' || 
$this->config->config_data['common']['method'] == 'ssh'))
                                {
-                                       $this->db->transaction_begin();
+                                       if ($this->db->get_transaction())
+                                       {
+                                               $this->global_lock = true;
+                                       }
+                                       else
+                                       {
+                                               $this->db->transaction_begin();
+                                       }
 
                                        if (!$connection = $this->connection)
                                        {
@@ -301,11 +309,17 @@
                                        if ($transfer_ok)
                                        {
                                                
$this->soXport->log_transaction($batchid, $this->order_id, lang('transferred 
Order %1 to Agresso', basename($filename)));
-                                               
$this->db->transaction_commit(); // Reverse the batch_id - increment
+                                               if (!$this->global_lock)
+                                               {
+                                                       
$this->db->transaction_commit();
+                                               }
                                        }
                                        else
                                        {
-                                               $this->db->transaction_abort();
+                                               if (!$this->global_lock)
+                                               {
+                                                       
$this->db->transaction_abort(); // Reverse the batch_id - increment
+                                               }
                                                
$this->soXport->log_transaction($batchid, $this->order_id, lang('Failed to 
transfere Order %1 to Agresso', basename($filename)));
                                //              @unlink($filename);
                                        }