projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfix: CVar Accessor war falsch gesetzt
[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
c9078ef
..
7c72a45
100644
(file)
--- a/
templates/webpages/oe/form_footer.html
+++ b/
templates/webpages/oe/form_footer.html
@@
-27,7
+27,11
@@
label_key = 'description',
show_empty = 1 -%]
</td>
label_key = 'description',
show_empty = 1 -%]
</td>
- </tr>
+ </tr>
+ <tr>
+ <th align="right">[% 'Delivery Terms' | $T8 %]</th>
+ <td>[% L.select_tag('delivery_term_id', ALL_DELIVERY_TERMS, default = delivery_term_id, with_empty = 1, title_key = 'description', style = 'width: 250px') %]</td>
+ </tr>
[%- IF is_sales_ord %]
<tr>
[%- IF is_sales_ord %]
<tr>
@@
-47,6
+51,18
@@
[%- END %]
</table>
</td>
[%- END %]
</table>
</td>
+ [%- IF show_weight %]
+ <td>
+ <table>
+ <tr>
+ <th align="left">[% 'Total weight' | $T8 %]</th>
+ <td align="right">
+ [% LxERP.format_amount(totalweight, 3) %] [% HTML.escape(weightunit) %]
+ </td>
+ </tr>
+ </table>
+ </td>
+ [%- END %]
[%- IF is_sales %]
<td>
<table>
[%- IF is_sales %]
<td>
<table>
@@
-125,7
+141,7
@@
<input class="submit" type="submit" name="action_save_as_new" value="[% 'Save as new' | $T8 %]">
[%- UNLESS (is_sales_ord && !INSTANCE_CONF.get_sales_order_show_delete) || (is_pur_ord && !INSTANCE_CONF.get_purchase_order_show_delete) %]
<input class="submit" type="submit" name="action_save_as_new" value="[% 'Save as new' | $T8 %]">
[%- UNLESS (is_sales_ord && !INSTANCE_CONF.get_sales_order_show_delete) || (is_pur_ord && !INSTANCE_CONF.get_purchase_order_show_delete) %]
- <input class="submit" type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
+ [% L.submit_tag('action_delete', LxERP.t8('Delete'), confirm=LxERP.t8('Are you sure?')) %]
[%- END %]
[%- IF is_sales_quo %]
[%- END %]
[%- IF is_sales_quo %]
@@
-136,7
+152,7
@@
<input class="submit" type="submit" name="action_purchase_order" value="[% 'Purchase Order' | $T8 %]">
[%- END %]
<input class="submit" type="submit" name="action_purchase_order" value="[% 'Purchase Order' | $T8 %]">
[%- END %]
- [%- IF is_sales_ord || is_pur_ord
&& !delivered
%]
+ [%- IF is_sales_ord || is_pur_ord %]
<input class="submit" type="submit" name="action_delivery_order" value="[% 'Delivery Order' | $T8 %]">
[%- END %]
<input class="submit" type="submit" name="action_delivery_order" value="[% 'Delivery Order' | $T8 %]">
[%- END %]