From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 6 Apr 2009 15:19:11 +0000 (+0000)
Subject: Bilanzfunktion:
X-Git-Tag: release-2.6.0beta2~117
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=fdee0091f00479361820f0f98fe896a14e605b18;p=kivitendo-erp.git

Bilanzfunktion:
- Kontonummern
- korrekte Formatierungen
---

diff --git a/SL/RP.pm b/SL/RP.pm
index 87dda3df9..d9902050b 100644
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -66,9 +66,6 @@ sub balance_sheet {
     $form->{period} = $form->{this_period} = conv_dateq($form->{asofdate});
   }
 
-  $form->{decimalplaces} *= 1;
-  my $dec = $form->{decimalplaces};
-
   get_accounts($dbh, $last_period, "", $form->{asofdate}, $form, \@categories);
 
   # if there are any compare dates
diff --git a/templates/webpages/rp/balance_sheet_de.html b/templates/webpages/rp/balance_sheet_de.html
index 8ee0dca29..7dd49e064 100644
--- a/templates/webpages/rp/balance_sheet_de.html
+++ b/templates/webpages/rp/balance_sheet_de.html
@@ -19,9 +19,11 @@
   [% FOREACH row = A %]
   <tr>
     <td> </td>
-    <td>[% row.description %]</td>
-    <td align="right">[% row.this %]</td>
-    <td align="right">[% row.last %]</td>
+    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
+    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
+    [%- END %]
   </tr>
   [% END %]
 
@@ -34,8 +36,10 @@
 
   <tr valign="top">
     <th align="left" colspan="2">TOTAL</th>
-    <td align="right">[% total.A.this %]<hr noshade size="2"></td>
-    <td align="right">[% total.A.last %]<hr noshade size="2"></td>
+    <td align="right">[% LxERP.format_amount(total.A.this,2) %]<hr noshade size="2"></td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(total.A.last,2) %]<hr noshade size="2"></td>
+    [%- END %]
   </tr>
 [% END %]
 
@@ -46,9 +50,11 @@
   [% FOREACH row = L %]
   <tr>
     <td></td>
-    <td>[% row.description %]</td>
-    <td align="right">[% row.this %]</td>
-    <td align="right">[% row.last %]</td>
+    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
+    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
+    [%- END %]
   </tr>
   [% END %]
 
@@ -62,8 +68,10 @@
   <tr valign="top">
     <td></td>
     <th align="left">TOTAL</th>
-    <td align="right">[% total.L.this %]<br><hr noshade size="2"</td>
-    <td align="right">[% total.L.last %]<br><hr noshade size="2"</td>
+    <td align="right">[% LxERP.format_amount(total.L.this,2) %]<br><hr noshade size="2"</td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(total.L.last,2) %]<br><hr noshade size="2"</td>
+    [%- END %]
   </tr>
 [% END %]
 
@@ -74,9 +82,11 @@
   [% FOREACH row = Q %]
   <tr>
     <td></td>
-    <td>[% row.description %]</td>
-    <td align="right">[% row.this %]</td>
-    <td align="right">[% row.last %]</td>
+    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
+    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
+    [%- END %]
   </tr>
   [% END  %]
 
@@ -90,14 +100,18 @@
   <tr valign="top">
     <td></td>
     <th align="left">TOTAL</th>
-    <td align="right">[% total.Q.this %]<br><hr noshade size="2"</td>
-    <td align="right">[% total.Q.last %]<br><hr noshade size="2"</td>
+    <td align="right">[% LxERP.format_amount(total.Q.this,2) %]<br><hr noshade size="2"</td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(total.Q.last,2) %]<br><hr noshade size="2"</td>
+    [%- END %]
   </tr>
 [% END %]
 
   <tr valign="top">
     <th align="left" colspan="2">TOTAL PASSIVA &amp; EIGENTUM</th>
-    <td align="right">[% total.this %]<br><hr noshade size="2"></td>
-    <td align="right">[% total.last %]<br><hr noshade size="2"></td>
+    <td align="right">[% LxERP.format_amount(total.this,2) %]<br><hr noshade size="2"></td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(total.last,2) %]<br><hr noshade size="2"></td>
+    [%- END %]
   </tr>
 </table>
diff --git a/templates/webpages/rp/balance_sheet_master.html b/templates/webpages/rp/balance_sheet_master.html
index a89b01d16..5890987d1 100644
--- a/templates/webpages/rp/balance_sheet_master.html
+++ b/templates/webpages/rp/balance_sheet_master.html
@@ -19,9 +19,11 @@
   [% FOREACH row = A %]
   <tr>
     <td> </td>
-    <td>[% row.description %]</td>
-    <td align="right">[% row.this %]</td>
-    <td align="right">[% row.last %]</td>
+    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
+    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
+    [%- END %]
   </tr>
   [% END %]
 
@@ -34,8 +36,10 @@
 
   <tr valign="top">
     <th align="left" colspan="2"><translate>TOTAL</translate></th>
-    <td align="right">[% total.A.this %]<hr noshade size="2"></td>
-    <td align="right">[% total.A.last %]<hr noshade size="2"></td>
+    <td align="right">[% LxERP.format_amount(total.A.this,2) %]<hr noshade size="2"></td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(total.A.last,2) %]<hr noshade size="2"></td>
+    [%- END %]
   </tr>
 [% END %]
 
@@ -46,9 +50,11 @@
   [% FOREACH row = L %]
   <tr>
     <td></td>
-    <td>[% row.description %]</td>
-    <td align="right">[% row.this %]</td>
-    <td align="right">[% row.last %]</td>
+    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
+    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
+    [%- END %]
   </tr>
   [% END %]
 
@@ -62,8 +68,10 @@
   <tr valign="top">
     <td></td>
     <th align="left"><translate>TOTAL</translate></th>
-    <td align="right">[% total.L.this %]<br><hr noshade size="2"</td>
-    <td align="right">[% total.L.last %]<br><hr noshade size="2"</td>
+    <td align="right">[% LxERP.format_amount(total.L.this,2) %]<br><hr noshade size="2"</td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(total.L.last,2) %]<br><hr noshade size="2"</td>
+    [%- END %]
   </tr>
 [% END %]
 
@@ -75,8 +83,10 @@
   <tr>
     <td></td>
     <td>[% row.description %]</td>
-    <td align="right">[% row.this %]</td>
-    <td align="right">[% row.last %]</td>
+    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
+    [%- END %]
   </tr>
   [% END  %]
 
@@ -90,14 +100,18 @@
   <tr valign="top">
     <td></td>
     <th align="left"><translate>TOTAL</translate></th>
-    <td align="right">[% total.Q.this %]<br><hr noshade size="2"</td>
-    <td align="right">[% total.Q.last %]<br><hr noshade size="2"</td>
+    <td align="right">[% LxERP.format_amount(total.Q.this,2) %]<br><hr noshade size="2"</td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(total.Q.last,2) %]<br><hr noshade size="2"</td>
+    [%- END %]
   </tr>
 [% END %]
 
   <tr valign="top">
     <th align="left" colspan="2"><translate>TOTAL</translate> <translate>LIABILITIES</translate> &amp; <translate>EQUITY</translate></th>
-    <td align="right">[% total.this %]<br><hr noshade size="2"></td>
-    <td align="right">[% total.last %]<br><hr noshade size="2"></td>
+    <td align="right">[% LxERP.format_amount(total.this,2) %]<br><hr noshade size="2"></td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(total.last,2) %]<br><hr noshade size="2"></td>
+    [%- END %]
   </tr>
 </table>