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' into mebil
[kivitendo-erp.git]
/
templates
/
webpages
/
order
/
form.html
diff --git
a/templates/webpages/order/form.html
b/templates/webpages/order/form.html
index
c3ff986
..
82bc2f1
100644
(file)
--- a/
templates/webpages/order/form.html
+++ b/
templates/webpages/order/form.html
@@
-15,7
+15,9
@@
<div id="shipto_dialog" class="hidden"></div>
<div id="shipto_dialog" class="hidden"></div>
-<form method="post" action="controller.pl" id="order_form">
+<form method="post" action="controller.pl" id="order_form"
+ data-transport-cost-reminder-article-id="[% HTML.escape(transport_cost_reminder_article.id) %]"
+ data-transport-cost-reminder-article-description="[% HTML.escape(transport_cost_reminder_article.displayable_name) %]">
[% L.hidden_tag('callback', FORM.callback) %]
[% L.hidden_tag('type', FORM.type) %]
[% L.hidden_tag('id', SELF.order.id) %]
[% L.hidden_tag('callback', FORM.callback) %]
[% L.hidden_tag('type', FORM.type) %]
[% L.hidden_tag('id', SELF.order.id) %]
@@
-36,6
+38,9
@@
[%- IF SELF.order.id %]
<li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=Order&object_id=[% HTML.url(SELF.order.id) %]">[% 'Linked Records' | $T8 %]</a></li>
[%- END %]
[%- IF SELF.order.id %]
<li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=Order&object_id=[% HTML.url(SELF.order.id) %]">[% 'Linked Records' | $T8 %]</a></li>
[%- END %]
+[% IF SELF.order.id %]
+ <li><a href="#ui-tabs-phone-notes">[% 'Phone Notes' | $T8 %]<span id="num_phone_notes">[%- num_phone_notes ? ' (' _ num_phone_notes _ ')' : '' -%]</span></a></li>
+[% END %]
</ul>
[% PROCESS "order/tabs/basic_data.html" %]
</ul>
[% PROCESS "order/tabs/basic_data.html" %]
@@
-43,7
+48,11
@@
<div id="ui-tabs-1">
[%- LxERP.t8("Loading...") %]
</div>
<div id="ui-tabs-1">
[%- LxERP.t8("Loading...") %]
</div>
-
+[% IF SELF.order.id %]
+ <div id="ui-tabs-phone-notes">
+ [% PROCESS "order/tabs/phone_notes.html" %]
+ </div>
+[% END %]
<div id="shipto_inputs" class="hidden">
[%- PROCESS 'common/_ship_to_dialog.html'
vc_obj=SELF.order.customervendor
<div id="shipto_inputs" class="hidden">
[%- PROCESS 'common/_ship_to_dialog.html'
vc_obj=SELF.order.customervendor