[Fmsystem-commits] [7636] property: fix sql

[Sigurd Nes]

Revision: 7636
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7636
Author:   sigurdne
Date:     2011-09-16 11:22:59 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
property: fix sql

Modified Paths:
--------------
    trunk/property/inc/class.sodocument.inc.php
    trunk/property/inc/class.solocation.inc.php
    trunk/property/setup/phpgw_no.lang

Modified: trunk/property/inc/class.sodocument.inc.php
===================================================================
--- trunk/property/inc/class.sodocument.inc.php 2011-09-16 10:47:39 UTC (rev 
7635)
+++ trunk/property/inc/class.sodocument.inc.php 2011-09-16 11:22:59 UTC (rev 
7636)
@@ -174,7 +174,7 @@
                                $this->cols_extra       = 
$this->bocommon->fm_cache('cols_extra_document_' . $entity_id);
                        }
 
-                       $groupmethod= " GROUP BY fm_document.location_code";
+                       $groupmethod= " GROUP BY fm_document.location_code, 
fm_location1.loc1_name";
 
                        if ($entity_id)
                        {

Modified: trunk/property/inc/class.solocation.inc.php
===================================================================
--- trunk/property/inc/class.solocation.inc.php 2011-09-16 10:47:39 UTC (rev 
7635)
+++ trunk/property/inc/class.solocation.inc.php 2011-09-16 11:22:59 UTC (rev 
7636)
@@ -1617,6 +1617,8 @@
                        $sql = 
$this->bocommon->generate_sql(array('entity_table'=>$entity_table,'cols_return'=>$cols_return,'cols'=>$cols,
                                
'uicols'=>$uicols,'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,'no_address'=>true,'location_level'=>$type_id));
 
+                       $sql = str_replace(',fm_location1.loc1_name', '', $sql);
+
                        $this->db->query($sql . $filtermethod . $groupmethod . 
" ORDER BY $entity_table.category",__LINE__,__FILE__);
 
                        $summary = array();

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2011-09-16 10:47:39 UTC (rev 7635)
+++ trunk/property/setup/phpgw_no.lang  2011-09-16 11:22:59 UTC (rev 7636)
@@ -1250,7 +1250,7 @@
 priority key   property        no      Prioriteringsnøkkel
 priority keys has been updated property        no      prioriteringsnøkkel er 
oppdatert
 prizing        property        no      Priser
-probability    property        no      Sansynlighet
+probability    property        no      Sannsynlighet
 project        property        no      prosjekt
 .project       property        no      Prosjekt
 project.workorder      property        no      Prosjekt::Bestilling
@@ -1450,7 +1450,7 @@
 select the agreement this activity belongs to. property        no      velg 
avtale denne aktiviteten tilhører
 select the appropriate condition degree        property        no      velg 
tilstandsgrad
 select the appropriate consequence by breakdown of this component for this 
theme       property        no      velg konsekvens ved sammenbrudd av 
dennekomponenten for dette temaet
-select the appropriate propability for worsening of the condition      
property        no      velg sansynlighet for forverring
+select the appropriate propability for worsening of the condition      
property        no      velg sannsynlighet for forverring
 select the appropriate tax code        property        no      velg mva-kode
 select the branches for this project   property        no      velg fag for 
dette prosjektet
 select the branches for this request   property        no      velg fag for 
denne anmodningen