From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 30 Jan 2017 12:26:02 +0000 (+0100)
Subject: Kontoauszug verbuchen: aus Zuweisung entfernen zeigt Rechnung wieder in Vorschlägen
X-Git-Tag: release-3.5.4~1605
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=04a484b367929f48854b6120229076747726de53;p=kivitendo-erp.git

Kontoauszug verbuchen: aus Zuweisung entfernen zeigt Rechnung wieder in Vorschlägen
---

diff --git a/js/kivi.BankTransaction.js b/js/kivi.BankTransaction.js
index 730e07a4b..08f51334c 100644
--- a/js/kivi.BankTransaction.js
+++ b/js/kivi.BankTransaction.js
@@ -13,7 +13,7 @@ namespace('kivi.BankTransaction', function(ns) {
   };
 
   ns.add_invoices = function(bank_transaction_id, proposal_id) {
-    $('[name=' + proposal_id + ']').remove();
+    $('[data-proposal-id=' + proposal_id + ']').hide();
 
     $.ajax({
       url: 'controller.pl?action=BankTransaction/ajax_payment_suggestion&bt_id=' + bank_transaction_id  + '&prop_id=' + proposal_id,
@@ -25,6 +25,7 @@ namespace('kivi.BankTransaction', function(ns) {
 
   ns.delete_invoice = function(bank_transaction_id, proposal_id) {
     $( "#" + bank_transaction_id + "\\." + proposal_id ).remove();
+    $('[data-proposal-id=' + proposal_id + ']').show();
   };
 
   ns.create_invoice = function(bank_transaction_id) {
diff --git a/templates/webpages/bank_transactions/tabs/all.html b/templates/webpages/bank_transactions/tabs/all.html
index 04287be9a..529b1dc63 100644
--- a/templates/webpages/bank_transactions/tabs/all.html
+++ b/templates/webpages/bank_transactions/tabs/all.html
@@ -91,7 +91,7 @@
      [% END %]
      <td>
       [% FOREACH prop = bt.proposals %]
-        <div name='[% prop.id %]'>
+        <div data-proposal-id="[% prop.id %]">
          <a href=# onclick="kivi.BankTransaction.add_invoices('[% bt.id %]', '[% prop.id %]');"
             title="<table><tr><th></th><th>[% 'Suggested invoice' | $T8 %][% IF !prop.is_sales %] ([% 'AP' | $T8 %])[% END %]</th><th>[% 'Bank transaction' | $T8 %]</th></tr><tr><th>[% 'Amount' | $T8 %]</th><td>[% prop.realamount %] ([% 'open' | $T8 %]: [% LxERP.format_amount(prop.open_amount, 2) %])</td><td>[% LxERP.format_amount(bt.amount, 2) %]</td></tr>[% IF prop.skonto_date %]<tr><th>[% 'Payment terms' | $T8 %]</th><td>[% LxERP.format_amount(prop.amount_less_skonto, 2) %] [% 'until' | $T8 %] [% HTML.escape(prop.skonto_date.to_kivitendo) %] ([% prop.percent_skonto * 100 %] %)</td><td></td></tr>[% END %]<tr><th>[% 'Customer/Vendor' | $T8 %]</th><td>[% HTML.escape(prop.customer.displayable_name) %][% HTML.escape(prop.vendor.displayable_name) %]</td><td>[% HTML.escape(bt.remote_name) %]</td></tr><tr><th>[% 'Invoice Date' | $T8 %]</th><td>[% HTML.escape(prop.transdate_as_date) %]</td><td>[% HTML.escape(bt.transdate_as_date) %] ([% HTML.escape(bt.transdate.utc_rd_days - prop.transdate.utc_rd_days) %])</td></tr><tr><th>[% 'Invoice Number' | $T8 %]</th><td>[% HTML.escape(prop.invnumber) %]</td><td>[% HTML.escape(bt.purpose) %]</td></tr></table>"
               class="[% IF bt.agreement >= 5 %]green[% ELSIF bt.agreement < 5 and bt.agreement >= 3 %]orange[% ELSE %]red[% END %] tooltipster-html">&larr;[% HTML.escape(prop.invnumber)%]</a></div>