[Fmsystem-commits] [11854] property: more on invoice handling

[Sigurd Nes]

Revision: 11854
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11854
Author:   sigurdne
Date:     2014-03-22 15:25:05 +0000 (Sat, 22 Mar 2014)
Log Message:
-----------
property: more on invoice handling

Modified Paths:
--------------
    trunk/property/inc/class.uiinvoice.inc.php
    trunk/property/templates/base/invoice.xsl

Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php  2014-03-21 14:34:29 UTC (rev 
11853)
+++ trunk/property/inc/class.uiinvoice.inc.php  2014-03-22 15:25:05 UTC (rev 
11854)
@@ -2244,7 +2244,7 @@
                                $datatable['rowactions']['action'][] = array
                                        (
                                                'my_name'               => 
'edit',
-                                               'text'                  => 
lang('edit'),
+                                               'text'                  => 
$paid ? lang('view') : lang('edit'),
                                                'action'                => 
$GLOBALS['phpgw']->link('/index.php',array
                                                (
                                                        'menuaction'            
=> 'property.uiinvoice.edit',

Modified: trunk/property/templates/base/invoice.xsl
===================================================================
--- trunk/property/templates/base/invoice.xsl   2014-03-21 14:34:29 UTC (rev 
11853)
+++ trunk/property/templates/base/invoice.xsl   2014-03-22 15:25:05 UTC (rev 
11854)
@@ -1532,18 +1532,34 @@
                                                                </input>
                                                        </td>
                                                </tr>
+                                               <tr height="50">
+                                                       <td>
+                                                               <xsl:variable 
name="lang_send">
+                                                                       
<xsl:value-of select="php:function('lang', 'save')"/>
+                                                               </xsl:variable>
+                                                               <input 
type="submit" name="values[save]" value="{$lang_send}" title="{$lang_send}">
+                                                               </input>
+                                                       </td>
+                                               </tr>
                                        </xsl:when>
+                                       <xsl:otherwise>
+                                               <tr>
+                                                       <td class="th_text" 
align="left" valign="top" style="white-space: nowrap;">
+                                                               <xsl:value-of 
select="php:function('lang', 'voucher process log')"/>
+                                                       </td>
+                                                       <td align="left">
+                                                               <textarea 
cols="60" rows="10" wrap="virtual">
+                                                                       
<xsl:attribute name="readonly">
+                                                                               
<xsl:text>readonly</xsl:text>
+                                                                       
</xsl:attribute>
+                                                                       
<xsl:value-of select="value_process_log"/>
+                                                               </textarea>
+                                                       </td>
+                                               </tr>
+
+                                       </xsl:otherwise>
                                </xsl:choose>
 
-                               <tr height="50">
-                                       <td>
-                                               <xsl:variable name="lang_send">
-                                                       <xsl:value-of 
select="php:function('lang', 'save')"/>
-                                               </xsl:variable>
-                                               <input type="submit" 
name="values[save]" value="{$lang_send}" title="{$lang_send}">
-                                               </input>
-                                       </td>
-                               </tr>
                        </table>
                </form>
        </xsl:template>