Ueberarbeitet r1807: System-> Kontenuebersicht-> Konten anzeigen.

Bitte testen.

diff --git a/SL/CA.pm b/SL/CA.pm
index 162a320..1a77102 100644 (file)
--- a/SL/CA.pm
+++ b/SL/CA.pm
@@ -86,24 +86,39 @@ sub all_accounts {
       c.pos_eur,
       c.valid_from,
       c.datevautomatik,
-      ( SELECT comma(taxkey_id)
-        FROM taxkeys tk
-        WHERE tk.chart_id = c.id
-          AND c.taxkey_id = tk.taxkey_id
-        ORDER BY c.id
-      ) AS taxkey_id,
+--      ( SELECT comma(taxkey_id)
+--        FROM taxkeys tk
+--        WHERE tk.chart_id = c.id
+--          AND c.taxkey_id = tk.taxkey_id
+--        ORDER BY c.id
+--      ) AS taxkey_id,
+
+      ( SELECT comma(taxkey)
+        FROM tax tx
+        WHERE tx.id in (
+          SELECT tk.tax_id from taxkeys tk 
+          WHERE tk.chart_id = c.id
+        ) 
+        ORDER BY c.accno
+      ) AS taxkey,
 
       ( SELECT comma(taxdescription)
         FROM tax tx
         WHERE tx.id in (
           SELECT tk.tax_id from taxkeys tk 
-          WHERE tk.chart_id = (
-            SELECT id from chart 
-            WHERE chart.accno='0027' -- Beispielkonto aus dem SKR03
-          )
+          WHERE tk.chart_id = c.id
         ) 
         ORDER BY c.accno
       ) AS taxdescription,
+      
+      ( SELECT comma(taxnumber)
+        FROM tax tx
+        WHERE tx.id in (
+          SELECT tk.tax_id from taxkeys tk 
+          WHERE tk.chart_id = c.id
+        ) 
+        ORDER BY c.accno
+      ) AS taxaccount,
 
       ( SELECT comma(tk.pos_ustva)
         FROM taxkeys tk

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 991c6c0..60814f2 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -575,12 +575,11 @@ sub list_account {
       $ca->{link} .= qq|[| . $link . qq|] |;
     }
     
-    $ca->{startdate} =~ s/,/<br>/og;
-    $ca->{tk_ustva}  =~ s/,/<br>/og;
-
-    $ca->{taxkey_id}  =~ s/,/<br>/og;
-    $ca->{taxdescription}  =~ s/,/<br>/og;
-
+    $ca->{startdate}      =~ s/,/<br>/og;
+    $ca->{tk_ustva}       =~ s/,/<br>/og;
+    $ca->{taxkey}         =~ s/,/<br>/og;
+    $ca->{taxaccount}     =~ s/,/<br>/og;
+    $ca->{taxdescription} =~ s/,/<br>/og;
     $ca->{datevautomatik} = ($ca->{datevautomatik}) ? $locale->text('On'):q{};
 
     $ca->{category} = ($ca->{category} eq 'A') ? $locale->text('Account Category A')

diff --git a/locale/de/all b/locale/de/all
index 9bb2955..243774e 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -484,7 +484,7 @@ gestartet',
   'Fee'                         => 'Gebühr',
   'File locked!'                => 'Datei gesperrt!',
   'Folgekonto'                  => 'Folgekonto',
-  'Following Account'           => 'Folgekonto',
+  'Following Account'           => 'Folge-<br />konto',
   'For each unit there\'s either no or exactly one base unit. If you chose a base unit then you also have to chose a factor. That way the new unit will be defined as a multiple of the base unit. The base unit must be the &quot;smaller&quot; one. A factor may not be less than 1. Therefore you may define &quot;kg&quot; with the base unit &quot;g&quot; and a factor of &quot;1&quot;, but not the other way round.' => 'Einheiten haben entweder keine oder genau eine Basiseinheit, von der sie ein Vielfaches sind. Wenn Sie eine Basiseinheit ausw&auml;hlen, dann m&uuml;ssen Sie auch einen Faktor eingeben. Sie m&uuml;ssen Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So ist die Definition von &quot;kg&quot; mit der Basiseinheit &quot;g&quot; und dem Faktor 1000 zul&auml;ssig, die Definition von &quot;g&quot; mit der Basiseinheit &quot;kg&quot; und dem Faktor &quot;0,001&quot; hingegen nicht.',
   'Foreign Exchange Gain'       => 'Wechselkurserträge',
   'Foreign Exchange Loss'       => 'Wechselkursaufwendungen',
@@ -988,8 +988,9 @@ gestartet',
   'Tax number'                  => 'Steuernummer',
   'Tax paid'                    => 'Vorsteuer',
   'Taxable'                     => 'Steuerpflichtig',
+  'Taxaccount'                  => 'Steuer Konto',
   'Taxation'                    => 'Versteuerungs Verfahren',
-  'Taxdescription'              => 'Beschreibung',
+  'Taxdescription'              => 'Steuerkonto<br />Beschreibung',
   'Taxkey'                      => 'Steuerschlüssel',
   'Tel'                         => 'Tel',
   'Tel.'                        => 'Telefon',

diff --git a/templates/webpages/am/list_accounts_de.html b/templates/webpages/am/list_accounts_de.html
index b41e5a6..b59db95 100644 (file)
--- a/templates/webpages/am/list_accounts_de.html
+++ b/templates/webpages/am/list_accounts_de.html
@@ -2,23 +2,24 @@
 
     <table border="0" cellpadding="3" cellspacing="3" width="100%">
       <tr>
-        <th class="listtop" colspan="12"><TMPL_VAR title ESCAPE=HTML></th>
+        <th class="listtop" colspan="14"><TMPL_VAR title ESCAPE=HTML></th>
       </tr>
-      <tr height=5></tr>
-      <tr class=listheading>
+      <tr height="5"></tr>
+      <tr class="listheading">
         <th colspan="3"><b>Kontonummer</b></th>
-        <th colspan="8"><b>Beschreibung</b></a></th>
+        <th colspan="9"><b>Beschreibung</b></a></th>
         <th rowspan="3">Haben</th>
         <th rowspan="3">Soll</th>
       </tr>  
-      <tr class=listheading>
+      <tr class="listheading">
         <th colspan="3"><b>Kontenart</b></th>
         
-        <th colspan="8">Verknüpfungen</th>
+        <th colspan="9">Verknüpfungen</th>
       </tr>
-      <tr class=listheading>
+      <tr class="listheading">
         <th>Steuerschlüssel</th>
-        <th>Beschreibung</th>
+        <th>Steuer Konto</th>
+        <th>Steuerkonto<br />Beschreibung</th>
         <th>Gültig ab</th>
         <th>tk_ustva</th>
         <th>UStVA</th>
@@ -26,22 +27,22 @@
         <th>Bilanz</th>
         <th>E/ÜR</th>
         <th>Datev</th>
+        <th>Folge-<br />konto</th>
         <th>Gültig ab</th>
-        <th>Folgekonto</th>
       </tr>
 
 <TMPL_LOOP CA>
 
   <TMPL_IF heading>
 
-      <tr class=listheading>
-        <td colspan="3" abbr="Kontonummer">
+      <tr class="listheading">
+        <td colspan="3">
           <a href=<TMPL_VAR link_edit_account> >
             <TMPL_VAR accno>
           </a>
         </td>
-        <td colspan="6">
-          <a href=<TMPL_VAR description> >
+        <td colspan="9">
+          <a href="<TMPL_VAR description>" >
             <TMPL_VAR accno>
           </a>
         </td>
@@ -51,58 +52,62 @@
 
   
     <TMPL_IF __odd__>
-        <tr valign=top class=listrow1>
+        <tr valign="top" class="listrow1">
     <TMPL_ELSE>
         
-        <tr valign=top class=listrow0>
+        <tr valign="top" class="listrow0">
     </TMPL_IF>
 
-          <td colspan="3" abbr="Kontonummer"><b>
+          <td colspan="3"><b>
             <a href="<TMPL_VAR link_edit_account>" ><TMPL_VAR accno></a>
           </td>
-          <td colspan="8"><b><TMPL_VAR description ESCAPE=HTML>&nbsp;</b></td>
+          <td colspan="9"><b><TMPL_VAR description ESCAPE=HTML>&nbsp;</b></td>
           <td rowspan="3" align=right><TMPL_VAR debit>&nbsp;</td>
           <td rowspan="3" align=right><TMPL_VAR credit>&nbsp;</td>
   
         </tr> 
                                  
     <TMPL_IF __odd__>
-        <tr valign=top class=listrow1>
+        <tr valign="top" class="listrow1">
     <TMPL_ELSE>
-        <tr valign=top class=listrow0>
+        <tr valign="top" class="listrow0">
     </TMPL_IF>
 
           <td colspan="3"><b><TMPL_VAR category ESCAPE=HTML>&nbsp;</b></td>
-          <td colspan="8"><TMPL_VAR link>&nbsp;</td>
+          <td colspan="9"><TMPL_VAR link>&nbsp;</td>
         </tr>                                
 
     <TMPL_IF __odd__>
-        <tr valign=top class=listrow1>
+        <tr class="listrow1">
     <TMPL_ELSE>
-        <tr valign=top class=listrow0>
+        <tr class="listrow0">
     </TMPL_IF>
 
-          <td><TMPL_VAR taxkey_id                  >&nbsp;</td>
-          <td nowrap="nowrap"><TMPL_VAR taxdescription             >&nbsp;</td>
-          <td><TMPL_VAR startdate                  >&nbsp;</td>
-          <td><TMPL_VAR tk_ustva                   >&nbsp;</td>
+          <td valign="top"><TMPL_VAR taxkey                     >&nbsp;</td>
+          <td valign="top"><TMPL_VAR taxaccount                 >&nbsp;</td>
+          <td valign="top"><TMPL_VAR taxdescription             >&nbsp;</td>
+          <td valign="top"><TMPL_VAR startdate                  >&nbsp;</td>
+          <td valign="top"><TMPL_VAR tk_ustva                   >&nbsp;</td>
 
-          <td><TMPL_VAR pos_ustva       ESCAPE=HTML>&nbsp;</td>
-          <td><TMPL_VAR pos_bwa         ESCAPE=HTML>&nbsp;</td>
-          <td><TMPL_VAR pos_bilanz      ESCAPE=HTML>&nbsp;</td>
-          <td><TMPL_VAR pos_eur         ESCAPE=HTML>&nbsp;</td>
-          <td><TMPL_VAR datevautomatik  ESCAPE=HTML>&nbsp;</td>
-          <td><TMPL_VAR valid_from      ESCAPE=HTML>&nbsp;</td>
-          <td><TMPL_VAR new_account     ESCAPE=HTML>&nbsp;</td>
+          <td valign="center"><TMPL_VAR pos_ustva       ESCAPE=HTML>&nbsp;</td>
+          <td valign="center"><TMPL_VAR pos_bwa         ESCAPE=HTML>&nbsp;</td>
+          <td valign="center"><TMPL_VAR pos_bilanz      ESCAPE=HTML>&nbsp;</td>
+          <td valign="center"><TMPL_VAR pos_eur         ESCAPE=HTML>&nbsp;</td>
+          <td valign="center"><TMPL_VAR datevautomatik  ESCAPE=HTML>&nbsp;</td>
+          <td valign="center"><TMPL_VAR new_account     ESCAPE=HTML>&nbsp;</td>
+          <td valign="center"><TMPL_VAR valid_from      ESCAPE=HTML>&nbsp;</td>
 
         </tr>
+        <tr>
+          <td colspan="14">&nbsp;</td>
+        </tr>
   </TMPL_IF>
 
 
 </TMPL_LOOP>
 
       <tr>
-        <td colspan=14><hr size=3 noshade></td>
+        <td colspan="14"><hr size="3" noshade="noshade"></td>
       </tr>
     </table>
       

diff --git a/templates/webpages/am/list_accounts_master.html b/templates/webpages/am/list_accounts_master.html
index ec7a19b..34862ec 100644 (file)
--- a/templates/webpages/am/list_accounts_master.html
+++ b/templates/webpages/am/list_accounts_master.html
@@ -2,22 +2,23 @@
 
     <table border="0" cellpadding="3" cellspacing="3" width="100%">
       <tr>
-        <th class="listtop" colspan="12"><TMPL_VAR title ESCAPE=HTML></th>
+        <th class="listtop" colspan="14"><TMPL_VAR title ESCAPE=HTML></th>
       </tr>
-      <tr height=5></tr>
-      <tr class=listheading>
+      <tr height="5"></tr>
+      <tr class="listheading">
         <th colspan="3"><b><translate>Account Number</translate></b></th>
-        <th colspan="8"><b><translate>Description</translate></b></a></th>
+        <th colspan="9"><b><translate>Description</translate></b></a></th>
         <th rowspan="3"><translate>Credit</translate></th>
         <th rowspan="3"><translate>Debit</translate></th>
       </tr>  
-      <tr class=listheading>
+      <tr class="listheading">
         <th colspan="3"><b><translate>category</translate></b></th>
         
-        <th colspan="8"><translate>Link</translate></th>
+        <th colspan="9"><translate>Link</translate></th>
       </tr>
-      <tr class=listheading>
+      <tr class="listheading">
         <th><translate>Taxkey</translate></th>
+        <th><translate>Taxaccount</translate></th>
         <th><translate>Taxdescription</translate></th>
         <th><translate>Startdate</translate></th>
         <th><translate>tk_ustva</translate></th>
@@ -26,22 +27,22 @@
         <th><translate>pos_bilanz</translate></th>
         <th><translate>pos_eur</translate></th>
         <th><translate>Datev</translate></th>
-        <th><translate>valid_from</translate></th>
         <th><translate>Following Account</translate></th>
+        <th><translate>valid_from</translate></th>
       </tr>
 
 <TMPL_LOOP CA>
 
   <TMPL_IF heading>
 
-      <tr class=listheading>
-        <td colspan="3" abbr="<translate>Account Number</translate>">
+      <tr class="listheading">
+        <td colspan="3">
           <a href=<TMPL_VAR link_edit_account> >
             <TMPL_VAR accno>
           </a>
         </td>
-        <td colspan="6">
-          <a href=<TMPL_VAR description> >
+        <td colspan="9">
+          <a href="<TMPL_VAR description>" >
             <TMPL_VAR accno>
           </a>
         </td>
@@ -51,58 +52,62 @@
 
   
     <TMPL_IF __odd__>
-        <tr valign=top class=listrow1>
+        <tr valign="top" class="listrow1">
     <TMPL_ELSE>
         
-        <tr valign=top class=listrow0>
+        <tr valign="top" class="listrow0">
     </TMPL_IF>
 
-          <td colspan="3" abbr="<translate>Account Number</translate>"><b>
+          <td colspan="3"><b>
             <a href="<TMPL_VAR link_edit_account>" ><TMPL_VAR accno></a>
           </td>
-          <td colspan="8"><b><TMPL_VAR description ESCAPE=HTML>&nbsp;</b></td>
+          <td colspan="9"><b><TMPL_VAR description ESCAPE=HTML>&nbsp;</b></td>
           <td rowspan="3" align=right><TMPL_VAR debit>&nbsp;</td>
           <td rowspan="3" align=right><TMPL_VAR credit>&nbsp;</td>
   
         </tr> 
                                  
     <TMPL_IF __odd__>
-        <tr valign=top class=listrow1>
+        <tr valign="top" class="listrow1">
     <TMPL_ELSE>
-        <tr valign=top class=listrow0>
+        <tr valign="top" class="listrow0">
     </TMPL_IF>
 
           <td colspan="3"><b><TMPL_VAR category ESCAPE=HTML>&nbsp;</b></td>
-          <td colspan="8"><TMPL_VAR link>&nbsp;</td>
+          <td colspan="9"><TMPL_VAR link>&nbsp;</td>
         </tr>                                
 
     <TMPL_IF __odd__>
-        <tr valign=top class=listrow1>
+        <tr class="listrow1">
     <TMPL_ELSE>
-        <tr valign=top class=listrow0>
+        <tr class="listrow0">
     </TMPL_IF>
 
-          <td><TMPL_VAR taxkey_id                  >&nbsp;</td>
-          <td nowrap="nowrap"><TMPL_VAR taxdescription             >&nbsp;</td>
-          <td><TMPL_VAR startdate                  >&nbsp;</td>
-          <td><TMPL_VAR tk_ustva                   >&nbsp;</td>
+          <td valign="top"><TMPL_VAR taxkey                     >&nbsp;</td>
+          <td valign="top"><TMPL_VAR taxaccount                 >&nbsp;</td>
+          <td valign="top"><TMPL_VAR taxdescription             >&nbsp;</td>
+          <td valign="top"><TMPL_VAR startdate                  >&nbsp;</td>
+          <td valign="top"><TMPL_VAR tk_ustva                   >&nbsp;</td>
 
-          <td><TMPL_VAR pos_ustva       ESCAPE=HTML>&nbsp;</td>
-          <td><TMPL_VAR pos_bwa         ESCAPE=HTML>&nbsp;</td>
-          <td><TMPL_VAR pos_bilanz      ESCAPE=HTML>&nbsp;</td>
-          <td><TMPL_VAR pos_eur         ESCAPE=HTML>&nbsp;</td>
-          <td><TMPL_VAR datevautomatik  ESCAPE=HTML>&nbsp;</td>
-          <td><TMPL_VAR valid_from      ESCAPE=HTML>&nbsp;</td>
-          <td><TMPL_VAR new_account     ESCAPE=HTML>&nbsp;</td>
+          <td valign="center"><TMPL_VAR pos_ustva       ESCAPE=HTML>&nbsp;</td>
+          <td valign="center"><TMPL_VAR pos_bwa         ESCAPE=HTML>&nbsp;</td>
+          <td valign="center"><TMPL_VAR pos_bilanz      ESCAPE=HTML>&nbsp;</td>
+          <td valign="center"><TMPL_VAR pos_eur         ESCAPE=HTML>&nbsp;</td>
+          <td valign="center"><TMPL_VAR datevautomatik  ESCAPE=HTML>&nbsp;</td>
+          <td valign="center"><TMPL_VAR new_account     ESCAPE=HTML>&nbsp;</td>
+          <td valign="center"><TMPL_VAR valid_from      ESCAPE=HTML>&nbsp;</td>
 
         </tr>
+        <tr>
+          <td colspan="14">&nbsp;</td>
+        </tr>
   </TMPL_IF>
 
 
 </TMPL_LOOP>
 
       <tr>
-        <td colspan=14><hr size=3 noshade></td>
+        <td colspan="14"><hr size="3" noshade="noshade"></td>
       </tr>
     </table>