[Fmsystem-commits] [9152] property: alternative invoicehandling

[Sigurd Nes]

Revision: 9152
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9152
Author:   sigurdne
Date:     2012-04-15 20:22:54 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
property: alternative invoicehandling

Modified Paths:
--------------
    trunk/property/inc/class.uiinvoice2.inc.php
    trunk/property/js/portico/ajax_invoice.js
    trunk/property/templates/base/invoice2.xsl

Modified: trunk/property/inc/class.uiinvoice2.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice2.inc.php 2012-04-15 15:39:57 UTC (rev 
9151)
+++ trunk/property/inc/class.uiinvoice2.inc.php 2012-04-15 20:22:54 UTC (rev 
9152)
@@ -403,7 +403,7 @@
 
                                if($voucher[0]['external_ref'])
                                {
-                                       $voucher[0]['external_ref'] = " <a 
href=\"javascript:openwindow('{$baseurl_invoice}{$voucher[0]['external_ref']}','640','800')\"
 >" . lang('invoice id') . '</a>';
+                                       $voucher[0]['external_ref'] = " <a 
href=\"javascript:openwindow('{$baseurl_invoice}{$voucher[0]['external_ref']}','640','800')\"
 >" . lang('invoice number') . '</a>';
                                }
 
                                $voucher_info['generic']['process_log'] = 
$voucher[0]['process_log'];

Modified: trunk/property/js/portico/ajax_invoice.js
===================================================================
--- trunk/property/js/portico/ajax_invoice.js   2012-04-15 15:39:57 UTC (rev 
9151)
+++ trunk/property/js/portico/ajax_invoice.js   2012-04-15 20:22:54 UTC (rev 
9152)
@@ -347,10 +347,9 @@
                                                var htmlString = "";
 
                                                var obj = 
data['generic']['process_code_list']['options'];
-
                                                $.each(obj, function(i) {
                                                        var selected = '';
-                                                       if(obj[i].id == 
voucher[0].periodization)
+                                                       if(obj[i].id == 
voucher[0].process_code)
                                                        {
                                                                selected = ' 
selected';
                                                        }

Modified: trunk/property/templates/base/invoice2.xsl
===================================================================
--- trunk/property/templates/base/invoice2.xsl  2012-04-15 15:39:57 UTC (rev 
9151)
+++ trunk/property/templates/base/invoice2.xsl  2012-04-15 20:22:54 UTC (rev 
9152)
@@ -177,7 +177,14 @@
                <tr>
                        <td>
                                <div id="invoice_id_text">
-                                       <xsl:value-of 
select="php:function('lang', 'invoice number')" />
+                                       <xsl:choose>
+                                               <xsl:when 
test="voucher_info/voucher/external_ref  != ''">
+                                                       <xsl:value-of 
disable-output-escaping="yes" select="voucher_info/voucher/external_ref"/>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <xsl:value-of 
select="php:function('lang', 'invoice number')" />
+                                               </xsl:otherwise>
+                                       </xsl:choose>
                                </div>
                        </td>
                        <td>
@@ -401,7 +408,7 @@
                                <xsl:value-of select="php:function('lang', 
'voucher process code')" />
                        </td>
                        <td>
-                               <select id="process_code" name="process_code">
+                               <select id="process_code" 
name="values[process_code]">
                                        <xsl:apply-templates 
select="voucher_info/generic/process_code_list/options"/>
                                </select>
                        </td>
@@ -469,12 +476,11 @@
 
 <xsl:template match="datatable" xmlns:php="http://php.net/xsl";>
        <div id="data_paginator"/>
-       <div class="error_msg" style="margin-left:20px;">Du må velge bruker for 
godkjenning</div>
        <div id="datatable-container"/>
        
        <xsl:call-template name="datasource-definition" />
        <xsl:variable name="label_submit"><xsl:value-of 
select="php:function('lang', 'save')" /></xsl:variable>
-       <div class="voucher_submit"><input type="submit" 
name="values[save_voucher]" id="save_voucher" value="{$label_submit}" 
onclick="return onSave()"/></div>
+       <div class="voucher_submit"><input type="submit" 
name="values[save_voucher]" id="save_voucher" value="{$label_submit}"/></div>
 </xsl:template>