X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/3fb014daf67acfbea062c5601b9445ca58f437ed..a54bd67ad73ba2ba6fbb8a2bdce288af39676a67:/templates/webpages/order/tabs/basic_data.html

diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index c44e64681..c25ec72ce 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -41,6 +41,15 @@
             <td>[% L.select_tag('order.taxzone_id', SELF.all_taxzones, default=SELF.order.taxzone_id, title_key='description', style='width: 300px', class='recalc') %]</td>
           </tr>
 
+[%- IF SELF.all_departments.size %]
+          <tr>
+            <th align="right">[% 'Department' | $T8 %]</th>
+            <td>
+              [% L.select_tag('order.department_id', SELF.all_departments, default=SELF.order.department_id, title_key='description', with_empty=1, style='width:300px') %]
+            </td>
+          </tr>
+[%- END %]
+
           <tr>
             <th align="right">[% 'Shipping Point' | $T8 %]</th>
             <td>[% L.input_tag('order.shippingpoint', SELF.order.shippingpoint, style='width: 300px') %]</td>
@@ -129,7 +138,7 @@
 
   [%- PROCESS order/tabs/_item_input.html %]
 
-  [% L.button_tag('setup_multi_items_dialog()', LxERP.t8('Add multiple parts')) %]</td>
+  [% L.button_tag('show_multi_items_dialog()', LxERP.t8('Add multiple parts')) %]</td>
 
   <table width="100%">
     <tr>
@@ -269,43 +278,30 @@ function add_item() {
   $.post("controller.pl", data, kivi.eval_json_result);
 }
 
-function setup_multi_items_dialog() {
+function show_multi_items_dialog() {
   if (!check_cv()) return;
-  var data = $('#order_form').serialize();
-  data += '&action=Order/show_multi_items_dialog';
-
-  $.post("controller.pl", data, kivi.eval_json_result);
-}
-
-var multi_items_dialog;
-
-function show_multi_items_dialog(html, title) {
-  var id            = 'jq_multi_items_dialog';
-  var dialog_params = {
-    id:     id,
-    width:  800,
-    height: 500,
-    modal:  true,
-    close:  function(event, ui) {
-      multi_items_dialog.remove();
-    },
-  };
-
-  $('#' + id).remove();
-
-  multi_items_dialog = $('<div style="display:none" id="' + id + '"></div>').appendTo('body');
-  multi_items_dialog.attr('title', title);
-  multi_items_dialog.html(html);
-  multi_items_dialog.dialog(dialog_params);
-
-  $('.cancel').click(close_multi_items_dialog);
 
+  var data = 'type=' + $('#type').val();
+  data += 'type=' + $('#type').val();
+  kivi.popup_dialog({
+    url: 'controller.pl?action=Order/show_multi_items_dialog',
+    data: $.extend({},
+                   { 'type': $('#type').val(),
+                     'callback': 'Order/add_multi_items',
+                     'callback_data_id': 'order_form' }),
+    id: 'jq_multi_items_dialog',
+    dialog: {
+      title: kivi.t8('Add multiple items'),
+      width:  800,
+      height: 500
+    }
+  });
   return true;
 }
 
-var close_multi_items_dialog = function() {
-  multi_items_dialog.dialog('close');
-}
+function close_multi_items_dialog() {
+  $('#jq_multi_items_dialog').dialog('close');
+};
 
 function delete_order_item_row(clicked) {
   var row = $(clicked).parents("tbody").first();