[Fmsystem-commits] [16078] Stable: Merge 16072:16077 from trunk

[sigurdne]

Revision: 16078
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16078
Author:   sigurdne
Date:     2016-12-12 20:45:33 +0000 (Mon, 12 Dec 2016)
Log Message:
-----------
Stable: Merge 16072:16077 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/property/inc/class.soproject.inc.php
    
branches/Version-2_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
    
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_varemottak_til_Agresso.php
    branches/Version-2_0-branch/rental/inc/class.socontract_price_item.inc.php

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


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-15891
/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
   + /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-15891
/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

Modified: branches/Version-2_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.soproject.inc.php    
2016-12-12 20:43:37 UTC (rev 16077)
+++ branches/Version-2_0-branch/property/inc/class.soproject.inc.php    
2016-12-12 20:45:33 UTC (rev 16078)
@@ -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: 
branches/Version-2_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
===================================================================
--- 
branches/Version-2_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
     2016-12-12 20:43:37 UTC (rev 16077)
+++ 
branches/Version-2_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
     2016-12-12 20:45:33 UTC (rev 16078)
@@ -687,7 +687,13 @@
 
                        $GLOBALS['phpgw']->db->query("UPDATE fm_vendor SET 
active = 0", __LINE__, __FILE__);
 
-                       $GLOBALS['phpgw']->db->query("UPDATE fm_vendor SET 
active = 1"
+                       $GLOBALS['phpgw']->db->query("UPDATE fm_vendor SET"
+                               . " active = 1,"
+                               . " org_name = fm_vendor_temp.navn,"
+                               . " adresse = fm_vendor_temp.adresse,"
+                               . " postnr = fm_vendor_temp.postnummer,"
+                               . " poststed = fm_vendor_temp.sted,"
+                               . " org_nr = fm_vendor_temp.organisasjonsnr"
                                . " FROM fm_vendor_temp WHERE fm_vendor.id = 
fm_vendor_temp.id", __LINE__, __FILE__);
 
                }

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
        2016-12-12 20:43:37 UTC (rev 16077)
+++ 
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
        2016-12-12 20:45:33 UTC (rev 16078)
@@ -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: 
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
===================================================================
--- 
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
  2016-12-12 20:43:37 UTC (rev 16077)
+++ 
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
  2016-12-12 20:45:33 UTC (rev 16078)
@@ -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))

Modified: 
branches/Version-2_0-branch/rental/inc/class.socontract_price_item.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.socontract_price_item.inc.php  
2016-12-12 20:43:37 UTC (rev 16077)
+++ branches/Version-2_0-branch/rental/inc/class.socontract_price_item.inc.php  
2016-12-12 20:45:33 UTC (rev 16078)
@@ -123,7 +123,7 @@
                                        . " 
rental_contract_price_item.contract_id, rental_contract_price_item.area, 
rental_contract_price_item.count,"
                                        . " 
rental_contract_price_item.agresso_id, rental_contract_price_item.title, 
rental_contract_price_item.is_area,"
                                        . " rental_contract_price_item.price, 
rental_contract_price_item.total_price, rental_contract_price_item.is_one_time,"
-                                       . " 
rental_contract_price_item.date_start, 
rental_contract_price_item.date_end,rental_price_item.type'";
+                                       . " 
rental_contract_price_item.date_start, 
rental_contract_price_item.date_end,rental_price_item.type";
                        }
                        else
                        {