From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 17 Sep 2015 13:35:37 +0000 (+0200)
Subject: Bei Zahlungsausgang heutiges Datum vorbelegen
X-Git-Tag: release-3.4.1~730
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=01678c873dfa6fcbe5003789e79d8b7ad7c93551;p=kivitendo-erp.git

Bei Zahlungsausgang heutiges Datum vorbelegen
---

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 2a3c59f41..86f78a807 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -429,6 +429,7 @@ sub form_footer {
     show_delete         => ($::instance_conf->get_ir_changeable == 2)
                              ? ($form->current_date(\%myconfig) eq $form->{gldate})
                              : ($::instance_conf->get_ir_changeable == 1),
+    today               => DateTime->today,
   });
 ##print $form->parse_html_template('ir/_payments'); # parser
 ##print $form->parse_html_template('webdav/_list'); # parser
diff --git a/templates/webpages/ir/_payments.html b/templates/webpages/ir/_payments.html
index cb4088622..63da6fcea 100644
--- a/templates/webpages/ir/_payments.html
+++ b/templates/webpages/ir/_payments.html
@@ -1,6 +1,7 @@
 [%- USE T8 %]
 [%- USE LxERP %]
 [%- USE L %]
+[%- USE HTML %]
   <tr>
    <td>
     <table width="100%">
@@ -43,7 +44,11 @@
 
     <td align="center">
     [% IF $changeable %]
-      [% L.date_tag('datepaid_'_ i, $datepaid) %]
+      [% IF $datepaid %]
+        [% L.date_tag('datepaid_'_ i, $datepaid) %]
+      [% ELSE %]
+        [% L.date_tag('datepaid_'_ i, today) %]
+      [% END %]
     [% ELSE %]
       <input type="hidden" name="datepaid_[% i %]" value="[% $datepaid %]">[% $datepaid %]
     [% END %]
@@ -106,7 +111,7 @@
       <td></td>
       <td></td>
       <td align="center">[% 'Total' | $T8 %]</td>
-      <td align="center">[% LxERP.foramt_amount(totalpaid, 2) | html %]</td>
+      <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %]</td>
     </tr>
     <tr>
       <td></td>