|
| From: | sigurdne |
| Subject: | [Fmsystem-commits] [15119] Syncromind: Merge 14936:15027 from trunk |
| Date: | Fri, 13 May 2016 12:24:20 +0000 (UTC) |
Revision: 15119
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15119
Author: sigurdne
Date: 2016-05-13 12:24:20 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk
Modified Paths:
--------------
branches/dev-syncromind-2/property/templates/base/workorder.xsl
Modified: branches/dev-syncromind-2/property/templates/base/workorder.xsl
===================================================================
--- branches/dev-syncromind-2/property/templates/base/workorder.xsl
2016-05-13 12:24:17 UTC (rev 15118)
+++ branches/dev-syncromind-2/property/templates/base/workorder.xsl
2016-05-13 12:24:20 UTC (rev 15119)
@@ -346,7 +346,7 @@
<xsl:attribute
name="title">
<xsl:value-of
select="lang_descr_statustext"/>
</xsl:attribute>
- <xsl:value-of
select="value_descr"/>
+ <xsl:value-of
disable-output-escaping="yes" select="value_descr"/>
</textarea>
</div>
<div class="pure-control-group">
@@ -575,17 +575,17 @@
<input type="text"
id="service_name" name="values[service_name]" value="{value_service_name}">
<xsl:choose>
<xsl:when
test="mode='edit'">
-
<xsl:attribute name="data-validation">
+
<!--xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="$lang_service"/>
+
</xsl:attribute-->
</xsl:when>
- <xsl:otherwise
test="mode='edit'">
+ <xsl:otherwise>
<xsl:attribute name="disabled">
<xsl:text>disabled</xsl:text>
</xsl:attribute>
-
<xsl:attribute name="data-validation-error-msg">
-
<xsl:value-of select="$lang_service"/>
-
</xsl:attribute>
</xsl:otherwise>
</xsl:choose>
</input>
@@ -607,6 +607,9 @@
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="$lang_dimb"/>
+
</xsl:attribute>
<xsl:choose>
<xsl:when test="project_ecodimb !=''">
<xsl:attribute name="disabled">
@@ -619,9 +622,6 @@
<xsl:attribute name="disabled">
<xsl:text>disabled</xsl:text>
</xsl:attribute>
-
<xsl:attribute name="data-validation-error-msg">
-
<xsl:value-of select="$lang_dimb"/>
-
</xsl:attribute>
</xsl:otherwise>
</xsl:choose>
</input>
@@ -641,14 +641,14 @@
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="$lang_budget_account"/>
+
</xsl:attribute>
</xsl:when>
- <xsl:otherwise
test="mode='edit'">
+ <xsl:otherwise>
<xsl:attribute name="disabled">
<xsl:text>disabled</xsl:text>
</xsl:attribute>
-
<xsl:attribute name="data-validation-error-msg">
-
<xsl:value-of select="$lang_budget_account"/>
-
</xsl:attribute>
</xsl:otherwise>
</xsl:choose>
</input>
@@ -666,23 +666,93 @@
<input type="text"
id="unspsc_code_name" name="values[unspsc_code_name]"
value="{value_unspsc_code} {value_unspsc_code_name}">
<xsl:choose>
<xsl:when
test="mode='edit'">
-
<xsl:attribute name="data-validation">
+
<!--xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="$lang_unspsc_code"/>
+
</xsl:attribute-->
</xsl:when>
- <xsl:otherwise
test="mode='edit'">
+ <xsl:otherwise>
<xsl:attribute name="disabled">
<xsl:text>disabled</xsl:text>
</xsl:attribute>
-
<xsl:attribute name="data-validation-error-msg">
-
<xsl:value-of select="$lang_unspsc_code"/>
-
</xsl:attribute>
-
</xsl:otherwise>
</xsl:choose>
</input>
<div
id="unspsc_code_container"/>
</div>
+ <xsl:choose>
+ <xsl:when
test="collect_building_part=1">
+ <div
class="pure-control-group">
+ <xsl:variable
name="lang_building_part">
+
<xsl:value-of select="php:function('lang', 'building part')"/>
+ </xsl:variable>
+ <label>
+
<xsl:value-of select="$lang_building_part"/>
+ </label>
+ <select
name="values[building_part]">
+
<xsl:attribute name="title">
+
<xsl:value-of select="$lang_building_part"/>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="$lang_building_part"/>
+
</xsl:attribute>
+ <option
value="">
+
<xsl:value-of select="$lang_building_part"/>
+
</option>
+
<xsl:apply-templates select="building_part_list/options"/>
+ </select>
+ </div>
+ <div
class="pure-control-group">
+ <xsl:variable
name="lang_order_dim1">
+
<xsl:value-of select="php:function('lang', 'order_dim1')"/>
+ </xsl:variable>
+ <label>
+
<xsl:value-of select="$lang_order_dim1"/>
+ </label>
+ <select
name="values[order_dim1]">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'order_dim1')"/>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="$lang_order_dim1"/>
+
</xsl:attribute>
+ <option
value="">
+
<xsl:value-of select="php:function('lang', 'order_dim1')"/>
+
</option>
+
<xsl:apply-templates select="order_dim1_list/options"/>
+ </select>
+ </div>
+ <div
class="pure-control-group">
+ <xsl:variable
name="lang_tax_code">
+
<xsl:value-of select="php:function('lang', 'tax code')"/>
+ </xsl:variable>
+ <label>
+
<xsl:value-of select="$lang_tax_code"/>
+ </label>
+ <select
name="values[tax_code]">
+
<xsl:attribute name="title">
+
<xsl:value-of select="$lang_tax_code"/>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="$lang_tax_code"/>
+
</xsl:attribute>
+
<xsl:apply-templates select="tax_code_list/options"/>
+ </select>
+ </div>
+ </xsl:when>
+ </xsl:choose>
+
<div class="pure-control-group">
<label for="name">
<xsl:value-of
select="lang_cat_sub"/>
@@ -901,6 +971,34 @@
</xsl:attribute>
</input>
</div>
+ <xsl:choose>
+ <xsl:when test="mode='edit'">
+ <div
class="pure-control-group">
+ <label
for="name">
+
<xsl:value-of select="php:function('lang', 'order received')"/>
+ </label>
+ <xsl:variable
name="lang_receive_order">
+
<xsl:value-of select="php:function('lang', 'receive order')"/>
+ </xsl:variable>
+ <input
type="button" class="pure-button pure-button-primary" name="edit"
value="{$lang_receive_order}" onClick="receive_order({value_workorder_id});">
+
<xsl:attribute name="title">
+
<xsl:value-of select="$lang_receive_order"/>
+
</xsl:attribute>
+ <xsl:if
test="value_order_sent != 1">
+
<xsl:attribute name="disabled">
+
<xsl:text>disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
+ </input>
+ <div
id="order_received_time" class="pure-custom">
+
<xsl:value-of select="value_order_received"/>
+ <div
id="slider-range-min"></div>
+ </div>
+ <input
class="pure-custom" type="text" id="order_received_percent" readonly="readonly"
size="6"/>
+ <input
type="hidden" id="value_order_received_percent"
value="{value_order_received_percent}"/>
+ </div>
+ </xsl:when>
+ </xsl:choose>
<div class="pure-control-group">
<label for="name">
<xsl:choose>
@@ -908,7 +1006,7 @@
<xsl:variable name="lang_add_invoice_statustext">
<xsl:value-of select="php:function('lang', 'add invoice')"/>
</xsl:variable>
- <a
href="javascript:showlightbox_manual_invoide({value_workorder_id})"
title="{$lang_add_invoice_statustext}">
+ <a
href="javascript:showlightbox_manual_invoice({value_workorder_id})"
title="{$lang_add_invoice_statustext}">
<xsl:value-of select="php:function('lang', 'add invoice')"/>
</a>
</xsl:when>
| [Prev in Thread] | Current Thread | [Next in Thread] |