[Phpgroupware-cvs] property/inc/custom synkroniser_med_boei.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   07/01/08 11:48:26

Modified files:
        inc/custom     : synkroniser_med_boei.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/custom/synkroniser_med_boei.php?cvsroot=phpgroupware&r1=1.5&r2=1.6

Patches:
Index: synkroniser_med_boei.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/custom/synkroniser_med_boei.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- synkroniser_med_boei.php    4 Dec 2006 08:35:21 -0000       1.5
+++ synkroniser_med_boei.php    8 Jan 2007 11:48:26 -0000       1.6
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage custom
-       * @version $Id: synkroniser_med_boei.php,v 1.5 2006/12/04 08:35:21 
sigurdne Exp $
+       * @version $Id: synkroniser_med_boei.php,v 1.6 2007/01/08 11:48:26 
sigurdne Exp $
        */
 
        /**
@@ -521,9 +521,9 @@
                {
 
                        $sql = " SELECT TOP 100 PERCENT 
sum(v_Leieobjekt.boareal) as sum_boa, count(leie_id) as ant_leieobjekt,"
-                                       . " 
v_Objekt.objekt_id,bydel_id,tjenestested,navn FROM  v_Objekt $this->join 
v_Leieobjekt ON v_Objekt.objekt_id = v_Leieobjekt.objekt_id"
+                                       . " 
v_Objekt.objekt_id,bydel_id,tjenestested,navn,v_Objekt.eier_id FROM  v_Objekt 
$this->join v_Leieobjekt ON v_Objekt.objekt_id = v_Leieobjekt.objekt_id"
                                        . " WHERE v_Leieobjekt.formaal_id NOT 
IN (99)"
-                                       . " GROUP BY 
bydel_id,v_Objekt.objekt_id,navn,tjenestested";
+                                       . " GROUP BY 
bydel_id,v_Objekt.objekt_id,navn,tjenestested,eier_id";
 
                        $this->db_boei->query($sql,__LINE__,__FILE__);
 
@@ -536,6 +536,7 @@
                                . " sum_boa = '" . $this->db_boei->f('sum_boa') 
. "',"
                                . " ant_leieobjekt = '" . 
$this->db_boei->f('ant_leieobjekt') . "',"
                                . " part_of_town_id = '" . 
$this->db_boei->f('bydel_id') . "',"
+                               . " owner_id = '" . 
$this->db_boei->f('eier_id') . "',"
                                . " kostra_id = '" . 
$this->db_boei->f('tjenestested') . "'"
                                . " WHERE  loc1 = '" . 
$this->db_boei->f('objekt_id') . "'";