X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Forder%2Ftabs%2Fbasic_data.html;h=61348b7b864c575bedc10491d767296d6d65a946;hb=6e1a7a2e06de426b553ada3aed39f28b4825d0ce;hp=32880cf6e5e5a169484a3ff7f58dfc70e783819e;hpb=3df0bf0644d42357ee0baf9f5b05efbbfc8d0135;p=kivitendo-erp.git

diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index 32880cf6e..61348b7b8 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -3,6 +3,8 @@
 [%- USE LxERP %]
 [%- USE L %]
 
+[%- INCLUDE 'generic/set_longdescription.html' %]
+
 <div id="ui-tabs-basic-data">
   <table width="100%">
     <tr valign="top">
@@ -41,6 +43,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>
@@ -134,6 +145,8 @@
 
   [%- PROCESS order/tabs/_item_input.html %]
 
+  [% L.button_tag('kivi.Order.show_multi_items_dialog()', LxERP.t8('Add multiple items')) %]</td>
+
   <table width="100%">
     <tr>
       <td>
@@ -143,22 +156,23 @@
             <thead>
               <tr class="listheading">
                 <th class="listheading" style='display:none'></th>
+                <th class="listheading" nowrap width="3" >[%- 'position'     | $T8 %] </th>
                 <th class="listheading" style='text-align:center' nowrap width="1"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
                 <th class="listheading" style='text-align:center' nowrap width="1"><img src="image/close.png" alt="[%- LxERP.t8('delete item') %]"></th>
-                <th class="listheading" nowrap width="15">[%- 'Partnumber'   | $T8 %] </th>
-                <th class="listheading" nowrap           >[%- 'Description'  | $T8 %] </th>
-                <th class="listheading" nowrap width="5" >[%- 'Qty'          | $T8 %] </th>
+                <th id="partnumber_header_id"  class="listheading" nowrap width="15"><a href='#' onClick='javascript:kivi.Order.reorder_items("partnumber")'> [%- 'Partnumber'  | $T8 %]</a></th>
+                <th id="description_header_id" class="listheading" nowrap           ><a href='#' onClick='javascript:kivi.Order.reorder_items("description")'>[%- 'Description' | $T8 %]</a></th>
+                <th id="qty_header_id"         class="listheading" nowrap width="5" ><a href='#' onClick='javascript:kivi.Order.reorder_items("qty")'>        [%- 'Qty'         | $T8 %]</a></th>
                 <th class="listheading" nowrap width="5" >[%- 'Price Factor' | $T8 %] </th>
                 <th class="listheading" nowrap width="5" >[%- 'Unit'         | $T8 %] </th>
                 <th class="listheading" nowrap width="5" >[%- 'Price Source' | $T8 %] </th>
-                <th class="listheading" nowrap width="15">[%- 'Price'        | $T8 %] </th>
-                <th class="listheading" nowrap width="5" >[%- 'Discount'     | $T8 %] </th>
+                <th id="sellprice_header_id"   class="listheading" nowrap width="15" ><a href='#' onClick='javascript:kivi.Order.reorder_items("sellprice")'> [%- 'Price'       | $T8 %]</a></th>
+                <th id="discount_header_id"    class="listheading" nowrap width="15" ><a href='#' onClick='javascript:kivi.Order.reorder_items("discount")'>  [%- 'Discount'    | $T8 %]</a></th>
                 <th class="listheading" nowrap width="10">[%- 'Extended'     | $T8 %] </th>
               </tr>
             </thead>
 
             [%- FOREACH item = SELF.order.items_sorted %]
-              [%- PROCESS order/tabs/_row.html ITEM=item ID=item.id %]
+              [%- PROCESS order/tabs/_row.html ITEM=item ID=item.id ALL_PRICE_FACTORS=SELF.all_price_factors %]
             [%- END %]
 
           </table>
@@ -250,217 +264,4 @@
 
 </div>
 
-
 [% L.sortable_element('#row_table_id') %]
