[Fmsystem-commits] [11494] property: fix db-version related problems

[Sigurd Nes]

Revision: 11494
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11494
Author:   sigurdne
Date:     2013-11-27 09:57:47 +0000 (Wed, 27 Nov 2013)
Log Message:
-----------
property: fix db-version related problems

Modified Paths:
--------------
    trunk/property/inc/class.socondition_survey.inc.php
    trunk/property/inc/class.sorequest.inc.php

Modified: trunk/property/inc/class.socondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.socondition_survey.inc.php 2013-11-26 19:07:30 UTC 
(rev 11493)
+++ trunk/property/inc/class.socondition_survey.inc.php 2013-11-27 09:57:47 UTC 
(rev 11494)
@@ -556,7 +556,7 @@
                                $id_filter = "condition_survey_id = 
{$condition_survey_id}";
                        }
 
-                       $sql = "SELECT condition_survey_id, 
left(building_part,1) as building_part_,"
+                       $sql = "SELECT condition_survey_id, 
substr(building_part, 1,1) as building_part_,"
                        . " sum(amount_investment) as investment 
,sum(amount_operation) as operation,"
                        . " recommended_year as year"
                        ." FROM fm_request {$this->_join} fm_request_status ON 
fm_request.status = fm_request_status.id"

Modified: trunk/property/inc/class.sorequest.inc.php
===================================================================
--- trunk/property/inc/class.sorequest.inc.php  2013-11-26 19:07:30 UTC (rev 
11493)
+++ trunk/property/inc/class.sorequest.inc.php  2013-11-27 09:57:47 UTC (rev 
11494)
@@ -247,7 +247,7 @@
        //              . " LEFT JOIN fm_request_consume ON fm_request.id = 
fm_request_consume.request_id)"
                        . " LEFT JOIN fm_request_condition ON fm_request.id = 
fm_request_condition.request_id)"
                        . " {$filtermethod}"
-                       . " GROUP BY fm_request_status.descr,"
+                       . " GROUP BY fm_request.category, 
fm_request.multiplier,fm_request.recommended_year, fm_request_status.descr,"
                        . " 
building_part,fm_request.start_date,fm_request.entry_date,fm_request.closed_date,"
                        . " 
fm_request.in_progress_date,fm_request.delivered_date,title,amount_investment,amount_operation,amount_potential_grants,score,fm_request.id,fm_request_status.descr";
 //_debug_array($sql);