X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=js%2Fkivi.Order.js;h=938cfb7d087be570bddcf69b9834f344dc4d8e4c;hb=b5d12cc8ee76100649ed3984f381262dc7200616;hp=c23466eabae12b0f5ded2d8a78c70f7904084a70;hpb=b7afa934d4ce656536645a97253e4d7ec27e380c;p=kivitendo-erp.git

diff --git a/js/kivi.Order.js b/js/kivi.Order.js
index c23466eab..938cfb7d0 100644
--- a/js/kivi.Order.js
+++ b/js/kivi.Order.js
@@ -580,41 +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: 'language_id', value: $('#order_language_id').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);
       }
     };
 
@@ -926,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();
   };