Kontoauszug verbuchen: bei Vorschlägen Rechnungsnummer in Verwendungszweck highlighten

diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css
index dd1ff541fd5b7dd676a7ae3f57850a5bd59c5be4..f74c98d90252a9000f110663c792c3e8d47571a1 100644 (file)
--- a/css/kivitendo/main.css
+++ b/css/kivitendo/main.css
@@ -520,3 +520,10 @@ span.toggle_selected {
     max-width: 16px;
     max-height: 16px;
 }
     max-width: 16px;
     max-height: 16px;
 }

+
+/* Bank transactions */
+#bank_transactions_proposals .invoice_number_highlight a,
+#bank_transactions_proposals span.invoice_number_highlight {
+  background-color: #006400;
+  color: #FFFFFF;
+}

diff --git a/css/lx-office-erp/main.css b/css/lx-office-erp/main.css
index b3f2442680493ca1f24e2a68a759600e0d2a4083..44c437f178233f9e781779c22e9259d404b1c55b 100644 (file)
--- a/css/lx-office-erp/main.css
+++ b/css/lx-office-erp/main.css
@@ -527,3 +527,10 @@ a.red {
     max-width: 16px;
     max-height: 16px;
 }
     max-width: 16px;
     max-height: 16px;
 }

+
+/* Bank transactions */
+#bank_transactions_proposals .invoice_number_highlight a,
+#bank_transactions_proposals span.invoice_number_highlight {
+  background-color: #006400;
+  color: #FFFFFF;
+}

diff --git a/templates/webpages/bank_transactions/tabs/automatic.html b/templates/webpages/bank_transactions/tabs/automatic.html
index 63f6d16e108dfd603809960ebeb1d59ae604933f..9caf5017829b73634d3e284780de49c5aee811a5 100644 (file)
--- a/templates/webpages/bank_transactions/tabs/automatic.html
+++ b/templates/webpages/bank_transactions/tabs/automatic.html
@@ -7,7 +7,7 @@
 [% L.hidden_tag('action', 'BankTransaction/dispatch') %]
 [% L.hidden_tag('ui_tab', ui_tab) %]
 
 [% L.hidden_tag('action', 'BankTransaction/dispatch') %]
 [% L.hidden_tag('ui_tab', ui_tab) %]
 

-<table>
+<table id="bank_transactions_proposals">

   <thead>
     <tr class="listheading">
       <th>[% L.checkbox_tag('check_all') %]</th>
   <thead>
     <tr class="listheading">
       <th>[% L.checkbox_tag('check_all') %]</th>


@@ -38,7 +38,21 @@
           <td>[% proposal.transdate_as_date %]</td>
           <td align="right">[% LxERP.format_amount(proposal.amount,2) %]</td>
           <td></td>
           <td>[% proposal.transdate_as_date %]</td>
           <td align="right">[% LxERP.format_amount(proposal.amount,2) %]</td>
           <td></td>

-          <td>[% HTML.escape(proposal.purpose) %]</td>
+          <td>
+           [% SET purpose = HTML.escape(proposal.purpose)
+                  invnumber_found = '' ;
+              FOREACH proposed_invoice = proposal.proposals;
+                IF purpose.match(proposed_invoice.invnumber);
+                  SET invnumber_found = proposed_invoice.invnumber ;
+                END ;
+              END ;
+
+              IF invnumber_found ;
+                purpose.replace(invnumber_found, '<span class="invoice_number_highlight">' _ invnumber_found _ '</span>') ;
+              ELSE ;
+                purpose ;
+              END %]
+          </td>

           <td>[% HTML.escape(proposal.remote_name) %]</td>
         </tr>
 
           <td>[% HTML.escape(proposal.remote_name) %]</td>
         </tr>
 


@@ -53,11 +67,11 @@
           <td align="right">[% proposed_invoice.realamount %]</td>
           <td>[% proposed_invoice.skonto_type | $T8 %]
               [% L.hidden_tag("invoice_skontos." _ proposal.id _ "[]", proposed_invoice.skonto_type) %]</td>
           <td align="right">[% proposed_invoice.realamount %]</td>
           <td>[% proposed_invoice.skonto_type | $T8 %]
               [% L.hidden_tag("invoice_skontos." _ proposal.id _ "[]", proposed_invoice.skonto_type) %]</td>

-          <td>[% proposed_invoice.link %]</td>
+          <td[% IF proposed_invoice.invnumber == invnumber_found %] class="invoice_number_highlight"[% END %]>[% proposed_invoice.link %]</td>

           <td>[% HTML.escape(proposed_invoice.customer.name) %][% HTML.escape(proposed_invoice.vendor.name) %]</td>
         </tr>
         [% END %]
           <td>[% HTML.escape(proposed_invoice.customer.name) %][% HTML.escape(proposed_invoice.vendor.name) %]</td>
         </tr>
         [% END %]

-        <tr><td style="height:10px"></td></tr>
+        <tr><td style="height:10px" colspan="8"></td></tr>

       </tbody>
     [% END %]
   [% END %]
       </tbody>
     [% END %]
   [% END %]