X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Forder%2Fform.html;h=17534de23cec5f1cf2afb4853a5fc14a6ece51f7;hb=3591b710cbe757a131ff768ed7d6066d8412bc0e;hp=46258ae41f18339f2fa6d55598fb2243a412d854;hpb=1ce68041a1923c60a6608a2ed6365f5915bacd9a;p=kivitendo-erp.git

diff --git a/templates/webpages/order/form.html b/templates/webpages/order/form.html
index 46258ae41..17534de23 100644
--- a/templates/webpages/order/form.html
+++ b/templates/webpages/order/form.html
@@ -2,7 +2,7 @@
 [%- USE LxERP %]
 [%- USE L %]
 [%- USE HTML %]
-<h1>[% FORM.title %]</h1>
+<h1>[% FORM.title %] <span id='nr_in_title'>[%- SELF.order.number -%]</span></h1>
 
 <div id="print_options" style="display:none">
   <form method="post" action="controller.pl" id="print_options_form">
@@ -13,10 +13,15 @@
   </form>
 </div>
 
-<form method="post" action="controller.pl" id="order_form">
-  [% L.hidden_tag('callback', FORM.callback) %]
-  [% L.hidden_tag('type',     FORM.type) %]
-  [% L.hidden_tag('id',       SELF.order.id) %]
+<div id="shipto_dialog" class="hidden"></div>
+
+<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('converted_from_oe_id', SELF.converted_from_oe_id) %]
 
   [%- INCLUDE 'common/flash.html' %]
 
@@ -40,18 +45,15 @@
     <div id="ui-tabs-1">
       [%- LxERP.t8("Loading...") %]
     </div>
-  </div>
-
-  <br>
 
-  [% L.hidden_tag('action', 'Order/dispatch') %]
+    <div id="shipto_inputs" class="hidden">
+      [%- PROCESS 'common/_ship_to_dialog.html'
+        vc_obj=SELF.order.customervendor
+        cs_obj=SELF.order.custom_shipto
+        cvars=SELF.order.custom_shipto.cvars_by_config
+        id_selector='#order_shipto_id' %]
+    </div>
 
-  [% L.button_tag('kivi.Order.save(' _ INSTANCE_CONF.get_order_warn_duplicate_parts _ ')', LxERP.t8('Save')) %]
-  [% L.button_tag('kivi.Order.show_print_options()', LxERP.t8('Print')) %]
-  [% L.button_tag('kivi.Order.email()', LxERP.t8('E-mail')) %]
-  [% L.button_tag('kivi.Order.save_and_delivery_order(' _ INSTANCE_CONF.get_order_warn_duplicate_parts _ ')', LxERP.t8('Save and Delivery Order')) %]
-[%- IF SELF.order.id && ( (SELF.cv == 'customer' && INSTANCE_CONF.get_sales_order_show_delete) || (SELF.cv == 'vendor' && INSTANCE_CONF.get_purchase_order_show_delete) ) %]
-  [% L.button_tag('kivi.Order.delete_order()', LxERP.t8('Delete'), confirm=LxERP.t8("Are you sure?")) %]
-[%- END %]
+  </div>
 
 </form>