projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
10c58e4
)
Debitoren-/Kreditorenbuchungen: Zahlungsdatum mit aktuellem Datum vorbelegen
author
Moritz Bunkus
<m.bunkus@linet-services.de>
Tue, 29 Sep 2015 13:27:20 +0000
(15:27 +0200)
committer
Moritz Bunkus
<m.bunkus@linet-services.de>
Tue, 29 Sep 2015 14:43:53 +0000
(16:43 +0200)
bin/mozilla/ap.pl
patch
|
blob
|
history
bin/mozilla/ar.pl
patch
|
blob
|
history
templates/webpages/ap/form_header.html
patch
|
blob
|
history
templates/webpages/ar/form_header.html
patch
|
blob
|
history
diff --git
a/bin/mozilla/ap.pl
b/bin/mozilla/ap.pl
index
7e7fbde
..
b2e5819
100644
(file)
--- a/
bin/mozilla/ap.pl
+++ b/
bin/mozilla/ap.pl
@@
-410,7
+410,9
@@
sub form_header {
$form->{paid_missing} = $form->{invtotal_unformatted} - $form->{totalpaid};
$form->{paid_missing} = $form->{invtotal_unformatted} - $form->{totalpaid};
- print $form->parse_html_template('ap/form_header');
+ print $form->parse_html_template('ap/form_header', {
+ today => DateTime->today,
+ });
$main::lxdebug->leave_sub();
}
$main::lxdebug->leave_sub();
}
diff --git
a/bin/mozilla/ar.pl
b/bin/mozilla/ar.pl
index
e43361f
..
38a667e
100644
(file)
--- a/
bin/mozilla/ar.pl
+++ b/
bin/mozilla/ar.pl
@@
-442,6
+442,7
@@
sub form_header {
ARselected => $ARselected,
title_str => $title,
follow_up_trans_info => $follow_up_trans_info,
ARselected => $ARselected,
title_str => $title,
follow_up_trans_info => $follow_up_trans_info,
+ today => DateTime->today,
});
$main::lxdebug->leave_sub();
});
$main::lxdebug->leave_sub();
diff --git
a/templates/webpages/ap/form_header.html
b/templates/webpages/ap/form_header.html
index
59457ee
..
4d81f9d
100644
(file)
--- a/
templates/webpages/ap/form_header.html
+++ b/
templates/webpages/ap/form_header.html
@@
-283,7
+283,7
@@
[% temp = "datepaid_"_ i %]
<td align="center">
[% IF( changeable ) %]
[% temp = "datepaid_"_ i %]
<td align="center">
[% IF( changeable ) %]
- [% L.date_tag(temp, $temp) %]
+ [% L.date_tag(temp, $temp
? $temp : today
) %]
[% ELSE %]
[% $temp | html %]
<input type="hidden" name="[% temp %]" value="[% $temp | html %]">
[% ELSE %]
[% $temp | html %]
<input type="hidden" name="[% temp %]" value="[% $temp | html %]">
diff --git
a/templates/webpages/ar/form_header.html
b/templates/webpages/ar/form_header.html
index
6bce66a
..
0f58867
100644
(file)
--- a/
templates/webpages/ar/form_header.html
+++ b/
templates/webpages/ar/form_header.html
@@
-213,7
+213,7
@@
<tr>
<td align=center>
[%- IF row.changeable %]
<tr>
<td align=center>
[%- IF row.changeable %]
- [% L.date_tag('datepaid_' _ loop.count, row.datepaid) %]
+ [% L.date_tag('datepaid_' _ loop.count, row.datepaid
? row.datepaid : today
) %]
[%- ELSE %]
[% row.datepaid | html %][% L.hidden_tag('datepaid_' _ loop.count, row.datepaid) %]
[%- END %]
[%- ELSE %]
[% row.datepaid | html %][% L.hidden_tag('datepaid_' _ loop.count, row.datepaid) %]
[%- END %]