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 'b-3.6.1' of ../kivitendo-erp_20220811
[kivitendo-erp.git]
/
templates
/
webpages
/
oe
/
form_footer.html
diff --git
a/templates/webpages/oe/form_footer.html
b/templates/webpages/oe/form_footer.html
index
4e0d6e3
..
14f2954
100644
(file)
--- a/
templates/webpages/oe/form_footer.html
+++ b/
templates/webpages/oe/form_footer.html
@@
-22,8
+22,8
@@
<th align="left">[% 'Internal Notes' | $T8 %]</th>
</tr>
<tr valign="top">
<th align="left">[% 'Internal Notes' | $T8 %]</th>
</tr>
<tr valign="top">
- <td>[%
notes
%]</td>
- <td>[%
intnotes
%]</td>
+ <td>[%
L.textarea_tag('notes', notes, style="width: 350px; height: 150px", class="texteditor")
%]</td>
+ <td>[%
L.textarea_tag('intnotes', intnotes, style="width: 350px; height: 150px")
%]</td>
</tr>
<tr>
<th align="right">[% 'Payment Terms' | $T8 %]</th>
</tr>
<tr>
<th align="right">[% 'Payment Terms' | $T8 %]</th>
@@
-129,11
+129,6
@@
</div>
</div>
</div>
</div>
-<hr size="3" noshade>
-
-<p>[% print_options %]</p>
-
-<input type="hidden" name="action" value="dispatcher">
<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
[% L.hidden_tag("rowcount", rowcount) %]
<input type="hidden" name="callback" value="[% callback | html %]">
<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
[% L.hidden_tag("rowcount", rowcount) %]
<input type="hidden" name="callback" value="[% callback | html %]">
@@
-143,4
+138,18
@@
<input type="hidden" name="vendor_discount" value="[% HTML.escape(vendor_discount) %]">
[% END %]
<input type="hidden" name="vendor_discount" value="[% HTML.escape(vendor_discount) %]">
[% END %]
+<div id="shipto_inputs" class="hidden">
+ [%- PROCESS 'common/_ship_to_dialog.html' cvars=shipto_cvars %]
+</div>
+
+<div id="email_inputs" class="hidden"></div>
+
+<div id="print_options" class="hidden">
+ [% print_options %]
+</div>
</form>
</form>
+
+<div id="shipto_dialog" class="hidden"></div>
+<div id="print_dialog" class="hidden">
+ [%- PROCESS 'common/_print_dialog.html' %]
+</div>