X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Forder%2Ftabs%2Fbasic_data.html;h=508db12a521c443d8256dbb3f414af9835d598ce;hb=491a3c27055cabce59b4d93a6e389a59125eeef7;hp=7783b7c337209ab044261027dada057258179b3c;hpb=f04e9769b7015b54a3d3ceb87072cc31579c5470;p=kivitendo-erp.git

diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index 7783b7c33..508db12a5 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -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>
@@ -56,6 +56,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>
 
@@ -79,8 +84,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>
@@ -111,11 +116,6 @@
             <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>
-          </tr>
-
         </table>
 
       </td>
@@ -124,6 +124,8 @@
 
   [%- PROCESS order/tabs/_item_input.html %]
 
+  [% L.button_tag('setup_multi_items_dialog()', LxERP.t8('Add multiple parts')) %]</td>
+
   <table width="100%">
     <tr>
       <td>
@@ -140,6 +142,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 +150,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>
@@ -205,21 +208,27 @@
 
             <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>
@@ -238,14 +247,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';
@@ -254,6 +264,44 @@ function add_item() {
   $.post("controller.pl", data, kivi.eval_json_result);
 }
 
+function setup_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);
+
+  return true;
+}
+
+var close_multi_items_dialog = function() {
+  multi_items_dialog.dialog('close');
+}
+
 function delete_order_item_row(clicked) {
   var row = $(clicked).parents("tbody").first();
   $(row).remove();
@@ -261,6 +309,91 @@ 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 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';
@@ -271,7 +404,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]);
   });
 }
 
@@ -311,10 +444,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();
@@ -324,6 +492,7 @@ $(function(){
   });
   row_set_keyboard_events($('.row_entry'));
   $('.recalc').change(recalc_amounts_and_taxes);
+  $('.reformat_number').change(reformat_number);
 });
 
 </script>