[Fmsystem-commits] [7815]

[Torstein]

Revision: 7815
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7815
Author:   vator
Date:     2011-10-05 05:53:02 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/rental/inc/class.uiparty.inc.php
    trunk/rental/inc/plugins/fellesdata/party.edit.php

Modified: trunk/rental/inc/class.uiparty.inc.php
===================================================================
--- trunk/rental/inc/class.uiparty.inc.php      2011-10-05 05:48:57 UTC (rev 
7814)
+++ trunk/rental/inc/class.uiparty.inc.php      2011-10-05 05:53:02 UTC (rev 
7815)
@@ -4,7 +4,6 @@
 phpgw::import_class('rental.socontract');
 phpgw::import_class('rental.sodocument');
 phpgw::import_class('rental.bofellesdata');
-phpgw::import_class('rental.bofellesdata_lokal');
 include_class('rental', 'party', 'inc/model/');
 include_class('rental', 'unit', 'inc/model/');
 include_class('rental', 'location_hierarchy', 'inc/locations/');
@@ -612,7 +611,7 @@
                                        return;
                                }
                                
-                               $bofelles = 
rental_bofellesdata_lokal::get_instance();
+                               $bofelles = rental_bofellesdata::get_instance();
                                
                                $org_unit_with_leader = 
$bofelles->get_result_unit_with_leader($org_unit_id);
                                $org_department = 
$bofelles->get_department_for_org_unit($org_unit_id);

Modified: trunk/rental/inc/plugins/fellesdata/party.edit.php
===================================================================
--- trunk/rental/inc/plugins/fellesdata/party.edit.php  2011-10-05 05:48:57 UTC 
(rev 7814)
+++ trunk/rental/inc/plugins/fellesdata/party.edit.php  2011-10-05 05:53:02 UTC 
(rev 7815)
@@ -9,9 +9,10 @@
                        <select name="org_enhet_id" id="org_enhet_id">
                                <option value=""><?php echo 
lang('no_party_location') ?></option>
                <?php
-                       
+               var_dump("SKRIVER UT");
+                                       
                        $result_units = 
rental_bofellesdata::get_instance()->get_result_units();
-                       
+                       print_r($result_units);
                        $party_org_enhet_id = $party->get_org_enhet_id();
                        foreach ($result_units as $result_unit)
                        {
@@ -33,6 +34,8 @@
                        $party_org_enhet_id = $party->get_org_enhet_id();
                        if (isset($party_org_enhet_id) && 
is_numeric($party_org_enhet_id))
                        {
+                               
+                       
                                $result_unit = 
rental_bofellesdata::get_instance()->get_result_unit($party_org_enhet_id);
                                echo $result_unit['ORG_NAME'];
                        }