X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=js%2Fkivi.Order.js;h=e524406917054e70d1c79f3e8b4a61358b26e378;hb=dbbc5c965afe4b9fcb0228d584c58084e46a63cb;hp=a62be8838cd0df8940cdd62c4650c09131c2740c;hpb=9cb9a44803b42042fbec121e832ca82e29d1c8e4;p=kivitendo-erp.git

diff --git a/js/kivi.Order.js b/js/kivi.Order.js
index a62be8838..e52440691 100644
--- a/js/kivi.Order.js
+++ b/js/kivi.Order.js
@@ -28,7 +28,7 @@ namespace('kivi.Order', function(ns) {
     }
 
     if (pos.length > 0) {
-      question = question || kivi.t8("Do you really want to save?");
+      question = question || kivi.t8("Do you really want to continue?");
       return confirm(kivi.t8("There are duplicate parts at positions") + "\n"
                      + pos.join(', ') + "\n"
                      + question);
@@ -89,17 +89,6 @@ namespace('kivi.Order', function(ns) {
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
-  ns.email = function(warn_on_duplicates) {
-    if (warn_on_duplicates && !ns.check_duplicate_parts(kivi.t8("Do you really want to send by mail?"))) return;
-    if (!ns.check_cv()) 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/show_email_dialog' });
-
-    $.post("controller.pl", data, kivi.eval_json_result);
-  };
-
   var email_dialog;
 
   ns.setup_send_email_dialog = function() {
@@ -917,6 +906,36 @@ namespace('kivi.Order', function(ns) {
                                 width:  500 }});
   };
 
+  ns.follow_up_window = function() {
+    var id   = $('#id').val();
+    var type = $('#type').val();
+
+    var number_info = '';
+    if ($('#type').val() == 'sales_order' || $('#type').val() == 'purchase_order') {
+      number_info = $('#order_ordnumber').val();
+    } else if ($('#type').val() == 'sales_quotation' || $('#type').val() == 'request_quotation') {
+      number_info = $('#order_quonumber').val();
+    }
+
+    var name_info = '';
+    if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation') {
+      name_info = $('#order_customer_id_name').val();
+    } else if ($('#type').val() == 'purchase_order' || $('#type').val() == 'request_quotation') {
+      name_info = $('#order_vendor_id_name').val();
+    }
+
+    var info = '';
+    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);
+
+    follow_up_window();
+  };
+
 });
 
 $(function() {