projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://lx-office/~/lx-office-erp
[kivitendo-erp.git]
/
templates
/
webpages
/
wh
/
journal_filter_en.html
diff --git
a/templates/webpages/wh/journal_filter_en.html
b/templates/webpages/wh/journal_filter_en.html
index
6db3731
..
3db64d0
100644
(file)
--- a/
templates/webpages/wh/journal_filter_en.html
+++ b/
templates/webpages/wh/journal_filter_en.html
@@
-104,6
+104,15
@@
<th align="right" nowrap>Charge Number:</th>
<td><input name="chargenumber" size=40></td>
</tr>
<th align="right" nowrap>Charge Number:</th>
<td><input name="chargenumber" size=40></td>
</tr>
+ [% IF conf_show_best_before %]
+ <tr>
+ <th align="right" nowrap>Best Before:</th>
+ <td>
+ <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
+ <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+ </td>
+ </tr>
+ [% END %]
<tr>
<th align="right" nowrap>Transfer Quantity:</th>
<td>
<tr>
<th align="right" nowrap>Transfer Quantity:</th>
<td>
@@
-159,6
+168,10
@@
<td nowrap><label for="l_partnumber">Part Number</label></td>
<td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
<td nowrap><label for="l_chargenumber">Charge Number</label></td>
<td nowrap><label for="l_partnumber">Part Number</label></td>
<td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
<td nowrap><label for="l_chargenumber">Charge Number</label></td>
+ [% IF conf_show_best_before %]
+ <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
+ <td nowrap><label for="l_bestbefore">Best Before</label></td>
+ [% END %]
</tr>
<tr>
<td align="right"><input name="l_trans_id" id="l_trans_id" class="checkbox" type="checkbox" value="Y"></td>
</tr>
<tr>
<td align="right"><input name="l_trans_id" id="l_trans_id" class="checkbox" type="checkbox" value="Y"></td>
@@
-199,6
+212,15
@@
<script type="text/javascript">
<!--
<script type="text/javascript">
<!--
+ [% IF conf_show_best_before %]
+ Calendar.setup( {
+ inputField : "bestbefore",
+ ifFormat :"[% myconfig_jsc_dateformat %]",
+ align : "BR",
+ button : "bestbefore_trigger"
+ });
+ [% END %]
+
Calendar.setup( {
inputField : "fromdate",
ifFormat :"[% myconfig_jsc_dateformat %]",
Calendar.setup( {
inputField : "fromdate",
ifFormat :"[% myconfig_jsc_dateformat %]",