Projekt-Picker: Parameter f. aktiv/gültig

[kivitendo-erp.git] / js / kivi.Order.js

diff --git a/js/kivi.Order.js b/js/kivi.Order.js
index e524406..938cfb7 100644 (file)
--- a/js/kivi.Order.js
+++ b/js/kivi.Order.js
@@ -51,7 +51,6 @@ namespace('kivi.Order', function(ns) {
     if (warn_on_reqdate    && !ns.check_valid_reqdate())   return;
 
     var data = $('#order_form').serializeArray();
-    data.push({ name: 'order.language_id', value: $('#language_id').val() }); // language from print options
     data.push({ name: 'action', value: 'Order/' + action });
 
     $.post("controller.pl", data, kivi.eval_json_result);
@@ -83,7 +82,6 @@ namespace('kivi.Order', function(ns) {
 
     var data = $('#order_form').serializeArray();
     data = data.concat($('#print_options_form').serializeArray());
-    data.push({ name: 'order.language_id', value: $('#language_id').val() }); // language from print options
     data.push({ name: 'action', value: 'Order/print' });
 
     $.post("controller.pl", data, kivi.eval_json_result);
@@ -139,7 +137,6 @@ namespace('kivi.Order', function(ns) {
     var data = $('#order_form').serializeArray();
     data = data.concat($('[name^="email_form."]').serializeArray());
     data = data.concat($('[name^="print_options."]').serializeArray());
-    data.push({ name: 'order.language_id', value: $('#language_id').val() }); // language from print options
     data.push({ name: 'action', value: 'Order/send_email' });
     $.post("controller.pl", data, kivi.eval_json_result);
   };
@@ -583,40 +580,15 @@ namespace('kivi.Order', function(ns) {
     var position            = $(row).find('[name="position"]').html();
     var partnumber          = $(row).find('[name="partnumber"]').html();
     var description_elt     = $(row).find('[name="order.orderitems[].description"]');
-    var description         = description_elt.val();
     var longdescription_elt = $(row).find('[name="order.orderitems[].longdescription"]');
-    var longdescription;
-
-    if (!longdescription_elt.length) {
-      var data = [
-        { name: 'action',   value: 'Order/get_item_longdescription'                          },
-        { name: 'type',     value: $('#type').val()                                          },
-        { name: 'item_id',  value: $(row).find('[name="order.orderitems[+].id"]').val()      },
-        { name: 'parts_id', value: $(row).find('[name="order.orderitems[].parts_id"]').val() }
-      ];
-
-      $.ajax({
-        url:      'controller.pl',
-        data:     data,
-        method:   "GET",
-        async:    false,
-        dataType: 'text',
-        success:  function(val) {
-          longdescription = val;
-        }
-      });
-    } else {
-      longdescription = longdescription_elt.val();
-    }
 
     var params = {
       runningnumber:           position,
       partnumber:              partnumber,
-      description:             description,
-      default_longdescription: longdescription,
+      description:             description_elt.val(),
+      default_longdescription: longdescription_elt.val(),
       set_function:            function(val) {
-        longdescription_elt.remove();
-        $('<input type="hidden" name="order.orderitems[].longdescription">').insertAfter(description_elt).val(val);
+        longdescription_elt.val(val);
       }
     };
 
@@ -928,10 +900,18 @@ namespace('kivi.Order', function(ns) {
     if (number_info !== '') { info += ' (' + number_info + ')' }
     if (name_info   !== '') { info += ' (' + name_info + ')' }
 
-    $('<input type="hidden" name="follow_up_rowcount">').appendTo('#order_form').val(1);
-    $('<input type="hidden" name="follow_up_trans_id_1">').appendTo('#order_form').val(id);
-    $('<input type="hidden" name="follow_up_trans_type_1">').appendTo('#order_form').val(type);
-    $('<input type="hidden" name="follow_up_trans_info_1">').appendTo('#order_form').val(info);
+    if (!$('#follow_up_rowcount').lenght) {
+      $('<input type="hidden" name="follow_up_rowcount"        id="follow_up_rowcount">').appendTo('#order_form');
+      $('<input type="hidden" name="follow_up_trans_id_1"      id="follow_up_trans_id_1">').appendTo('#order_form');
+      $('<input type="hidden" name="follow_up_trans_type_1"    id="follow_up_trans_type_1">').appendTo('#order_form');
+      $('<input type="hidden" name="follow_up_trans_info_1"    id="follow_up_trans_info_1">').appendTo('#order_form');
+      $('<input type="hidden" name="follow_up_trans_subject_1" id="follow_up_trans_subject_1">').appendTo('#order_form');
+    }
+    $('#follow_up_rowcount').val(1);
+    $('#follow_up_trans_id_1').val(id);
+    $('#follow_up_trans_type_1').val(type);
+    $('#follow_up_trans_info_1').val(info);
+    $('#follow_up_trans_subject_1').val($('#order_transaction_description').val());
 
     follow_up_window();
   };