Steuerzone/Zahlungsbedingungen/Buchungskonto in Suchmaske zu Rechnungsberichten …

… aus dem Bereich "Kunde" bzw. "Lieferant" verschoben, da die Daten nicht aus
den Kunden- bzw. Lieferantenstammdaten, sondern aus den Rechnungsdaten gelesen
werden.

Behebt #37 (redmine)

diff --git a/templates/webpages/ap/search.html b/templates/webpages/ap/search.html
index 86aba06..daee315 100644 (file)
--- a/templates/webpages/ap/search.html
+++ b/templates/webpages/ap/search.html
@@ -143,6 +143,14 @@
            <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Document Project Number' | $T8 %]</td>
          </tr>
+          <tr>
+           <td align=right><input name="l_taxzone" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Steuersatz' | $T8 %]</td>
+           <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Payment Terms' | $T8 %]</td>
+           <td align=right><input name="l_charts" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Buchungskonto' | $T8 %]</td>
+          </tr>
          <tr>
           <td colspan=4 align=left><b>[% 'Vendor' | $T8 %] </td>
          </tr>
@@ -153,14 +161,6 @@
            <td nowrap>[% 'Country' | $T8 %]</td>
            <td align=right><input name="l_ustid" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'USt-IdNr.' | $T8 %]</td>
-           <td align=right><input name="l_taxzone" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>[% 'Steuersatz' | $T8 %]</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>[% 'Payment Terms' | $T8 %]</td>
-           <td align=right><input name="l_charts" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>[% 'Buchungskonto' | $T8 %]</td>
           </tr>
          </table>
         </td>

diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
index cf7b305..0790e2c 100644 (file)
--- a/templates/webpages/ar/search.html
+++ b/templates/webpages/ar/search.html
@@ -194,6 +194,14 @@
            <td align=right><input name="l_transaction_description" id="l_transaction_description" class=checkbox type=checkbox value=Y[% IF INSTANCE_CONF.get_require_transaction_description_ps %] checked[% END %]></td>
            <td nowrap>[% 'Transaction description' | $T8 %]</td>
           </tr>
+          <tr>
+           <td align=right><input name="l_taxzone" id="l_taxzone" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Steuersatz' | $T8 %]</td>
+           <td align=right><input name="l_payment_terms" id="l_payment_terms" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Payment Terms' | $T8 %]</td>
+           <td align=right><input name="l_charts" id="l_charts" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Buchungskonto' | $T8 %]</td>
+          </tr>
           <tr>
            <td colspan=4 align=left><b>[% 'Customer' | $T8 %] </td>
           </tr>
@@ -204,14 +212,6 @@
            <td nowrap>[% 'Country' | $T8 %]</td>
            <td align=right><input name="l_ustid" id="l_ustid" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'USt-IdNr.' | $T8 %]</td>
-           <td align=right><input name="l_taxzone" id="l_taxzone" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>[% 'Steuersatz' | $T8 %]</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_payment_terms" id="l_payment_terms" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>[% 'Payment Terms' | $T8 %]</td>
-           <td align=right><input name="l_charts" id="l_charts" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>[% 'Buchungskonto' | $T8 %]</td>
           </tr>
          </table>
         </td>