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

Bilanzfunktion:
- Dezimalstellen
---

diff --git a/SL/RP.pm b/SL/RP.pm
index d9902050b..ebc0dd688 100644
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -46,9 +46,7 @@ use warnings;
 #
 # stuff missing from the original implementation:
 # - bold stuff
-# - format (2 places, varying signs of negative amounts)
-# - rounding (might not be necessary)
-# - accno and subdescription
+# - subdescription
 # - proper testing for heading charts
 # - transmission from $form to TMPL realm is not as clear as i'd like
 sub balance_sheet {
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index fea72bcdb..7075c4de7 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -1091,6 +1091,7 @@ sub generate_balance_sheet {
 
   $auth->assert('report');
 
+  $form->{decimalplaces} = $form->{decimalplaces} * 1 || 2;
   $form->{padding} = "&nbsp;&nbsp;";
   $form->{bold}    = "<b>";
   $form->{endbold} = "</b>";
diff --git a/templates/webpages/rp/balance_sheet_de.html b/templates/webpages/rp/balance_sheet_de.html
index 7dd49e064..04ad4412a 100644
--- a/templates/webpages/rp/balance_sheet_de.html
+++ b/templates/webpages/rp/balance_sheet_de.html
@@ -20,9 +20,9 @@
   <tr>
     <td> </td>
     <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
-    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
+    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
     [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
+    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
     [%- END %]
   </tr>
   [% END %]
@@ -36,9 +36,9 @@
 
   <tr valign="top">
     <th align="left" colspan="2">TOTAL</th>
-    <td align="right">[% LxERP.format_amount(total.A.this,2) %]<hr noshade size="2"></td>
+    <td align="right">[% LxERP.format_amount(total.A.this, decimalplaces) %]<hr noshade size="2"></td>
     [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(total.A.last,2) %]<hr noshade size="2"></td>
+    <td align="right">[% LxERP.format_amount(total.A.last, decimalplaces) %]<hr noshade size="2"></td>
     [%- END %]
   </tr>
 [% END %]
@@ -51,9 +51,9 @@
   <tr>
     <td></td>
     <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
-    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
+    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
     [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
+    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
     [%- END %]
   </tr>
   [% END %]
@@ -68,9 +68,9 @@
   <tr valign="top">
     <td></td>
     <th align="left">TOTAL</th>
-    <td align="right">[% LxERP.format_amount(total.L.this,2) %]<br><hr noshade size="2"</td>
+    <td align="right">[% LxERP.format_amount(total.L.this, decimalplaces) %]<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>
+    <td align="right">[% LxERP.format_amount(total.L.last, decimalplaces) %]<br><hr noshade size="2"</td>
     [%- END %]
   </tr>
 [% END %]
@@ -82,10 +82,10 @@
   [% FOREACH row = Q %]
   <tr>
     <td></td>
-    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
-    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
+    <td>[% row.description %]</td>
+    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
     [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
+    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
     [%- END %]
   </tr>
   [% END  %]
@@ -100,18 +100,18 @@
   <tr valign="top">
     <td></td>
     <th align="left">TOTAL</th>
-    <td align="right">[% LxERP.format_amount(total.Q.this,2) %]<br><hr noshade size="2"</td>
+    <td align="right">[% LxERP.format_amount(total.Q.this, decimalplaces) %]<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>
+    <td align="right">[% LxERP.format_amount(total.Q.last, decimalplaces) %]<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">[% LxERP.format_amount(total.this,2) %]<br><hr noshade size="2"></td>
+    <td align="right">[% LxERP.format_amount(total.this, decimalplaces) %]<br><hr noshade size="2"></td>
     [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(total.last,2) %]<br><hr noshade size="2"></td>
+    <td align="right">[% LxERP.format_amount(total.last, decimalplaces) %]<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 5890987d1..fc3b8eedd 100644
--- a/templates/webpages/rp/balance_sheet_master.html
+++ b/templates/webpages/rp/balance_sheet_master.html
@@ -20,9 +20,9 @@
   <tr>
     <td> </td>
     <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
-    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
+    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
     [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
+    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
     [%- END %]
   </tr>
   [% END %]
@@ -36,9 +36,9 @@
 
   <tr valign="top">
     <th align="left" colspan="2"><translate>TOTAL</translate></th>
-    <td align="right">[% LxERP.format_amount(total.A.this,2) %]<hr noshade size="2"></td>
+    <td align="right">[% LxERP.format_amount(total.A.this, decimalplaces) %]<hr noshade size="2"></td>
     [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(total.A.last,2) %]<hr noshade size="2"></td>
+    <td align="right">[% LxERP.format_amount(total.A.last, decimalplaces) %]<hr noshade size="2"></td>
     [%- END %]
   </tr>
 [% END %]
@@ -51,9 +51,9 @@
   <tr>
     <td></td>
     <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
-    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
+    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
     [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
+    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
     [%- END %]
   </tr>
   [% END %]
@@ -68,9 +68,9 @@
   <tr valign="top">
     <td></td>
     <th align="left"><translate>TOTAL</translate></th>
-    <td align="right">[% LxERP.format_amount(total.L.this,2) %]<br><hr noshade size="2"</td>
+    <td align="right">[% LxERP.format_amount(total.L.this, decimalplaces) %]<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>
+    <td align="right">[% LxERP.format_amount(total.L.last, decimalplaces) %]<br><hr noshade size="2"</td>
     [%- END %]
   </tr>
 [% END %]
@@ -83,9 +83,9 @@
   <tr>
     <td></td>
     <td>[% row.description %]</td>
-    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
+    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
     [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
+    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
     [%- END %]
   </tr>
   [% END  %]
@@ -100,18 +100,18 @@
   <tr valign="top">
     <td></td>
     <th align="left"><translate>TOTAL</translate></th>
-    <td align="right">[% LxERP.format_amount(total.Q.this,2) %]<br><hr noshade size="2"</td>
+    <td align="right">[% LxERP.format_amount(total.Q.this, decimalplaces) %]<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>
+    <td align="right">[% LxERP.format_amount(total.Q.last, decimalplaces) %]<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">[% LxERP.format_amount(total.this,2) %]<br><hr noshade size="2"></td>
+    <td align="right">[% LxERP.format_amount(total.this, decimalplaces) %]<br><hr noshade size="2"></td>
     [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(total.last,2) %]<br><hr noshade size="2"></td>
+    <td align="right">[% LxERP.format_amount(total.last, decimalplaces) %]<br><hr noshade size="2"></td>
     [%- END %]
   </tr>
 </table>