[Fmsystem-commits] [7737] Merge 7735:7736 from trunk

[Sigurd Nes]

Revision: 7737
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7737
Author:   sigurdne
Date:     2011-09-27 12:08:33 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
Merge 7735:7736 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.soXport.inc.php
    
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Kemner_xml

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


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736

Modified: branches/Version-1_0-branch/property/inc/class.soXport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soXport.inc.php      
2011-09-27 11:59:21 UTC (rev 7736)
+++ branches/Version-1_0-branch/property/inc/class.soXport.inc.php      
2011-09-27 12:08:33 UTC (rev 7737)
@@ -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: 
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Kemner_xml
===================================================================
--- 
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Kemner_xml   
    2011-09-27 11:59:21 UTC (rev 7736)
+++ 
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Kemner_xml   
    2011-09-27 12:08:33 UTC (rev 7737)
@@ -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++;