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 463bfd654e5c3812b5e8d51e458172a03d42f1ae..94b53dd7f9f15b25285a16317043c94ecf346f40 100644 (file)
--- 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 4de1a53ffe9944d2754522c7c25c3c952aaa0074..cad0a0f9cf6b42eba79131fa4ae8abbae0393433 100644 (file)
--- 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 3e7ee181663078e855dccb7beddd436243bf642d..973940d766f1ea4cb22c88de96a15e6a386d9f24 100755 (executable)
--- 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 8563137d347a658e4ea2120dc39cb4b1dbbfea37..fd1ffd927073bb9c40485143eec62307286e4605 100644 (file)
--- 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>