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 'f-cvar-htmlfield'
[kivitendo-erp.git]
/
templates
/
webpages
/
do
/
stock_in_form.html
diff --git
a/templates/webpages/do/stock_in_form.html
b/templates/webpages/do/stock_in_form.html
index
135a898
..
f8fa9d8
100644
(file)
--- a/
templates/webpages/do/stock_in_form.html
+++ b/
templates/webpages/do/stock_in_form.html
@@
-1,6
+1,8
@@
[%- USE T8 %]
[%- USE L %]
[%- USE HTML %][%- USE LxERP %][%- USE JavaScript %]
[%- USE T8 %]
[%- USE L %]
[%- USE HTML %][%- USE LxERP %][%- USE JavaScript %]
+<h1>[% title %]</h1>
+
[%- UNLESS delivered %]
<script type="text/javascript">
<!--
[%- UNLESS delivered %]
<script type="text/javascript">
<!--
@@
-61,8
+63,6
@@
<form method="post" action="do.pl" name="Form">
<form method="post" action="do.pl" name="Form">
- <div class="listtop">[% title %]</div>
-
[%- IF ERRORS && ERRORS.size %]
<p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
[%- END %]
[%- IF ERRORS && ERRORS.size %]
<p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
[%- END %]
@@
-140,8
+140,13
@@
[% L.date_tag('bestbefore_'_ loop.count, row.bestbefore) %]
</td>
[% END %]
[% L.date_tag('bestbefore_'_ loop.count, row.bestbefore) %]
</td>
[% END %]
- <td><input name="qty_[% loop.count %]" size="12" value="[% HTML.escape(LxERP.format_amount(row.qty)) %]"></td>
-
+ <td><input name="qty_[% loop.count %]" size="12"
+ [%- IF (!row.qty) && (loop.count == 1) %]
+ value="[% HTML.escape(do_qty) %]"
+ [%- ELSE %]
+ value="[% HTML.escape(LxERP.format_amount(row.qty)) %]"
+ [% END %]
+ ></td>
<td>
<select name="unit_[% loop.count %]">
[%- FOREACH unit = UNITS %]
<td>
<select name="unit_[% loop.count %]">
[%- FOREACH unit = UNITS %]
@@
-149,7
+154,7
@@
[%- END %]
</select>
</td>
[%- END %]
</select>
</td>
-
+ <input type="hidden" name="delivery_order_items_stock_id_[% loop.count %]" value="[% HTML.escape(row.delivery_order_items_stock_id) %]">
[%- END %]
</tr>
[%- END %]
</tr>