X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/5981dd661e770fe22d4bf2298846097c8096327f..f04e9769b7015b54a3d3ceb87072cc31579c5470:/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 52bb065d7..7783b7c33 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -14,7 +14,7 @@
             <td>[% L.customer_vendor_picker("order.${SELF.cv}" _ '_id', SELF.order.$cv_id, type=SELF.cv, style='width: 300px') %]</td>
           </tr>
 
-          <tr id='cp_row' [%- IF !SELF.order.${SELF.cv}.contacts.size %]style='display:none;'[%- END %]>
+          <tr id='cp_row' [%- IF !SELF.order.${SELF.cv}.contacts.size %]style='display:none'[%- END %]>
             <th align="right">[% 'Contact Person' | $T8 %]</th>
             <td>[% L.select_tag('order.cp_id',
                                 SELF.order.${SELF.cv}.contacts,
@@ -25,7 +25,7 @@
                                 style='width: 300px') %]</td>
           </tr>
 
-          <tr id='shipto_row' [%- IF !SELF.order.${SELF.cv}.shipto.size %]style='display:none;'[%- END %]>
+          <tr id='shipto_row' [%- IF !SELF.order.${SELF.cv}.shipto.size %]style='display:none'[%- END %]>
             <th align="right">[% 'Shipping Address' | $T8 %]</th>
             <td>[% L.select_tag('order.shipto_id',
                                 SELF.order.${SELF.cv}.shipto,
@@ -76,11 +76,26 @@
               title_key='safe_name') %]</td>
           </tr>
 
+          [% IF SELF.cv == 'customer' %]
+          <tr>
+            <th align="right">[% 'Salesman' | $T8 %]</th>
+            <td>[% L.select_tag('order.employee_id',
+              SELF.all_employees,
+              default=(SELF.order.salesman_id ? SELF.order.salesman_id : SELF.current_employee_id),
+              title_key='safe_name') %]</td>
+          </tr>
+          [% END %]
+
           <tr>
             <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
             <td>[% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11) %]</td>
           </tr>
 
+          <tr>
+            <th width="70%" align="right" nowrap>[% 'Quotation Number' | $T8 %]</th>
+            <td>[% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11) %]</td>
+          </tr>
+
           <tr>
             <th width="70%" align="right" nowrap>[% 'Customer Order Number' | $T8 %]</th>
             <td>[% L.input_tag('order.cusordnumber', SELF.order.cusordnumber, size = 11) %]</td>
@@ -91,6 +106,11 @@
             <td>[% L.date_tag('order.transdate', SELF.order.transdate) %]</td>
           </tr>
 
+          <tr>
+            <th width="70%" align="right" nowrap>[% 'Insert Date' | $T8 %]</th>
+            <td>[% SELF.order.itime_as_date %]</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>
@@ -102,56 +122,37 @@
     </tr>
   </table>
 
- <div>
-  <table id="input_row_table_id">
-    <thead>
-      <tr class="listheading">
-        <th class="listheading" nowrap >[%- 'Part'         | $T8 %] </th>
-        <th class="listheading" nowrap width="5" >[%- 'Qty'          | $T8 %] </th>
-        <th class="listheading" nowrap width="15">[%- 'Price'        | $T8 %] </th>
-        <th class="listheading" nowrap width="5" >[%- 'Discount'     | $T8 %] </th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr valign="top" class="listrow">
-        <td>[% L.part_picker('add_item.parts_id', '', style='width: 300px') %]</td>
-        <td>[% L.input_tag('add_item.qty_as_number', '', size = 5, style='text-align:right') %]</td>
-        <td>[% L.input_tag('add_item.sellprice_as_number', '', size = 10, style='text-align:right') %]</td>
-        <td>[% L.input_tag('add_item.discount_as_percent', '', size = 5, style='text-align:right') %]</td>
-        <td>[% L.button_tag('add_item()', LxERP.t8('Add part')) %]</td>
-      </tr>
-    </tbody>
-  </table>
-
- </div>
+  [%- PROCESS order/tabs/_item_input.html %]
 
   <table width="100%">
     <tr>
       <td>
-        <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"><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 >[%- 'Part'         | $T8 %] </th>
-              <th class="listheading" nowrap width="5" >[%- 'Qty'          | $T8 %] </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="10">[%- 'Extended'     | $T8 %] </th>
-            </tr>
-          </thead>
-
-          <tbody>
+
+        <div id="row_table_scroll_id" style="overflow-y: auto; height: 25vh">
+          <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"><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 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="10">[%- 'Extended'     | $T8 %] </th>
+              </tr>
+            </thead>
+
             [%- FOREACH item = SELF.order.items_sorted %]
               [%- PROCESS order/tabs/_row.html ITEM=item %]
             [%- END %]
-          </tbody>
 
-        </table>
+          </table>
+        </div>
+
       </td>
     </tr>
 
@@ -159,38 +160,81 @@
     </tr>
 
     <tr>
-      <td align="right">
-        <table>
-          [%- IF NOT taxincluded %]
+      <td colspan="100%" width="100%">
+        <table width="100%">
           <tr>
