[Fmsystem-commits] [15904] more on integration

[sigurdne]

Revision: 15904
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15904
Author:   sigurdne
Date:     2016-10-27 09:32:28 +0000 (Thu, 27 Oct 2016)
Log Message:
-----------
more on integration

Modified Paths:
--------------
    trunk/property/inc/class.soinvoice.inc.php
    trunk/property/templates/base/tts.xsl

Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php  2016-10-27 08:21:53 UTC (rev 
15903)
+++ trunk/property/inc/class.soinvoice.inc.php  2016-10-27 09:32:28 UTC (rev 
15904)
@@ -607,10 +607,10 @@
                        }
 
                        $groupmethod = "GROUP BY 
pmwrkord_code,bilagsnr,bilagsnr_ut,fakturanr,"
-                               . " 
currency,budsjettansvarligid,org_name,periode,periodization,periodization_start";
+                               . " 
currency,budsjettansvarligid,org_name,periode,periodization,periodization_start,external_voucher_id";
 
                        $sql = "SELECT DISTINCT 
pmwrkord_code,bilagsnr,bilagsnr_ut,fakturanr,sum(belop) as belop, 
sum(godkjentbelop) as godkjentbelop,"
-                               . " 
currency,budsjettansvarligid,org_name,periode,periodization,periodization_start"
+                               . " 
currency,budsjettansvarligid,org_name,periode,periodization,periodization_start,external_voucher_id"
                                . " FROM {$table}{$join_project}"
                                . " {$this->join} fm_vendor ON 
{$table}.spvend_code = fm_vendor.id {$filtermethod} {$groupmethod}";
 
@@ -633,7 +633,8 @@
                                        'period' => $this->db->f('periode'),
                                        'periodization' => 
$this->db->f('periodization'),
                                        'periodization_start' => 
$this->db->f('periodization_start'),
-                                       'budget_responsible' => 
$this->db->f('budsjettansvarligid')
+                                       'budget_responsible' => 
$this->db->f('budsjettansvarligid'),
+                                       'external_voucher_id' => 
$this->db->f('external_voucher_id')
                                );
                        }
 

Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl       2016-10-27 08:21:53 UTC (rev 
15903)
+++ trunk/property/templates/base/tts.xsl       2016-10-27 09:32:28 UTC (rev 
15904)
@@ -1180,6 +1180,25 @@
                                                                                
</div>
                                                                        </div>
 
+                                                                       <div 
class="pure-control-group">
+                                                                               
<label>
+                                                                               
        <xsl:value-of select="php:function('lang', 'attachments')"/>
+                                                                               
</label>
+                                                                               
<div class="pure-custom">
+                                                                               
        <xsl:for-each select="datatable_def">
+                                                                               
                <xsl:if test="container = 'datatable-container_8'">
+                                                                               
                        <xsl:call-template name="table_setup">
+                                                                               
                                <xsl:with-param name="container" select 
='container'/>
+                                                                               
                                <xsl:with-param name="requestUrl" select 
='requestUrl' />
+                                                                               
                                <xsl:with-param name="ColumnDefs" select 
='ColumnDefs' />
+                                                                               
                                <xsl:with-param name="tabletools" select 
='tabletools' />
+                                                                               
                                <xsl:with-param name="data" select ='data' />
+                                                                               
                                <xsl:with-param name="config" select ='config' 
/>
+                                                                               
                        </xsl:call-template>
+                                                                               
                </xsl:if>
+                                                                               
        </xsl:for-each>
+                                                                               
</div>
+                                                                       </div>
 
                                                                </xsl:when>
                                                        </xsl:choose>