X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.BankTransaction.js;h=0c1346340d826559099da4b7e3a5c048f5460563;hb=94ebf17421d5c36082909c1b01c7a6b8b1540493;hp=a4779465ac667a6abaabbd3eac3881637ba18191;hpb=c4d3f82d744113e520282409454f4cc763e012cc;p=kivitendo-erp.git

diff --git a/js/kivi.BankTransaction.js b/js/kivi.BankTransaction.js
index a4779465a..0c1346340 100644
--- a/js/kivi.BankTransaction.js
+++ b/js/kivi.BankTransaction.js
@@ -13,27 +13,38 @@ namespace('kivi.BankTransaction', function(ns) {
   };
 
   ns.add_invoices = function(bank_transaction_id, proposal_id) {
-    $('[data-proposal-id=' + proposal_id + ']').hide();
 
     $.ajax({
       url: 'controller.pl?action=BankTransaction/ajax_payment_suggestion&bt_id=' + bank_transaction_id  + '&prop_id=' + proposal_id,
       success: function(data) {
-        $('#assigned_invoices_' + bank_transaction_id).append(data.html);
+        $('#assigned_invoices_' + bank_transaction_id + "_" + proposal_id).html(data.html);
+        $('#sources_' + bank_transaction_id + "_" + proposal_id + ',' +
+          '#memos_'   + bank_transaction_id + "_" + proposal_id).show();
+        $('[data-proposal-id=' + proposal_id + ']').hide();
+
         ns.update_invoice_amount(bank_transaction_id);
       }
     });
   };
 
   ns.delete_invoice = function(bank_transaction_id, proposal_id) {
-    $( "#" + bank_transaction_id + "\\." + proposal_id ).remove();
+    var $inputs = $('#sources_' + bank_transaction_id + "_" + proposal_id + ',' +
+                    '#memos_'   + bank_transaction_id + "_" + proposal_id);
+
     $('[data-proposal-id=' + proposal_id + ']').show();
+    $('#assigned_invoices_' + bank_transaction_id + "_" + proposal_id).html('');
+    $('#extra_row_' + bank_transaction_id + '_' + proposal_id).remove();
+
+    $inputs.hide();
+    $inputs.val('');
+
     ns.update_invoice_amount(bank_transaction_id);
   };
 
   ns.create_invoice = function(bank_transaction_id) {
     kivi.popup_dialog({
       url:    'controller.pl?action=BankTransaction/create_invoice',
-      data:   '&bt_id=' + bank_transaction_id + "&filter.bank_account=" + $('#filter_bankaccount').val() + '&filter.fromdate=' + $('#filter_fromdate').val() + '&filter.todate=' + $('#filter_todate').val(),
+      data:   '&bt_id=' + bank_transaction_id + "&filter.bank_account=" + $('#filter_bank_account').val() + '&filter.fromdate=' + $('#filter_fromdate').val() + '&filter.todate=' + $('#filter_todate').val(),
       type:   'POST',
       id:     'create_invoice_window',
       dialog: { title: kivi.t8('Create invoice') }
@@ -59,7 +70,7 @@ namespace('kivi.BankTransaction', function(ns) {
     $.ajax({
       url: url,
       success: function(new_html) {
-        $('#assigned_invoices_' + bank_transaction_id).append(new_html);
+        $('#bt_rows_' + bank_transaction_id).append(new_html);
         $('#assign_invoice_window').dialog('close');
         ns.update_invoice_amount(bank_transaction_id);
       }
@@ -119,4 +130,14 @@ namespace('kivi.BankTransaction', function(ns) {
 
     $dlg.dialog('close');
   };
+
+  ns.filter_templates = function() {
+    var url="controller.pl?action=BankTransaction/filter_templates&" + $("#create_invoice_window form").serialize();
+    $.ajax({
+      url: url,
+      success: function(new_data) {
+        $("#templates").html(new_data.error || new_data.html);
+      }
+    });
+  };
 });