[Fmsystem-commits] [11278] property: allow tickets with no physical location

[Sigurd Nes]

Revision: 11278
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11278
Author:   sigurdne
Date:     2013-09-06 09:26:02 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
property: allow tickets with no physical location

Modified Paths:
--------------
    trunk/property/inc/class.sotts.inc.php

Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php      2013-09-06 09:25:26 UTC (rev 
11277)
+++ trunk/property/inc/class.sotts.inc.php      2013-09-06 09:26:02 UTC (rev 
11278)
@@ -453,18 +453,18 @@
                        }
 
                        $sql = "SELECT DISTINCT {$return_fields}  FROM 
fm_tts_tickets"
-                               . " {$this->join} fm_location1 ON 
fm_tts_tickets.loc1=fm_location1.loc1"
-                               . " {$this->join} fm_part_of_town ON 
fm_location1.part_of_town_id=fm_part_of_town.part_of_town_id"
-                               . " {$this->join} fm_district ON fm_district.id 
= fm_part_of_town.district_id"
+                               . " {$this->left_join} fm_location1 ON 
fm_tts_tickets.loc1=fm_location1.loc1"
+                               . " {$this->left_join} fm_part_of_town ON 
fm_location1.part_of_town_id=fm_part_of_town.part_of_town_id"
+                               . " {$this->left_join} fm_district ON 
fm_district.id = fm_part_of_town.district_id"
                                . " {$order_join}"
                                . " LEFT OUTER JOIN fm_tts_views ON 
(fm_tts_tickets.id = fm_tts_views.id AND 
fm_tts_views.account_id='{$this->account}')"
                                . " {$filtermethod} {$querymethod}";
 
 
                        $sql_cnt = "SELECT DISTINCT fm_tts_tickets.budget 
,fm_tts_tickets.actual_cost, fm_tts_tickets.id FROM fm_tts_tickets"
-                               . " $this->join fm_location1 ON 
fm_tts_tickets.loc1=fm_location1.loc1"
-                               . " $this->join fm_part_of_town ON 
fm_location1.part_of_town_id=fm_part_of_town.part_of_town_id"
-                               . " $this->join fm_district ON fm_district.id = 
fm_part_of_town.district_id"
+                               . " {$this->left_join} fm_location1 ON 
fm_tts_tickets.loc1=fm_location1.loc1"
+                               . " {$this->left_join} fm_part_of_town ON 
fm_location1.part_of_town_id=fm_part_of_town.part_of_town_id"
+                               . " {$this->left_join} fm_district ON 
fm_district.id = fm_part_of_town.district_id"
                                . " $order_join"
                                . " LEFT OUTER JOIN fm_tts_views ON 
(fm_tts_tickets.id = fm_tts_views.id AND 
fm_tts_views.account_id='{$this->account}')"
                                . " $filtermethod $querymethod";