[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/skins/default/invoice.xsl, 1.1.1.4
|
From: |
nomail |
|
Subject: |
[Phpgroupware-cvs] property/skins/default/invoice.xsl, 1.1.1.4 |
|
Date: |
Fri, 21 May 2004 20:55:50 -0000 |
Update of /property/skins/default
Modified Files:
Branch:
invoice.xsl
date: 2004/04/26 13:29:14; author: sigurdne; state: Exp; lines: +96 -70
Log Message:
no message
=====================================================================
Index: property/skins/default/invoice.xsl
diff -u property/skins/default/invoice.xsl:1.1.1.3
property/skins/default/invoice.xsl:1.1.1.4
--- property/skins/default/invoice.xsl:1.1.1.3 Fri Apr 23 21:26:43 2004
+++ property/skins/default/invoice.xsl Mon Apr 26 13:29:14 2004
@@ -212,56 +212,56 @@
<xsl:template match="table_header_list_voucher">
- <xsl:variable name="sort_voucher"><xsl:value-of
select="sort_voucher"/></xsl:variable>
- <xsl:variable name="sort_voucher_date"><xsl:value-of
select="sort_voucher_date"/></xsl:variable>
- <xsl:variable name="sort_vendor_id"><xsl:value-of
select="sort_vendor_id"/></xsl:variable>
+ <xsl:variable name="sort_voucher"><xsl:value-of
select="table_header_list_voucher_item/sort_voucher"/></xsl:variable>
+ <xsl:variable name="sort_voucher_date"><xsl:value-of
select="table_header_list_voucher_item/sort_voucher_date"/></xsl:variable>
+ <xsl:variable name="sort_vendor_id"><xsl:value-of
select="table_header_list_voucher_item/sort_vendor_id"/></xsl:variable>
<tr class="th">
<td class="th_text" width="5%" align="right">
- <a href="{$sort_voucher}"><xsl:value-of
select="lang_voucher"/></a>
+ <a href="{$sort_voucher}"><xsl:value-of
select="table_header_list_voucher_item/lang_voucher"/></a>
</td>
<td class="th_text" width="2%" align="right">
- <a
href="{$sort_voucher_date}"><xsl:value-of select="lang_voucher_date"/></a>
+ <a
href="{$sort_voucher_date}"><xsl:value-of
select="table_header_list_voucher_item/lang_voucher_date"/></a>
</td>
<td class="th_text" width="2%" align="right">
- <xsl:value-of select="lang_days"/>
+ <xsl:value-of
select="table_header_list_voucher_item/lang_days"/>
</td>
<td class="th_text" width="8%" align="right">
- <xsl:value-of select="lang_sum"/>
+ <xsl:value-of
select="table_header_list_voucher_item/lang_sum"/>
</td>
<td class="th_text" width="4%" align="right">
- <a
href="{$sort_vendor_id}"><xsl:value-of select="lang_vendor_id"/></a>
+ <a
href="{$sort_vendor_id}"><xsl:value-of
select="table_header_list_voucher_item/lang_vendor_id"/></a>
</td>
<td class="th_text" width="3%" align="right">
- <xsl:value-of
select="lang_num_sub_invoice"/>
+ <xsl:value-of
select="table_header_list_voucher_item/lang_num_sub_invoice"/>
</td>
<td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_type"/>
+ <xsl:value-of
select="table_header_list_voucher_item/lang_type"/>
</td>
<td class="th_text" width="3%" align="right">
- <xsl:value-of select="lang_period"/>
+ <xsl:value-of
select="table_header_list_voucher_item/lang_period"/>
</td>
<td class="th_text" width="3%" align="right">
- <xsl:value-of select="lang_kredit"/>
+ <xsl:value-of
select="table_header_list_voucher_item/lang_kredit"/>
</td>
<td class="th_text" width="3%" align="right">
- <xsl:value-of select="lang_none"/>
+ <xsl:value-of
select="table_header_list_voucher_item/lang_none"/>
</td>
<td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_janitor"/>
+ <xsl:value-of
select="table_header_list_voucher_item/lang_janitor"/>
</td>
<td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_supervisor"/>
+ <xsl:value-of
select="table_header_list_voucher_item/lang_supervisor"/>
</td>
<td class="th_text" width="5%" align="right">
- <xsl:value-of
select="lang_budget_responsible"/>
+ <xsl:value-of
select="table_header_list_voucher_item/lang_budget_responsible"/>
</td>
<td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_transfer"/>
+ <xsl:value-of
select="table_header_list_voucher_item/lang_transfer"/>
</td>
<xsl:choose>
<xsl:when test="//acl_delete!=''">
<td class="th_text" width="5%"
align="center">
- <xsl:value-of
select="lang_delete"/>
+ <xsl:value-of
select="table_header_list_voucher_item/lang_delete"/>
</td>
</xsl:when>
</xsl:choose>
@@ -269,7 +269,7 @@
</xsl:template>
<xsl:template match="values_list_voucher">
-
+ <xsl:for-each select="values_list_voucher_item" >
<xsl:variable name="counter"><xsl:value-of
select="counter"/></xsl:variable>
<xsl:variable name="current_user"><xsl:value-of
select="current_user"/></xsl:variable>
<tr>
@@ -514,6 +514,7 @@
</xsl:when>
</xsl:choose>
</tr>
+ </xsl:for-each>
</xsl:template>
@@ -676,48 +677,48 @@
<xsl:template match="table_header_list_voucher_paid">
- <xsl:variable name="sort_voucher"><xsl:value-of
select="sort_voucher"/></xsl:variable>
- <xsl:variable name="sort_voucher_date"><xsl:value-of
select="sort_voucher_date"/></xsl:variable>
- <xsl:variable name="sort_vendor_id"><xsl:value-of
select="sort_vendor_id"/></xsl:variable>
+ <xsl:variable name="sort_voucher"><xsl:value-of
select="table_header_list_voucher_paid_item/sort_voucher"/></xsl:variable>
+ <xsl:variable name="sort_voucher_date"><xsl:value-of
select="table_header_list_voucher_paid_item/sort_voucher_date"/></xsl:variable>
+ <xsl:variable name="sort_vendor_id"><xsl:value-of
select="table_header_list_voucher_paid_item/sort_vendor_id"/></xsl:variable>
<tr class="th">
<td class="th_text" width="5%" align="right">
- <a href="{$sort_voucher}"><xsl:value-of
select="lang_voucher"/></a>
+ <a href="{$sort_voucher}"><xsl:value-of
select="table_header_list_voucher_paid_item/lang_voucher"/></a>
</td>
<td class="th_text" width="2%" align="right">
- <a
href="{$sort_voucher_date}"><xsl:value-of select="lang_voucher_date"/></a>
+ <a
href="{$sort_voucher_date}"><xsl:value-of
select="table_header_list_voucher_paid_item/lang_voucher_date"/></a>
</td>
<td class="th_text" width="2%" align="right">
- <xsl:value-of select="lang_days"/>
+ <xsl:value-of
select="table_header_list_voucher_paid_item/lang_days"/>
</td>
<td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_sum"/>
+ <xsl:value-of
select="table_header_list_voucher_paid_item/lang_sum"/>
</td>
<td class="th_text" width="4%" align="right">
- <a
href="{$sort_vendor_id}"><xsl:value-of select="lang_vendor_id"/></a>
+ <a
href="{$sort_vendor_id}"><xsl:value-of
select="table_header_list_voucher_paid_item/lang_vendor_id"/></a>
</td>
<td class="th_text" width="5%" align="right">
- <xsl:value-of
select="lang_num_sub_invoice"/>
+ <xsl:value-of
select="table_header_list_voucher_paid_item/lang_num_sub_invoice"/>
</td>
<td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_type"/>
+ <xsl:value-of
select="table_header_list_voucher_paid_item/lang_type"/>
</td>
<td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_janitor"/>
+ <xsl:value-of
select="table_header_list_voucher_paid_item/lang_janitor"/>
</td>
<td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_supervisor"/>
+ <xsl:value-of
select="table_header_list_voucher_paid_item/lang_supervisor"/>
</td>
<td class="th_text" width="5%" align="right">
- <xsl:value-of
select="lang_budget_responsible"/>
+ <xsl:value-of
select="table_header_list_voucher_paid_item/lang_budget_responsible"/>
</td>
<td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_transfer"/>
+ <xsl:value-of
select="table_header_list_voucher_paid_item/lang_transfer"/>
</td>
</tr>
</xsl:template>
<xsl:template match="values_list_voucher_paid">
-
+ <xsl:for-each select="values_list_voucher_paid_item" >
<xsl:variable name="counter"><xsl:value-of
select="counter"/></xsl:variable>
<xsl:variable name="current_user"><xsl:value-of
select="current_user"/></xsl:variable>
<tr>
@@ -786,6 +787,7 @@
<xsl:value-of select="transfer_date"/>
- <xsl:value-of select="transfer_id"/>
</td>
</tr>
+ </xsl:for-each>
</xsl:template>
@@ -1000,6 +1002,7 @@
</xsl:template>
<xsl:template match="account_class_list">
+ <xsl:for-each select="account_class_list_item" >
<xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
<xsl:choose>
<xsl:when test="selected">
@@ -1009,26 +1012,28 @@
<option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="id"/></option>
</xsl:otherwise>
</xsl:choose>
+ </xsl:for-each>
</xsl:template>
<xsl:template match="table_header_consume">
<tr class="th">
<td class="th_text" width="10%" align="right">
- <xsl:value-of select="lang_district"/>
+ <xsl:value-of
select="table_header_consume_item/lang_district"/>
</td>
<td class="th_text" width="10%" align="right">
- <xsl:value-of select="lang_period"/>
+ <xsl:value-of
select="table_header_consume_item/lang_period"/>
</td>
<td class="th_text" width="25%" align="right">
- <xsl:value-of
select="lang_budget_account"/>
+ <xsl:value-of
select="table_header_consume_item/lang_budget_account"/>
</td>
<td class="th_text" width="55%" align="right">
- <xsl:value-of select="lang_consume"/>
+ <xsl:value-of
select="table_header_consume_item/lang_consume"/>
</td>
</tr>
</xsl:template>
<xsl:template match="values_consume">
+ <xsl:for-each select="values_consume_item" >
<tr>
<xsl:attribute name="class">
<xsl:choose>
@@ -1057,6 +1062,7 @@
<xsl:value-of select="consume"/>
</td>
</tr>
+ </xsl:for-each>
</xsl:template>
<!-- debug-->
@@ -1178,26 +1184,26 @@
<xsl:template match="table_add">
<tr>
<td height="50">
- <xsl:variable
name="add_action"><xsl:value-of select="add_action"/></xsl:variable>
- <xsl:variable
name="lang_add"><xsl:value-of select="lang_add"/></xsl:variable>
+ <xsl:variable
name="add_action"><xsl:value-of
select="table_add_item/add_action"/></xsl:variable>
+ <xsl:variable
name="lang_add"><xsl:value-of select="table_add_item/lang_add"/></xsl:variable>
<form method="post"
action="{$add_action}">
<input type="submit" name="add"
value="{$lang_add}" onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_add_statustext"/>
+
<xsl:value-of select="table_add_item/lang_add_statustext"/>
<xsl:text>';
return true;</xsl:text>
</xsl:attribute>
</input>
</form>
</td>
<td height="50">
- <xsl:variable
name="cancel_action"><xsl:value-of select="cancel_action"/></xsl:variable>
- <xsl:variable
name="lang_cancel"><xsl:value-of select="lang_cancel"/></xsl:variable>
+ <xsl:variable
name="cancel_action"><xsl:value-of
select="table_add_item/cancel_action"/></xsl:variable>
+ <xsl:variable
name="lang_cancel"><xsl:value-of
select="table_add_item/lang_cancel"/></xsl:variable>
<form method="post"
action="{$cancel_action}">
<input type="submit"
name="cancel" value="{$lang_cancel}" onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_cancel_statustext"/>
+
<xsl:value-of select="table_add_item/lang_cancel_statustext"/>
<xsl:text>';
return true;</xsl:text>
</xsl:attribute>
</input>
@@ -1530,9 +1536,10 @@
</div>
</xsl:template>
-<!-- art_list -->
+<!-- art_list -->
<xsl:template match="art_list">
+ <xsl:for-each select="art_list_item" >
<xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
<xsl:choose>
<xsl:when test="selected">
@@ -1542,11 +1549,13 @@
<option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="num"/></option>
</xsl:otherwise>
</xsl:choose>
+ </xsl:for-each>
</xsl:template>
-<!-- type_list -->
+<!-- type_list -->
<xsl:template match="type_list">
+ <xsl:for-each select="type_list_item" >
<xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
<xsl:choose>
<xsl:when test="selected">
@@ -1556,11 +1565,13 @@
<option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="num"/></option>
</xsl:otherwise>
</xsl:choose>
+ </xsl:for-each>
</xsl:template>
-<!-- dimb_list -->
+<!-- dimb_list -->
<xsl:template match="dimb_list">
+ <xsl:for-each select="dimb_list_item" >
<xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
<xsl:choose>
<xsl:when test="selected">
@@ -1570,12 +1581,14 @@
<option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="num"/></option>
</xsl:otherwise>
</xsl:choose>
+ </xsl:for-each>
</xsl:template>
-<!-- janitor_list -->
+<!-- janitor_list
<xsl:template match="janitor_list">
+ <xsl:for-each select="janitor_list_item" >
<xsl:variable name="lid"><xsl:value-of select="lid"/></xsl:variable>
<xsl:choose>
<xsl:when test="selected">
@@ -1585,11 +1598,13 @@
<option value="{$lid}"><xsl:value-of
disable-output-escaping="yes" select="firstname"/> <xsl:value-of
select="lastname"/></option>
</xsl:otherwise>
</xsl:choose>
- </xsl:template>
+ </xsl:for-each>
+ </xsl:template>-->
-<!-- supervisor_list -->
+<!-- supervisor_list
<xsl:template match="supervisor_list">
+ <xsl:for-each select="supervisor_list_item" >
<xsl:variable name="lid"><xsl:value-of select="lid"/></xsl:variable>
<xsl:choose>
<xsl:when test="selected">
@@ -1599,11 +1614,13 @@
<option value="{$lid}"><xsl:value-of
disable-output-escaping="yes" select="firstname"/> <xsl:value-of
select="lastname"/></option>
</xsl:otherwise>
</xsl:choose>
- </xsl:template>
+ </xsl:for-each>
+ </xsl:template>-->
-<!-- budget_responsible_list -->
+<!-- budget_responsible_list
<xsl:template match="budget_responsible_list">
+ <xsl:for-each select="budget_responsible_list_item" >
<xsl:variable name="lid"><xsl:value-of select="lid"/></xsl:variable>
<xsl:choose>
<xsl:when test="selected">
@@ -1613,12 +1630,14 @@
<option value="{$lid}"><xsl:value-of
disable-output-escaping="yes" select="firstname"/> <xsl:value-of
select="lastname"/></option>
</xsl:otherwise>
</xsl:choose>
- </xsl:template>
+ </xsl:for-each>
+ </xsl:template>-->
-<!-- conv_list -->
+<!-- conv_list -->
<xsl:template match="conv_list">
+ <xsl:for-each select="conv_list_item" >
<xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
<xsl:choose>
<xsl:when test="selected">
@@ -1628,11 +1647,13 @@
<option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
</xsl:otherwise>
</xsl:choose>
+ </xsl:for-each>
</xsl:template>
<!-- rollback_file_list -->
<xsl:template match="rollback_file_list">
+ <xsl:for-each select="rollback_file_list_item" >
<xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
<xsl:choose>
<xsl:when test="selected">
@@ -1642,11 +1663,13 @@
<option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
</xsl:otherwise>
</xsl:choose>
+ </xsl:for-each>
</xsl:template>
<!-- tax_code_list -->
<xsl:template match="tax_code_list">
+ <xsl:for-each select="tax_code_list_item" >
<xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
<xsl:choose>
<xsl:when test="selected">
@@ -1656,6 +1679,7 @@
<option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="id"/></option>
</xsl:otherwise>
</xsl:choose>
+ </xsl:for-each>
</xsl:template>
<!-- export -->
@@ -1956,48 +1980,49 @@
</xsl:template>
<xsl:template match="table_header_list_invoice_sub">
- <xsl:variable name="sort_workorder"><xsl:value-of
select="sort_workorder"/></xsl:variable>
- <xsl:variable name="sort_budget_account"><xsl:value-of
select="sort_budget_account"/></xsl:variable>
- <xsl:variable name="sort_sum"><xsl:value-of
select="sort_sum"/></xsl:variable>
- <xsl:variable name="sort_dima"><xsl:value-of
select="sort_dima"/></xsl:variable>
+ <xsl:variable name="sort_workorder"><xsl:value-of
select="table_header_list_invoice_sub_item/sort_workorder"/></xsl:variable>
+ <xsl:variable name="sort_budget_account"><xsl:value-of
select="table_header_list_invoice_sub_item/sort_budget_account"/></xsl:variable>
+ <xsl:variable name="sort_sum"><xsl:value-of
select="table_header_list_invoice_sub_item/sort_sum"/></xsl:variable>
+ <xsl:variable name="sort_dima"><xsl:value-of
select="table_header_list_invoice_sub_item/sort_dima"/></xsl:variable>
<tr class="th">
<td class="th_text" width="5%" align="right">
- <a
href="{$sort_workorder}"><xsl:value-of select="lang_workorder"/></a>
+ <a
href="{$sort_workorder}"><xsl:value-of
select="table_header_list_invoice_sub_item/lang_workorder"/></a>
</td>
<td class="th_text" width="2%" align="right">
- <xsl:value-of
select="lang_close_order"/>
+ <xsl:value-of
select="table_header_list_invoice_sub_item/lang_close_order"/>
</td>
<td class="th_text" width="2%" align="right">
- <xsl:value-of
select="lang_charge_tenant"/>
+ <xsl:value-of
select="table_header_list_invoice_sub_item/lang_charge_tenant"/>
</td>
<td class="th_text" width="2%" align="right">
- <xsl:value-of select="lang_invoice_id"/>
+ <xsl:value-of
select="table_header_list_invoice_sub_item/lang_invoice_id"/>
</td>
<td class="th_text" width="2%" align="right">
- <a
href="{$sort_budget_account}"><xsl:value-of select="lang_budget_account"/></a>
+ <a
href="{$sort_budget_account}"><xsl:value-of
select="table_header_list_invoice_sub_item/lang_budget_account"/></a>
</td>
<td class="th_text" width="5%" align="right">
- <a href="{$sort_sum}"><xsl:value-of
select="lang_sum"/></a>
+ <a href="{$sort_sum}"><xsl:value-of
select="table_header_list_invoice_sub_item/lang_sum"/></a>
</td>
<td class="th_text" width="5%" align="right">
- <a href="{$sort_dima}"><xsl:value-of
select="lang_dima"/></a>
+ <a href="{$sort_dima}"><xsl:value-of
select="table_header_list_invoice_sub_item/lang_dima"/></a>
</td>
<td class="th_text" width="2%" align="right">
- <xsl:value-of select="lang_dimb"/>
+ <xsl:value-of
select="table_header_list_invoice_sub_item/lang_dimb"/>
</td>
<td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_dimd"/>
+ <xsl:value-of
select="table_header_list_invoice_sub_item/lang_dimd"/>
</td>
<td class="th_text" width="2%" align="right">
- <xsl:value-of select="lang_tax_code"/>
+ <xsl:value-of
select="table_header_list_invoice_sub_item/lang_tax_code"/>
</td>
<td class="th_text" width="2%" align="right">
- <xsl:value-of select="lang_remark"/>
+ <xsl:value-of
select="table_header_list_invoice_sub_item/lang_remark"/>
</td>
</tr>
</xsl:template>
<xsl:template match="values_list_invoice_sub">
+ <xsl:for-each select="values_list_invoice_sub_item" >
<xsl:variable name="counter"><xsl:value-of
select="counter"/></xsl:variable>
<xsl:variable name="current_user"><xsl:value-of
select="current_user"/></xsl:variable>
@@ -2134,6 +2159,7 @@
</td>
</tr>
+ </xsl:for-each>
</xsl:template>
</xsl:stylesheet>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/skins/default/invoice.xsl, 1.1.1.4,
nomail <=