[Fmsystem-commits] [15105] Syncromind: Merge 14936:15027 from trunk

[sigurdne]

Revision: 15105
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15105
Author:   sigurdne
Date:     2016-05-13 12:22:28 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk

Modified Paths:
--------------
    
branches/dev-syncromind-2/property/inc/export/default/Agresso_Bergen_Kostfordeling

Modified: 
branches/dev-syncromind-2/property/inc/export/default/Agresso_Bergen_Kostfordeling
===================================================================
--- 
branches/dev-syncromind-2/property/inc/export/default/Agresso_Bergen_Kostfordeling
  2016-05-13 12:22:26 UTC (rev 15104)
+++ 
branches/dev-syncromind-2/property/inc/export/default/Agresso_Bergen_Kostfordeling
  2016-05-13 12:22:28 UTC (rev 15105)
@@ -510,7 +510,7 @@
                        }
 
                        $sql = "SELECT fm_ecobilag.* 
,fm_part_of_town.district_id"
-                               . " FROM (fm_location1 {$this->join} 
fm_part_of_town ON fm_location1.part_of_town_id = 
fm_part_of_town.part_of_town_id)"
+                               . " FROM (fm_location1 {$this->join} 
fm_part_of_town ON fm_location1.part_of_town_id = fm_part_of_town.id)"
                                . " {$this->join} fm_ecobilag ON 
fm_location1.loc1 = fm_ecobilag.loc1"
                                . " WHERE bilagsnr='$bilagsnr' AND fakturanr = 
'{$fakturanr}'";