[Fmsystem-commits] [11723] property: switch config

[Sigurd Nes]

Revision: 11723
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11723
Author:   sigurdne
Date:     2014-02-19 14:15:30 +0000 (Wed, 19 Feb 2014)
Log Message:
-----------
property: switch config

Modified Paths:
--------------
    trunk/property/inc/class.soinvoice.inc.php

Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php  2014-02-19 08:16:21 UTC (rev 
11722)
+++ trunk/property/inc/class.soinvoice.inc.php  2014-02-19 14:15:30 UTC (rev 
11723)
@@ -49,7 +49,9 @@
                        $this->like                              = & 
$this->db->like;
                        $this->config                    = 
CreateObject('phpgwapi.config', 'property');
                        $this->config->read();
-                       $this->invoice_approval  = 
isset($this->config->config_data['invoice_approval']) && 
$this->config->config_data['invoice_approval'] ? 
$this->config->config_data['invoice_approval'] : 2;
+                       $custom_config = CreateObject('admin.soconfig', 
$GLOBALS['phpgw']->locations->get_id('property', '.invoice'));
+
+                       $this->invoice_approval  = 
isset($custom_config->config_data['common']['invoice_approval']) && 
$custom_config->config_data['common']['invoice_approval'] ? 
$custom_config->config_data['common']['invoice_approval'] : 2;
                }
 
                function read_invoice($data)