From: Udo Spallek Date: Fri, 2 Feb 2007 17:03:42 +0000 (+0000) Subject: Ueberarbeitet r1807: System-> Kontenuebersicht-> Konten anzeigen. X-Git-Tag: release-2.4.2~157 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e0d47e23c8ef3863f7c2387e49e2207f9140f0db;p=kivitendo-erp.git Ueberarbeitet r1807: System-> Kontenuebersicht-> Konten anzeigen. Bitte testen. --- diff --git a/SL/CA.pm b/SL/CA.pm index 162a320f6..1a7710239 100644 --- 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 991c6c0df..60814f2dc 100644 --- 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/,/
/og; - $ca->{tk_ustva} =~ s/,/
/og; - - $ca->{taxkey_id} =~ s/,/
/og; - $ca->{taxdescription} =~ s/,/
/og; - + $ca->{startdate} =~ s/,/
/og; + $ca->{tk_ustva} =~ s/,/
/og; + $ca->{taxkey} =~ s/,/
/og; + $ca->{taxaccount} =~ s/,/
/og; + $ca->{taxdescription} =~ s/,/
/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 9bb295542..243774e23 100644 --- 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-
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 "smaller" one. A factor may not be less than 1. Therefore you may define "kg" with the base unit "g" and a factor of "1", 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ählen, dann müssen Sie auch einen Faktor eingeben. Sie müssen Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So ist die Definition von "kg" mit der Basiseinheit "g" und dem Faktor 1000 zulässig, die Definition von "g" mit der Basiseinheit "kg" und dem Faktor "0,001" 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
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 b41e5a63b..b59db9587 100644 --- a/templates/webpages/am/list_accounts_de.html +++ b/templates/webpages/am/list_accounts_de.html @@ -2,23 +2,24 @@ - + - - + + - + - + - + - + - + + @@ -26,22 +27,22 @@ + - - - + - @@ -51,58 +52,62 @@ - + - + - - + - + - + - + - + - + - - - - + + + + + - - - - - - - + + + + + + + + + + - +
KontonummerBeschreibungBeschreibung Haben Soll
KontenartVerknüpfungenVerknüpfungen
SteuerschlüsselBeschreibungSteuer KontoSteuerkonto
Beschreibung		 Gültig ab tk_ustva UStVABilanz E/ÜR DatevFolge-
konto		 Gültig abFolgekonto
+
> - > + +
+       
   
                       
 
diff --git a/templates/webpages/am/list_accounts_master.html b/templates/webpages/am/list_accounts_master.html index ec7a19ba5..34862ec4a 100644 --- a/templates/webpages/am/list_accounts_master.html +++ b/templates/webpages/am/list_accounts_master.html @@ -2,22 +2,23 @@ - + - - + + - + - + - + - + + @@ -26,22 +27,22 @@ - + - - + - @@ -51,58 +52,62 @@ - + - + - - + - + - + - + - + - + - - - - + + + + + - - - - - - - + + + + + + + + + + - +
Account NumberDescriptionDescription Credit Debit
categoryLinkLink
TaxkeyTaxaccount Taxdescription Startdate tk_ustvapos_bilanz pos_eur Datevvalid_from Following Accountvalid_from
+
> - > + +
+