X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Forder%2Fform.html;h=3d4bddff3f9920f78a01892df497de903dedf9ea;hb=11e509315cee0449974caa6d681fa26e730bbeca;hp=63c1d1df35c1b0be51714c7f22b7c0138f6bece2;hpb=aa36021ace7b4075af6d2d815e0e208b7227d9c4;p=kivitendo-erp.git

diff --git a/templates/webpages/order/form.html b/templates/webpages/order/form.html
index 63c1d1df3..3d4bddff3 100644
--- a/templates/webpages/order/form.html
+++ b/templates/webpages/order/form.html
@@ -1,10 +1,19 @@
 [%- USE T8 %]
 [%- USE LxERP %]
 [%- USE L %]
+[%- USE HTML %]
+<h1>[% FORM.title %]</h1>
+
+<div id="print_options" style="display:none">
+  <form method="post" action="controller.pl" id="print_options_form">
+    [% SELF.print_options %]
+    <br>
+    [% L.button_tag('kivi.Order.print()', LxERP.t8('Print')) %]
+    <a href="#" onclick="$('#print_options').dialog('close');">[% LxERP.t8("Cancel") %]</a>
+  </form>
+</div>
 
 <form method="post" action="controller.pl" id="order_form">
-  <div class="listtop">[% FORM.title %]</div>
-
   [% L.hidden_tag('callback', FORM.callback) %]
   [% L.hidden_tag('type',     FORM.type) %]
   [% L.hidden_tag('id',       SELF.order.id) %]
@@ -16,6 +25,9 @@
       <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
 [%- IF INSTANCE_CONF.get_webdav %]
       <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $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 %]
     </ul>
 
@@ -30,66 +42,12 @@
 
   [% L.hidden_tag('action', 'Order/dispatch') %]
 
-  [% L.button_tag('save()', LxERP.t8('Save')) %]
-  [% L.button_tag('create_pdf()', LxERP.t8('Create PDF')) %]
-  [% L.button_tag('email()', LxERP.t8('E-mail')) %]
+  [% 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('delete_order()', LxERP.t8('Delete'), confirm=LxERP.t8("Are you sure?")) %]
+  [% L.button_tag('kivi.Order.delete_order()', LxERP.t8('Delete'), confirm=LxERP.t8("Are you sure?")) %]
 [%- END %]
 
 </form>
-
-
-<script type='text/javascript'>
-
-function delete_order() {
-  var data = $('#order_form').serializeArray();
-  data.push({ name: 'action', value: 'Order/delete' });
-
-  $.post("controller.pl", data, kivi.eval_json_result);
-}
-
-function save() {
-  if (!check_cv()) return;
-  var data = $('#order_form').serialize();
-  data += '&action=Order/save';
-
-  $.post("controller.pl", data, kivi.eval_json_result);
-}
-
-function create_pdf() {
-  if (!check_cv()) return;
-  var data = $('#order_form').serialize();
-  data += '&action=Order/create_pdf';
-
-  $.post("controller.pl", data, kivi.eval_json_result);
-}
-
-function download_pdf(pdf_filename, key) {
-  var data = 'action=Order/download_pdf';
-  data += '&type=' + $('#type').val();
-  data += '&pdf_filename=' + pdf_filename;
-  data += '&key=' + key;
-  $.download("controller.pl", data);
-}
-
-function email() {
-  if (!check_cv()) return;
-  var data = $('#order_form').serialize();
-  data += '&action=Order/show_email_dialog';
-
-  $.post("controller.pl", data, kivi.eval_json_result);
-}
-
-function check_cv() {
-  if ($('#order_[%- cv_id %]').val() == '') {
-    [%- IF SELF.cv == 'customer' %]
-      alert(kivi.t8('Please select a customer.'));
-    [%- ELSE %]
-      alert(kivi.t8('Please select a vendor.'));
-    [%- END %]
-    return false;
-  }
-  return true;
-}
-</script>