[Fmsystem-commits] [7736] property: differentiate responsibility on location

[Sigurd Nes]

Revision: 7736
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7736
Author:   sigurdne
Date:     2011-09-27 11:59:21 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
property: differentiate responsibility on location

Modified Paths:
--------------
    trunk/property/inc/class.soXport.inc.php
    trunk/property/inc/import/default/Import_fra_Kemner_xml

Modified: trunk/property/inc/class.soXport.inc.php
===================================================================
--- trunk/property/inc/class.soXport.inc.php    2011-09-27 11:47:29 UTC (rev 
7735)
+++ trunk/property/inc/class.soXport.inc.php    2011-09-27 11:59:21 UTC (rev 
7736)
@@ -147,12 +147,14 @@
                function gabnr_to_objekt($Gnr,$Bnr,$sekjonnr)
                {
                        //Finn dima fra Boei
-                       $sql = "select fm_gab_location.loc1, 
fm_gab_location.loc2, fm_gab_location.loc3 from fm_gab_location, fm_location1, 
fm_owner "
-                               . "where 
substring(fm_gab_location.gab_id,5,5)='$Gnr' and "
-                               . "      
substring(fm_gab_location.gab_id,10,4)='$Bnr' and "
-                               . "      
substring(fm_gab_location.gab_id,18,3)='$sekjonnr' and "
-                               . "      fm_gab_location.loc1=fm_location1.loc1 
and "
-                               . "      fm_location1.owner_id=fm_owner.id ";
+                       $sql = "SELECT fm_gab_location.loc1, 
fm_gab_location.loc2, fm_gab_location.loc3,fm_part_of_town.district_id"
+                               . " FROM fm_gab_location, fm_location1, 
fm_owner, fm_part_of_town"
+                               . " WHERE 
substring(fm_gab_location.gab_id,5,5)='$Gnr' AND"
+                               . " 
substring(fm_gab_location.gab_id,10,4)='$Bnr' AND"
+                               . " 
substring(fm_gab_location.gab_id,18,3)='$sekjonnr' AND"
+                               . " fm_gab_location.loc1=fm_location1.loc1 AND"
+                               . " fm_location1.owner_id=fm_owner.id AND"
+                               . " fm_location1.part_of_town_id = 
fm_part_of_town.part_of_town_id ";
                        //      . "      and (fm_owner.category=0 or 
fm_owner.category=2)";
 
                        $GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
@@ -160,6 +162,7 @@
 
                        $gabinfo['loc1']=$GLOBALS['phpgw']->db->f('loc1');
                        
$gabinfo['dima']=$GLOBALS['phpgw']->db->f('loc1').$GLOBALS['phpgw']->db->f('loc2').$GLOBALS['phpgw']->db->f('loc3');
+                       
$gabinfo['district_id']=$GLOBALS['phpgw']->db->f('district_id');
 
                        return $gabinfo;
                }

Modified: trunk/property/inc/import/default/Import_fra_Kemner_xml
===================================================================
--- trunk/property/inc/import/default/Import_fra_Kemner_xml     2011-09-27 
11:47:29 UTC (rev 7735)
+++ trunk/property/inc/import/default/Import_fra_Kemner_xml     2011-09-27 
11:59:21 UTC (rev 7736)
@@ -197,6 +197,22 @@
 
                                        $buffer[$i]['referanse'] = $address;    
            
 
+                                       //FIXME - hardcoded for now
+                                       switch($gabinfo['district_id'])
+                                       {
+                                               case '1':
+                                                       $saksbehandlerid = 
'ho1330';
+                                                       break;
+                                               case '2':
+                                                       $saksbehandlerid = 
'jl9258';
+                                                       break;
+                                               case '3':
+                                                       $saksbehandlerid = 
'shl5631';
+                                                       break;
+                                               default:
+                                                       $saksbehandlerid = 
$invoice_common['supervisor'];
+                                       }
+
                                        $buffer[$i]['merknad'] = 'Kemner adr: 
'.$address."\r\n".'BOEI adr: '.$boei_gateadresse."\r\n" .$merknad;
                                        $buffer[$i]['splitt'] = $this->splitt;
                                        $buffer[$i]['kildeid'] = $this->kildeid;
@@ -206,7 +222,7 @@
                                        $buffer[$i]['artid'] = 
$invoice_common['art'];
                                        $buffer[$i]['spvend_code'] = 
$invoice_common['vendor_id'];
                                        $buffer[$i]['oppsynsmannid'] = 
$invoice_common['janitor'];
-                                       $buffer[$i]['saksbehandlerid'] = 
$invoice_common['supervisor'];
+                                       $buffer[$i]['saksbehandlerid'] = 
$saksbehandlerid;
                                        $buffer[$i]['budsjettansvarligid'] = 
$invoice_common['budget_responsible'];
 //_debug_array($bilagsnr);
                                        $bilagsnr++;