-
-<script type='text/javascript'>
-function reload_cv_dependend_selections() {
-  var data = $('#order_form').serialize();
-  data += '&action=Order/customer_vendor_changed';
-
-  $.post("controller.pl", data, kivi.eval_json_result);
-}
-
-function add_item() {
-  if ($('#add_item_parts_id').val() == '') return;
-  if (!check_cv()) return;
-
-  var data = $('#order_form').serialize();
-  data += '&action=Order/add_item';
-
-  $.post("controller.pl", data, kivi.eval_json_result);
-}
-
-function delete_order_item_row(clicked) {
-  var row = $(clicked).parents("tbody").first();
-  $(row).remove();
-
-  recalc_amounts_and_taxes();
-}
-
-function price_chooser_item_row(clicked) {
-  var row = $(clicked).parents("tbody").first();
-  var item_id_dom = $(row).find('[name="orderitem_ids[+]"]');
-
-  var data = $('#order_form').serialize();
-  data += '&action=Order/price_popup';
-  data += '&item_id=' + item_id_dom.val();
-
-  $.post("controller.pl", data, kivi.eval_json_result);
-}
-
-function update_price_source(item_id, source, descr, price_str) {
-  var row = $('#item_' + item_id).parents("tbody").first();
-  var source_elt = $(row).find('[name="order.orderitems[].active_price_source"]');
-  var button_elt = $(row).find('[name="price_chooser_button"]');
-
-  button_elt.val(button_elt.val().replace(/.*\|/, descr + " |"));
-  source_elt.val(source);
-
-  var editable_div_elt = $(row).find('[name="editable_price"]');
-  var not_editable_div_elt = $(row).find('[name="not_editable_price"]');
-  if ([%- AUTH.assert('edit_prices', 1) %] == 1 && source == '') {
-    // editable
-    $(editable_div_elt).show();
-    $(not_editable_div_elt).hide();
-    $(editable_div_elt).find(':input').prop("disabled", false);
-    $(not_editable_div_elt).find(':input').prop("disabled", true);
-  } else {
-    // not editable
-    $(editable_div_elt).hide();
-    $(not_editable_div_elt).show();
-    $(editable_div_elt).find(':input').prop("disabled", true);
-    $(not_editable_div_elt).find(':input').prop("disabled", false);
-  }
-
-  if (price_str) {
-    var price_elt = $(row).find('[name="order.orderitems[].sellprice_as_number"]');
-    var html_elt  = $(row).find('[name="sellprice_text"]');
-    price_elt.val(price_str);
-    html_elt.html(price_str);
-    recalc_amounts_and_taxes();
-  }
-
-  kivi.io.close_dialog();
-}
-
-function update_discount_source(item_id, source, descr, discount_str) {
-  var row = $('#item_' + item_id).parents("tbody").first();
-  var source_elt = $(row).find('[name="order.orderitems[].active_discount_source"]');
-  var button_elt = $(row).find('[name="price_chooser_button"]');
-
-  button_elt.val(button_elt.val().replace(/\|.*/, "| " + descr));
-  source_elt.val(source);
-
-  var editable_div_elt = $(row).find('[name="editable_discount"]');
-  var not_editable_div_elt = $(row).find('[name="not_editable_discount"]');
-  if ([%- AUTH.assert('edit_prices', 1) %] == 1 && source == '') {
-    // editable
-    $(editable_div_elt).show();
-    $(not_editable_div_elt).hide();
-    $(editable_div_elt).find(':input').prop("disabled", false);
-    $(not_editable_div_elt).find(':input').prop("disabled", true);
-  } else {
-    // not editable
-    $(editable_div_elt).hide();
-    $(not_editable_div_elt).show();
-    $(editable_div_elt).find(':input').prop("disabled", true);
-    $(not_editable_div_elt).find(':input').prop("disabled", false);
-  }
-
-  if (discount_str) {
-    var discount_elt = $(row).find('[name="order.orderitems[].discount_as_percent"]');
-    var html_elt     = $(row).find('[name="discount_text"]');
-    discount_elt.val(discount_str);
-    html_elt.html(discount_str);
-    recalc_amounts_and_taxes();
-  }
-
-  kivi.io.close_dialog();
-}
-
-function reformat_number(event) {
-  $(event.target).val(kivi.format_amount(kivi.parse_amount($(event.target).val()), -2));
-}
-
-function recalc_amounts_and_taxes() {
-  var data = $('#order_form').serialize();
-  data += '&action=Order/recalc_amounts_and_taxes';
-
-  $.post("controller.pl", data, kivi.eval_json_result);
-}
-
-function redisplay_linetotals(data) {
-  $('.row_entry [name="linetotal"]').each(function(idx, elt) {
-    $(elt).html(data[idx]);
-  });
-}
-
-function row_table_scroll_down() {
-  $('#row_table_scroll_id').scrollTop($('#row_table_scroll_id')[0].scrollHeight);
-}
-
-function row_set_keyboard_events_by_id(item_id) {
-  var row = $('#item_' + item_id).parents("tbody").first();
-
-  row_set_keyboard_events(row);
-}
-
-function row_set_keyboard_events(rows) {
-  $(rows).keydown(function(event) {
-    if(event.keyCode == 40 && event.shiftKey == true) {
-      // shift arrow down
-      event.preventDefault();
-      var row = $(event.target).parents(".row_entry").first();
-      $(row).children().not(':first').show();
-      return false;
-    }
-    if(event.keyCode == 38 && event.shiftKey == true) {
-      // shift arrow up
-      event.preventDefault();
-      var row = $(event.target).parents(".row_entry").first();
-      $(row).children().not(':first').hide();
-      return false;
-    }
-  });
-
-  $(rows).dblclick(function(event) {
-      event.preventDefault();
-      var row = $(event.target).parents(".row_entry").first();
-      $(row).children().not(':first').toggle();
-      return false;
-  });
-}
-
-var email_dialog;
-
-function show_email_dialog(html) {
-  var id            = 'jqueryui_popup_dialog';
-  var dialog_params = {
-    id:     id,
-    width:  800,
-    height: 500,
-    modal:  true,
-    close: function(event, ui) {
-      email_dialog.remove();
-    },
-  };
-
-  $('#' + id).remove();
-
-  email_dialog = $('<div style="display:none" id="' + id + '"></div>').appendTo('body');
-  email_dialog.html(html);
-  email_dialog.dialog(dialog_params);
-
-  $('.cancel').click(close_email_dialog);
-
-  return true;
-}
-
-close_email_dialog = function() {
-  email_dialog.dialog("close");
-}
-
-
-$(function(){
-  $('#order_[%- cv_id %]').change(reload_cv_dependend_selections);
-  [%- IF SELF.cv == 'customer' %]
-    $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_sellprice_as_number').val(kivi.format_amount(o.sellprice, -2)) });
-  [%- ELSE %]
-    $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_sellprice_as_number').val(kivi.format_amount(o.lastcost, -2)) });
-  [%- END %]
-  $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_description').val(o.description) });
-  $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_unit').val(o.unit) });
-  $('.add_item_input').keydown(function(event) {
-    if(event.keyCode == 13) {
-      event.preventDefault();
-      add_item();
-      return false;
-    }
-  });
-  row_set_keyboard_events($('.row_entry'));
-  $('.recalc').change(recalc_amounts_and_taxes);
-  $('.reformat_number').change(reformat_number);
-});
-
-</script>