projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bc524b0)
Bilanzbericht aktualisiert und aus Druckvorlagen entfernt
authorG. Richardson <information@kivitendo-premium.de>
Tue, 7 Jan 2014 09:12:35 +0000 (10:12 +0100)
committerG. Richardson <information@kivitendo-premium.de>
Tue, 7 Jan 2014 10:03:02 +0000 (11:03 +0100)
Bilanz-HTML-Vorlage aus Druckvorlagen entfernt, befindet sich schon
länger zentral in templates/rp.

Bilanz zeigt jetzt das Berichtsdatum mit aus.

bin/mozilla/rp.pl patch | blob | history
locale/de/all patch | blob | history
templates/print/RB/balance_sheet.html [deleted file] patch | blob | history
templates/print/Standard/balance_sheet.html [deleted file] patch | blob | history
templates/print/f-tex/balance_sheet.html [deleted file] patch | blob | history
templates/webpages/rp/balance_sheet.html patch | blob | history

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index da60add..bb87a77 100644 (file)
--- 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 6d60fb8..e7c9de4 100755 (executable)
--- 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&ouml;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 (file)
index 985b6ef..0000000
--- a/templates/print/RB/balance_sheet.html
+++ /dev/null
@@ -1,100 +0,0 @@
-
-<body bgcolor="#ffffff">
-
-<h2 align="center">
-<%company%>
-<br><%address%>
-
-<p>BILANZ
-<br><%period%>
-</h2>
-
-<table border="0">
-<tr>
-  <th align="left" width="400" colspan="2">AKTIVA<br><hr align="left" width="250" size="5" noshade></th>
-  <th><%this_period%></th>
-  <th><%last_period%></th>
-</tr>
-
-<%foreach asset_account%>
-<tr>
-  <td> </td>
-  <td><%asset_account%></td>
-  <td align="right"><%asset_this_period%></td>
-  <td align="right"><%asset_last_period%></td>
-</tr>
-<%end asset_account%>
-
-<tr>
-  <td colspan="2"> </td>
-  <td><hr noshade size="1"></td>
-  <td><hr noshade size="1"></td>
-</tr>
-
-<tr valign="top">
-  <th align="left" colspan="2">TOTAL</th>
-  <td align="right"><%total_assets_this_period%><hr noshade size="2"></td>
-  <td align="right"><%total_assets_last_period%><hr noshade size="2"></td>
-</tr>
-
-<tr>
-  <th align="left" colspan="4">PASSIVA<b><hr align="left" width="250" size="5" noshade></th>
-</tr>
-
-<%foreach liability_account%>
-<tr>
-  <td></td>
-  <td><%liability_account%></td>
-  <td align="right"><%liability_this_period%></td>
-  <td align="right"><%liability_last_period%></td>
-</tr>
-<%end liability_account%>
-
-<tr>
-  <td colspan="2"> </td>
-  <td><hr noshade size="1"></td>
-  <td><hr noshade size="1"></td>
-</tr>
-
-<tr valign="top">
-  <td></td>
-  <th align="left">TOTAL</th>
-  <td align="right"><%total_liabilities_this_period%><br><hr noshade size="2"</td>
-  <td align="right"><%total_liabilities_last_period%><br><hr noshade size="2"</td>
-</tr>
-
-<tr>
-  <th align="left" colspan="4">EIGENTUM<br><hr align="left" width="250" size="5" noshade></th>
-</tr>
-
-<%foreach equity_account%>
-<tr>
-  <td></td>
-  <td><%equity_account%></td>
-  <td align="right"><%equity_this_period%></td>
-  <td align="right"><%equity_last_period%></td>
-</tr>
-<%end equity_account%>
-
-<tr>
-  <td colspan="2"> </td>
-  <td><hr noshade size="1"></td>
-  <td><hr noshade size="1"></td>
-</tr>
-
-<tr valign="top">
-  <td></td>
-  <th align="left">TOTAL</th>
-  <td align="right"><%total_equity_this_period%><br><hr noshade size="2"</td>
-  <td align="right"><%total_equity_last_period%><br><hr noshade size="2"</td>
-</tr>
-
-<tr valign="top">
-  <th align="left" colspan="2">TOTAL PASSIVA &amp; EIGENTUM</th>
-  <td align="right"><%total_this_period%><br><hr noshade size="2"></td>
-  <td align="right"><%total_last_period%><br><hr noshade size="2"></td>
-</tr>
-</table>
-
-
-
diff --git a/templates/print/Standard/balance_sheet.html b/templates/print/Standard/balance_sheet.html
deleted file mode 100644 (file)
index 985b6ef..0000000
--- a/templates/print/Standard/balance_sheet.html
+++ /dev/null
@@ -1,100 +0,0 @@
-
-<body bgcolor="#ffffff">
-
-<h2 align="center">
-<%company%>
-<br><%address%>
-
-<p>BILANZ
-<br><%period%>
-</h2>
-
-<table border="0">
-<tr>
-  <th align="left" width="400" colspan="2">AKTIVA<br><hr align="left" width="250" size="5" noshade></th>
-  <th><%this_period%></th>
-  <th><%last_period%></th>
-</tr>
-
-<%foreach asset_account%>
-<tr>
-  <td> </td>
-  <td><%asset_account%></td>
-  <td align="right"><%asset_this_period%></td>
-  <td align="right"><%asset_last_period%></td>
-</tr>
-<%end asset_account%>
-
-<tr>
-  <td colspan="2"> </td>
-  <td><hr noshade size="1"></td>
-  <td><hr noshade size="1"></td>
-</tr>
-
-<tr valign="top">
-  <th align="left" colspan="2">TOTAL</th>
-  <td align="right"><%total_assets_this_period%><hr noshade size="2"></td>
-  <td align="right"><%total_assets_last_period%><hr noshade size="2"></td>
-</tr>
-
-<tr>
-  <th align="left" colspan="4">PASSIVA<b><hr align="left" width="250" size="5" noshade></th>
-</tr>
-
-<%foreach liability_account%>
-<tr>
-  <td></td>
-  <td><%liability_account%></td>
-  <td align="right"><%liability_this_period%></td>
-  <td align="right"><%liability_last_period%></td>
-</tr>
-<%end liability_account%>
-
-<tr>
-  <td colspan="2"> </td>
-  <td><hr noshade size="1"></td>
-  <td><hr noshade size="1"></td>
-</tr>
-
-<tr valign="top">
-  <td></td>
-  <th align="left">TOTAL</th>
-  <td align="right"><%total_liabilities_this_period%><br><hr noshade size="2"</td>
-  <td align="right"><%total_liabilities_last_period%><br><hr noshade size="2"</td>
-</tr>
-
-<tr>
-  <th align="left" colspan="4">EIGENTUM<br><hr align="left" width="250" size="5" noshade></th>
-</tr>
-
-<%foreach equity_account%>
-<tr>
-  <td></td>
-  <td><%equity_account%></td>
-  <td align="right"><%equity_this_period%></td>
-  <td align="right"><%equity_last_period%></td>
-</tr>
-<%end equity_account%>
-
-<tr>
-  <td colspan="2"> </td>
-  <td><hr noshade size="1"></td>
-  <td><hr noshade size="1"></td>
-</tr>
-
-<tr valign="top">
-  <td></td>
-  <th align="left">TOTAL</th>
-  <td align="right"><%total_equity_this_period%><br><hr noshade size="2"</td>
-  <td align="right"><%total_equity_last_period%><br><hr noshade size="2"</td>
-</tr>
-
-<tr valign="top">
-  <th align="left" colspan="2">TOTAL PASSIVA &amp; EIGENTUM</th>
-  <td align="right"><%total_this_period%><br><hr noshade size="2"></td>
-  <td align="right"><%total_last_period%><br><hr noshade size="2"></td>
-</tr>
-</table>
-
-
-
diff --git a/templates/print/f-tex/balance_sheet.html b/templates/print/f-tex/balance_sheet.html
deleted file mode 100644 (file)
index 478caab..0000000
--- a/templates/print/f-tex/balance_sheet.html
+++ /dev/null
@@ -1,100 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<h2 align=center>
-<%company%>
-<br><%address%>
-
-<p>BALANCE SHEET
-<br><%period%>
-</h2>
-
-<table border=0>
-<tr>
-  <th align=left width=400 colspan=2>ASSETS<br><hr align=left width=250 size=5 noshade></th>
-  <th><%this_period%></th>
-  <th><%last_period%></th>
-</tr>
-
-<%foreach asset_account%>
-<tr>
-  <td> </td>
-  <td><%asset_account%></td>
-  <td align=right><%asset_this_period%></td>
-  <td align=right><%asset_last_period%></td>
-</tr>
-<%end asset_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <th align=left colspan=2>TOTAL ASSETS</th>
-  <td align=right><%total_assets_this_period%><hr noshade size=2></td>
-  <td align=right><%total_assets_last_period%><hr noshade size=2></td>
-</tr>
-
-<tr>
-  <th align=left colspan=4>LIABILITIES<b><hr align=left width=250 size=5 noshade></th>
-</tr>
-
-<%foreach liability_account%>
-<tr>
-  <td></td>
-  <td><%liability_account%></td>
-  <td align=right><%liability_this_period%></td>
-  <td align=right><%liability_last_period%></td>
-</tr>
-<%end liability_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <td></td>
-  <th align=left>Total Liabilities</th>
-  <td align=right><%total_liabilities_this_period%><br><hr noshade size=2</td>
-  <td align=right><%total_liabilities_last_period%><br><hr noshade size=2</td>
-</tr>
-
-<tr>
-  <th align=left colspan=4>SHAREHOLDER'S EQUITY<br><hr align=left width=250 size=5 noshade></th>
-</tr>
-
-<%foreach equity_account%>
-<tr>
-  <td></td>
-  <td><%equity_account%></td>
-  <td align=right><%equity_this_period%></td>
-  <td align=right><%equity_last_period%></td>
-</tr>
-<%end equity_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <td></td>
-  <th align=left>Total Equity</th>
-  <td align=right><%total_equity_this_period%><br><hr noshade size=2</td>
-  <td align=right><%total_equity_last_period%><br><hr noshade size=2</td>
-</tr>
-
-<tr valign=top>
-  <th align=left colspan=2>TOTAL LIABILITIES & EQUITY</th>
-  <td align=right><%total_this_period%><br><hr noshade size=2></td>
-  <td align=right><%total_last_period%><br><hr noshade size=2></td>
-</tr>
-</table>
-
-
-
diff --git a/templates/webpages/rp/balance_sheet.html b/templates/webpages/rp/balance_sheet.html
index 675790d..fad142c 100644 (file)
--- a/templates/webpages/rp/balance_sheet.html
+++ b/templates/webpages/rp/balance_sheet.html
@@ -5,14 +5,15 @@
 [% company %]
 <br>[% address %]
 <p>[% 'BALANCE SHEET' | $T8 %]
-<br>[% period %]
+<br>[% 'Balance sheet date' | $T8 %]: [% this_period %]
+<br>[% 'Report date' | $T8 %]: [% report_date %]
 </h2>
 
 <table border="0">
   <tr>
     <th align="left" width="400" colspan="2">[% 'ASSETS' | $T8 %]<br><hr align="left" width="250" size="5" noshade></th>
-    <th>[% this_period %]</th>
-    <th>[% last_period %]</th>
+    <th><b>[% this_period %]<b></th>
+    <th><b>[% last_period %]<b></th>
   </tr>
 
   [% FOREACH row = A %]
Unnamed repository; edit this file 'description' to name the repository.