From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 16 May 2011 15:33:32 +0000 (+0200)
Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.3~25^2~27
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/1889a90c69d49efe8cad029c7a3b7baf6b4d0c6e?hp=74b9dd679e1c5d10ad19e79e1bbed1c3651d6af8

Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
---

diff --git a/SL/DB/Helper/Attr.pm b/SL/DB/Helper/Attr.pm
index 463bfd654..94b53dd7f 100644
--- a/SL/DB/Helper/Attr.pm
+++ b/SL/DB/Helper/Attr.pm
@@ -30,7 +30,7 @@ sub make {
 sub _make_by_type {
   my ($package, $name, $type) = @_;
   _as_number ($package, $name, places => -2) if $type =~ /numeric | real | float/xi;
-  _as_percent($package, $name, places =>  0) if $type =~ /numeric | real | float/xi;
+  _as_percent($package, $name, places =>  2) if $type =~ /numeric | real | float/xi;
   _as_number ($package, $name, places =>  0) if $type =~ /int/xi;
   _as_date   ($package, $name)               if $type =~ /date | timestamp/xi;
 }
diff --git a/t/helper/attr.t b/t/helper/attr.t
index 4de1a53ff..cad0a0f9c 100644
--- a/t/helper/attr.t
+++ b/t/helper/attr.t
@@ -34,7 +34,7 @@ is($o->reqdate_as_date, '12.04.2010');
 is($o->marge_percent_as_percent('40'), '40');
 is($o->marge_percent, 0.40);
 is($o->marge_percent_as_percent, '40');
-is($o->marge_percent_as_percent('22,4'), '22');
+is($o->marge_percent_as_percent('22,4'), '22,40');
 is($o->marge_percent, 0.224);
 is($o->marge_percent_as_percent, '22');
 is($o->marge_percent(0.231), 0.231);
diff --git a/templates/webpages/payment_term/form.html b/templates/webpages/payment_term/form.html
index 3e7ee1816..973940d76 100755
--- a/templates/webpages/payment_term/form.html
+++ b/templates/webpages/payment_term/form.html
@@ -47,7 +47,7 @@
    <tr>
     <td>[%- 'Skonto' | $T8 %]</td>
     <td>
-     <input name="payment_term.percent_skonto_as_number" value="[%- HTML.escape(SELF.payment_term.percent_skonto_as_number) %]" size="6">%
+     <input name="payment_term.percent_skonto_as_percent" value="[%- HTML.escape(SELF.payment_term.percent_skonto_as_percent) %]" size="6">%
     </td>
    </tr>
   </table>
diff --git a/templates/webpages/payment_term/list.html b/templates/webpages/payment_term/list.html
index 8563137d3..fd1ffd927 100644
--- a/templates/webpages/payment_term/list.html
+++ b/templates/webpages/payment_term/list.html
@@ -38,7 +38,7 @@
      <td>[%- HTML.escape(payment_term.description_long) %]</td>
      <td align="right">[%- HTML.escape(payment_term.terms_netto_as_number) %]</td>
      <td align="right">[%- HTML.escape(payment_term.terms_skonto_as_number) %]</td>
-     <td align="right">[%- HTML.escape(payment_term.percent_skonto_as_number) %] %</td>
+     <td align="right">[%- HTML.escape(payment_term.percent_skonto_as_percent) %] %</td>
     </tr>
     [%- END %]
     </tbody>