X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/2ff1c023218df79f45ab9343dc467e123f5eaa82..af131a46:/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 8d1a25701..526e028bf 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">
@@ -38,8 +40,17 @@
 
           <tr>
             <th align="right">[% 'Steuersatz' | $T8 %]</th>
-            <td>[% L.select_tag('order.taxzone_id', SELF.all_taxzones, default=SELF.order.taxzone_id, title_key='description', style='width: 300px') %]</td>
+            <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>
@@ -56,6 +67,11 @@
             <td>[% L.input_tag('order.transaction_description', SELF.order.transaction_description, style='width: 300px') %]</td>
           </tr>
 
+          <tr>
+            <th align="right">[% 'Project Number' | $T8 %]</th>
+            <td>[% L.project_picker('order.globalproject_id', SELF.order.globalproject_id, style='width: 300px') %]</td>
+          </tr>
+
         </table>
       </td>
 
@@ -112,13 +128,13 @@
           </tr>
 
           <tr>
-            <th width="70%" align="right" nowrap>[% 'Insert Date' | $T8 %]</th>
-            <td>[% SELF.order.itime_as_date %]</td>
+            <th width="70%" align="right" nowrap>[% 'Reqdate' | $T8 %]</th>
+            <td>[% L.date_tag('order.reqdate', SELF.order.reqdate) %]</td>
           </tr>
 
           <tr>
-            <th width="70%" align="right" nowrap>[% 'Project Number' | $T8 %]</th>
-            <td>[%- L.select_tag('order.globalproject_id', SELF.all_projects, default=SELF.order.globalproject_id, title_key='projectnumber', with_empty = 1) %]</td>
+            <th width="70%" align="right" nowrap>[% 'Insert Date' | $T8 %]</th>
+            <td>[% SELF.order.itime_as_date %]</td>
           </tr>
 
         </table>
@@ -129,6 +145,8 @@
 
   [%- PROCESS order/tabs/_item_input.html %]
 
+  [% L.button_tag('kivi.Order.show_multi_items_dialog()', LxERP.t8('Add multiple items')) %]
+
   <table width="100%">
     <tr>
       <td>
@@ -137,22 +155,31 @@
           <table id="row_table_id" width="100%">
             <thead>
               <tr class="listheading">
-                <th class="listheading" style='display:none'></th>
+                <th class="listheading" style='text-align:center' nowrap width="1">
+                  [%- IF MYCONFIG.show_form_details %]
+                    [%- L.img_tag(src="image/collapse.svg", alt=LxERP.t8('Hide all details'), title=LxERP.t8('Hide all details'), id='expand_all', "data-expanded"="1") %]
+                  [%- ELSE %]
+                    [%- L.img_tag(src="image/expand.svg", alt=LxERP.t8('Show all details'), title=LxERP.t8('Show all details'), id='expand_all') %]
+                  [%- END %]
+                </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="partclass_header_id"   class="listheading" nowrap width="2">[%- 'Type'  | $T8 %]</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="15">[%- 'Price'        | $T8 %] </th>
-                <th class="listheading" nowrap width="5" >[%- 'Discount'     | $T8 %] </th>
+                <th class="listheading" nowrap width="5" >[%- 'Price Source' | $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 %]
+              [%- PROCESS order/tabs/_row.html ITEM=item ID=item.id ALL_PRICE_FACTORS=SELF.all_price_factors %]
             [%- END %]
 
           </table>
@@ -210,16 +237,21 @@
 
             <td align="right">
               <table>
-                [%- IF NOT taxincluded %]
-                <tr>
+                <tr id="taxincluded_row_id" [%- IF !SELF.taxes.size %]style="display:none"[%- END %]>
+                  <td align=right colspan="2">
+                    <label for="order.taxincluded"><b>[% 'Tax Included' | $T8 %]</b></label>
+                    [% L.yes_no_tag('order.taxincluded', SELF.order.taxincluded, class='recalc') %]
+                  </td>
+                </tr>
+
+                <tr id="subtotal_row_id" [%- IF SELF.order.taxincluded %]style="display:none"[%- END %]>
                   <th align="right">[%- 'Subtotal' | $T8 %]</th>
                   <td align="right">
                     [%- L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %]
                   </td>
                 </tr>
-                [%- END %]
                 [%- FOREACH tax = SELF.taxes %]
-                  [%- PROCESS order/tabs/_tax_row.html TAX=tax %]
+                  [%- PROCESS order/tabs/_tax_row.html TAX=tax TAXINCLUDED=SELF.order.taxincluded %]
                 [%- END %]
                 <tr id="amount_row_id">
                   <th align="right">[%- 'Total' | $T8 %]</th>
@@ -239,96 +271,4 @@
 
 </div>
 
-
 [% L.sortable_element('#row_table_id') %]
-
-<script type='text/javascript'>
-function reload_cv_dependend_selections() {
-  $.post("controller.pl", { 'action': 'Order/customer_vendor_changed',
-                            'cv_id':  function(){ return $('#order_[%- cv_id%]').val() },
-                            'type':   function(){ return $('#type').val() },
-                          }, 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 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;
-  });
-}
-
-$(function(){
-  $('#order_[%- cv_id %]').change(reload_cv_dependend_selections);
-  $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_sellprice_as_number').val(kivi.format_amount(o.sellprice, -2)) });
-  $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_description').val(o.description) });
-  $('.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);
-});
-
-</script>