[Phpgroupware-cvs] property/inc class.soproject.inc.php,1.12

[sigurdne]

Update of property/inc

Modified Files:
     Branch: MAIN
            class.soproject.inc.php lines: +7 -3

Log Message:
no message

====================================================
Index: property/inc/class.soproject.inc.php
diff -u property/inc/class.soproject.inc.php:1.11 
property/inc/class.soproject.inc.php:1.12
--- property/inc/class.soproject.inc.php:1.11   Mon Jan 31 12:47:55 2005
+++ property/inc/class.soproject.inc.php        Wed Feb 23 09:23:33 2005
@@ -699,9 +699,13 @@
                                $this->db->query("update fm_tenant set 
contact_phone='". $project['extra']['contact_phone']. "' where id='". 
$project['extra']['tenant_id']. "'",__LINE__,__FILE__);
                        }

-                       if ($project['power_meter'] )
+                       $config = CreateObject('phpgwapi.config','property');
+                       $config->read_repository();
+                       $meter_table = $config->config_data['meter_table'];
+
+                       if ($project['power_meter'] && $meter_table)
                        {
-                               
$this->update_power_meter($project['power_meter'],$project['location_code'],$address);
+                               
$this->update_power_meter($project['power_meter'],$project['location_code'],$address,$meter_table);
                        }
        // -----------------which branch is represented
                        $this->db->query("delete from fm_projectbranch where 
project_id='" . $project['project_id'] ."'",__LINE__,__FILE__);