From: G. Richardson Date: Tue, 7 Jan 2014 09:12:35 +0000 (+0100) Subject: Bilanzbericht aktualisiert und aus Druckvorlagen entfernt X-Git-Tag: release-3.1.0beta1~22^2~37 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=edb2023a832f426553a7d90342ebc56200f325f1;p=kivitendo-erp.git Bilanzbericht aktualisiert und aus Druckvorlagen entfernt Bilanz-HTML-Vorlage aus Druckvorlagen entfernt, befindet sich schon länger zentral in templates/rp. Bilanz zeigt jetzt das Berichtsdatum mit aus. --- diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index da60add0d..bb87a77e3 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -397,8 +397,9 @@ sub generate_balance_sheet { my $data = RP->balance_sheet(\%::myconfig, $::form); - $::form->{asofdate} ||= $::form->current_date; - $::form->{period} = $::locale->date(\%::myconfig, $::form->current_date, 1); + $::form->{asofdate} ||= $::form->current_date; + $::form->{report_title} = $::locale->text('Balance Sheet'); + $::form->{report_date} ||= $::form->current_date; ($::form->{department}) = split /--/, $::form->{department}; @@ -409,6 +410,8 @@ sub generate_balance_sheet { $::form->{this_period} = $::locale->date(\%::myconfig, $::form->{asofdate}, 0); $::form->{last_period} = $::locale->date(\%::myconfig, $::form->{compareasofdate}, 0); +# balance sheet isn't read from print templates anymore, +# instead use template in rp # $::form->{IN} = "balance_sheet.html"; $::form->header; diff --git a/locale/de/all b/locale/de/all index 6d60fb809..e7c9de414 100755 --- a/locale/de/all +++ b/locale/de/all @@ -270,6 +270,7 @@ $self->{texts} = { 'Background jobs and task server' => 'Hintergrund-Jobs und Task-Server', 'Balance' => 'Bilanz', 'Balance Sheet' => 'Bilanz', + 'Balance sheet date' => 'Bilanzstichtag', 'Balancing' => 'Bilanzierung', 'Bank' => 'Bank', 'Bank Code' => 'BLZ', @@ -1345,6 +1346,7 @@ $self->{texts} = { 'Name and Street' => 'Name und Straße', 'National Expenses' => 'Aufwand Inland', 'National Revenues' => 'Erlöse Inland', + 'Net Income Statement' => 'Einnahmenüberschußrechnung', 'Net amount' => 'Nettobetrag', 'Net amount (for verification)' => 'Nettobetrag (zur Überprüfung)', 'Netto Terms' => 'Zahlungsziel netto', @@ -1746,6 +1748,7 @@ $self->{texts} = { 'Report about warehouse contents' => 'Lagerbestand anzeigen', 'Report about warehouse transactions' => 'Lagerbuchungen anzeigen', 'Report and misc. Preferences' => 'Sonstige Einstellungen', + 'Report date' => 'Berichtsdatum', 'Report for' => 'Bericht für', 'Reports' => 'Berichte', 'Representative' => 'Vertreter', diff --git a/templates/print/RB/balance_sheet.html b/templates/print/RB/balance_sheet.html deleted file mode 100644 index 985b6eff5..000000000 --- a/templates/print/RB/balance_sheet.html +++ /dev/null @@ -1,100 +0,0 @@ - - - -

-<%company%> -
<%address%> - -

BILANZ -
<%period%> -

- - - - - - - - -<%foreach asset_account%> - - - - - - -<%end asset_account%> - - - - - - - - - - - - - - - - - -<%foreach liability_account%> - - - - - - -<%end liability_account%> - - - - - - - - - - - - - - - - -<%foreach equity_account%> - - - - - - -<%end equity_account%> - - - - - - - - - - - - - - - - - -
AKTIVA
<%this_period%><%last_period%>
<%asset_account%><%asset_this_period%><%asset_last_period%>
TOTAL<%total_assets_this_period%>
<%total_assets_last_period%>
PASSIVA
<%liability_account%><%liability_this_period%><%liability_last_period%>
TOTAL<%total_liabilities_this_period%>
- 		<%total_liabilities_last_period%>
-
EIGENTUM
<%equity_account%><%equity_this_period%><%equity_last_period%>
TOTAL<%total_equity_this_period%>
- 		<%total_equity_last_period%>
-
TOTAL PASSIVA & EIGENTUM<%total_this_period%>
<%total_last_period%>
- - - diff --git a/templates/print/Standard/balance_sheet.html b/templates/print/Standard/balance_sheet.html deleted file mode 100644 index 985b6eff5..000000000 --- a/templates/print/Standard/balance_sheet.html +++ /dev/null @@ -1,100 +0,0 @@ - - - -

-<%company%> -
<%address%> - -

BILANZ -
<%period%> -

- - - - - - - - -<%foreach asset_account%> - - - - - - -<%end asset_account%> - - - - - - - - - - - - - - - - - -<%foreach liability_account%> - - - - - - -<%end liability_account%> - - - - - - - - - - - - - - - - -<%foreach equity_account%> - - - - - - -<%end equity_account%> - - - - - - - - - - - - - - - - - -
AKTIVA
<%this_period%><%last_period%>
<%asset_account%><%asset_this_period%><%asset_last_period%>
TOTAL<%total_assets_this_period%>
<%total_assets_last_period%>
PASSIVA
<%liability_account%><%liability_this_period%><%liability_last_period%>
TOTAL<%total_liabilities_this_period%>
- 		<%total_liabilities_last_period%>
-
EIGENTUM
<%equity_account%><%equity_this_period%><%equity_last_period%>
TOTAL<%total_equity_this_period%>
- 		<%total_equity_last_period%>
-
TOTAL PASSIVA & EIGENTUM<%total_this_period%>
<%total_last_period%>
- - - diff --git a/templates/print/f-tex/balance_sheet.html b/templates/print/f-tex/balance_sheet.html deleted file mode 100644 index 478caabca..000000000 --- a/templates/print/f-tex/balance_sheet.html +++ /dev/null @@ -1,100 +0,0 @@ - - - -

-<%company%> -
<%address%> - -

BALANCE SHEET -
<%period%> -

- - - - - - - - -<%foreach asset_account%> - - - - - - -<%end asset_account%> - - - - - - - - - - - - - - - - - -<%foreach liability_account%> - - - - - - -<%end liability_account%> - - - - - - - - - - - - - - - - -<%foreach equity_account%> - - - - - - -<%end equity_account%> - - - - - - - - - - - - - - - - - -
ASSETS
<%this_period%><%last_period%>
<%asset_account%><%asset_this_period%><%asset_last_period%>
TOTAL ASSETS<%total_assets_this_period%>
<%total_assets_last_period%>
LIABILITIES
<%liability_account%><%liability_this_period%><%liability_last_period%>
Total Liabilities<%total_liabilities_this_period%>
- 		<%total_liabilities_last_period%>
-
SHAREHOLDER'S EQUITY
<%equity_account%><%equity_this_period%><%equity_last_period%>
Total Equity<%total_equity_this_period%>
- 		<%total_equity_last_period%>
-
TOTAL LIABILITIES & EQUITY<%total_this_period%>
<%total_last_period%>
- - - diff --git a/templates/webpages/rp/balance_sheet.html b/templates/webpages/rp/balance_sheet.html index 675790db3..fad142cb4 100644 --- a/templates/webpages/rp/balance_sheet.html +++ b/templates/webpages/rp/balance_sheet.html @@ -5,14 +5,15 @@ [% company %]
[% address %]

[% 'BALANCE SHEET' | $T8 %] -
[% period %] +
[% 'Balance sheet date' | $T8 %]: [% this_period %] +
[% 'Report date' | $T8 %]: [% report_date %] - - + + [% FOREACH row = A %]
[% 'ASSETS' | $T8 %]
[% this_period %][% last_period %][% this_period %][% last_period %]