X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/c9d5cc7f38af8db81fcfd11fac6cda62935d41c3..42ccfb976289de017f9f355bd3bf0e02bcec80ea:/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 374b9d822..613c8b396 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,
@@ -38,7 +38,7 @@
 
           <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>
 
           <tr>
@@ -79,8 +79,8 @@
           [% IF SELF.cv == 'customer' %]
           <tr>
             <th align="right">[% 'Salesman' | $T8 %]</th>
-            <td>[% L.select_tag('order.employee_id',
-              SELF.all_employees,
+            <td>[% L.select_tag('order.salesman_id',
+              SELF.all_salesmen,
               default=(SELF.order.salesman_id ? SELF.order.salesman_id : SELF.current_employee_id),
               title_key='safe_name') %]</td>
           </tr>
@@ -128,7 +128,7 @@
     <tr>
       <td>
 
-        <div id="row_table_scroll_id" style="overflow-y: auto; height: 45vh;">
+        <div id="row_table_scroll_id" style="overflow-y: auto; height: 25vh">
           <table id="row_table_id" width="100%">
             <thead>
               <tr class="listheading">
@@ -140,6 +140,7 @@
                 <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="5" >[%- 'Price Source' | $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>
@@ -147,7 +148,7 @@
             </thead>
 
             [%- FOREACH item = SELF.order.items_sorted %]
-              [%- PROCESS order/tabs/_row.html ITEM=item %]
+              [%- PROCESS order/tabs/_row.html ITEM=item ID=item.id %]
             [%- END %]
 
           </table>
@@ -163,6 +164,23 @@
       <td colspan="100%" width="100%">
         <table width="100%">
           <tr>
+            <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>
+
             <td>
               <table>
                 <tr>
@@ -172,7 +190,7 @@
                                       default = SELF.order.payment_id,
                                       with_empty = 1,
                                       title_key = 'description',
-                                      style = 'width: 250px;') %]</td>
+                                      style = 'width: 250px') %]</td>
                 </tr>
                 <tr>
                   <th align="right">[% 'Delivery Terms' | $T8 %]</th>
@@ -181,28 +199,34 @@
                                       default = SELF.order.delivery_term_id,
                                       with_empty = 1,
                                       title_key = 'description',
-                                      style = 'width: 250px;') %]</td>
+                                      style = 'width: 250px') %]</td>
                 </tr>
               </table>
             </td>
 
             <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>
                   <td align="right">
                     [%- L.div_tag(SELF.order.amount_as_number, id='amount_id') %]
+                  </td>
                 </tr>
               </table>
             </td>
@@ -212,10 +236,6 @@
       </td>
     </tr>
 
-    <tr>
-      <td><hl></td>
-    </tr>
-
   </table>
 
 </div>
@@ -225,14 +245,15 @@
 
 <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);
+  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';
@@ -248,6 +269,42 @@ function delete_order_item_row(clicked) {
   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 price_elt  = $(row).find('[name="order.orderitems[].sellprice_as_number"]');
+  var button_elt = $(row).find('[name="price_chooser_button"]');
+
+  button_elt.val(descr);
+  source_elt.val(source);
+  if (price_str) price_elt.val(price_str);
+
+  recalc_amounts_and_taxes();
+  kivi.io.close_dialog();
+}
+
+function update_discount_source(item_id, source, discount_str) {
+  var row = $('#item_' + item_id).parents("tbody").first();
+  var source_elt   = $(row).find('[name="order.orderitems[].active_discount_source"]');
+  var discount_elt = $(row).find('[name="order.orderitems[].discount_as_percent"]');
+
+  source_elt.val(source);
+  if (discount_str) discount_elt.val(discount_str);
+
+  recalc_amounts_and_taxes();
+}
+
 function recalc_amounts_and_taxes() {
   var data = $('#order_form').serialize();
   data += '&action=Order/recalc_amounts_and_taxes';
@@ -258,7 +315,7 @@ function recalc_amounts_and_taxes() {
 
 function redisplay_linetotals(data) {
   $('.row_entry [name="linetotal"]').each(function(idx, elt) {
-    $(elt).html(data[idx]);    
+    $(elt).html(data[idx]);
   });
 }
 
@@ -298,10 +355,45 @@ function row_set_keyboard_events(rows) {
   });
 }
 
+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);
-  $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_sellprice_as_number').val(kivi.format_amount(o.sellprice, -2)) });
+  [%- 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();