-            <th align="right">[%- 'Subtotal' | $T8 %]</th>
-            <td align="right">
-              [%- L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %]
+            <td>
+              <table>
+                <tr>
+                  <th align="left">[% 'Notes' | $T8 %]</th>
+                  <th align="left">[% 'Internal Notes' | $T8 %]</th>
+                </tr>
+                <tr valign="top">
+                  <td>
+                    [% L.textarea_tag('order.notes', SELF.order.notes, wrap="soft", style="width: 350px; height: 150px", class="texteditor") %]
+                  </td>
+                  <td>
+                    [% L.textarea_tag('order.intnotes', SELF.order.intnotes, wrap="soft", style="width: 350px; height: 150px") %]
+                  </td>
+                </tr>
+              </table>
             </td>
-          </tr>
-          [%- END %]
-          [%- FOREACH tax = SELF.taxes %]
-            [%- PROCESS order/tabs/_tax_row.html TAX=tax %]
-          [%- END %]
-          <tr id="amount_row_id">
-            <th align="right">[%- 'Total' | $T8 %]</th>
+
+            <td>
+              <table>
+                <tr>
+                  <th align="right">[% 'Payment Terms' | $T8 %]</th>
+                  <td>[% L.select_tag('order.payment_id',
+                                      SELF.all_payment_terms,
+                                      default = SELF.order.payment_id,
+                                      with_empty = 1,
+                                      title_key = 'description',
+                                      style = 'width: 250px') %]</td>
+                </tr>
+                <tr>
+                  <th align="right">[% 'Delivery Terms' | $T8 %]</th>
+                  <td>[% L.select_tag('order.delivery_term_id',
+                                      SELF.all_delivery_terms,
+                                      default = SELF.order.delivery_term_id,
+                                      with_empty = 1,
+                                      title_key = 'description',
+                                      style = 'width: 250px') %]</td>
+                </tr>
+              </table>
+            </td>
+
             <td align="right">
-              [%- L.div_tag(SELF.order.amount_as_number, id='amount_id') %]
+              <table>
+                [%- IF NOT taxincluded %]
+                <tr>
+                  <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 %]
+                [%- END %]
+                <tr id="amount_row_id">
+                  <th align="right">[%- 'Total' | $T8 %]</th>
+                  <td align="right">
+                    [%- L.div_tag(SELF.order.amount_as_number, id='amount_id') %]
+                </tr>
+              </table>
+            </td>
+
           </tr>
         </table>
       </td>
     </tr>
 
-    <tr>
-      <td><hl></td>
-    </tr>
-
   </table>
 
 </div>
 
 
-[% L.sortable_element('#row_table_id tbody') %]
+[% L.sortable_element('#row_table_id') %]
 
 <script type='text/javascript'>
 function reload_cv_dependend_selections() {
@@ -201,6 +245,8 @@ function reload_cv_dependend_selections() {
 }
 
 function add_item() {
+  if ($('#add_item_parts_id').val() == '') return;
+
   var data = $('#order_form').serialize();
   data += '&action=Order/add_item';
   data += '&type=' + $('#type').val();
@@ -209,40 +255,75 @@ function add_item() {
 }
 
 function delete_order_item_row(clicked) {
-  var row = $(clicked).parents("tr").first();
+  var row = $(clicked).parents("tbody").first();
   $(row).remove();
-}
-
-function set_item_values(event) {
-  var cv_id = $('#order_[%- cv_id %]').val();
-  var parts_id = $(event.target).val();
-  var row = $(event.target).parents("tr").first();
 
-  var item_id_dom = $(row).find('[name="order.orderitems[+].id"]');
-  var qty_dom = $(row).find('[id^="order_orderitems"][id$="qty_as_number"]');
-  var unit_dom = $(row).find('[id^="order_orderitems"][id$="unit"]');
-  var sellprice_dom = $(row).find('[id^="order_orderitems"][id$="sellprice_as_number"]');
-  var discount_dom = $(row).find('[id^="order_orderitems"][id$="discount_as_percent"]');
+  recalc_amounts_and_taxes();
+}
 
+function recalc_amounts_and_taxes() {
   var data = $('#order_form').serialize();
-  data += '&action=Order/set_item_values';
+  data += '&action=Order/recalc_amounts_and_taxes';
   data += '&type=' + $('#type').val();
-  data += '&item_id=' + item_id_dom.val();
-  data += '&qty_dom_id=' + qty_dom.attr("id");
-  data += '&unit_dom_id=' + unit_dom.attr("id");
-  data += '&sellprice_dom_id=' + sellprice_dom.attr("id");
-  data += '&discount_dom_id=' + discount_dom.attr("id");
 
   $.post("controller.pl", data, kivi.eval_json_result);
 }
 
-function display_linetotal(item_id, amount) {
-  $('#item_' + item_id).parents("tr").first().find('[name="linetotal"]').html(amount);
+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);
-  $('[id^="order_orderitems"][id$="parts_id"]').change(set_item_values);
+  $('#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>