$button1 = qq|
<td><input name=datepaid id=datepaid size=11 title="$myconfig{dateformat}" value="$form->{datepaid}">
<input type=button name=datepaid id="trigger1" value=|
- . $locale->text('button')
- . qq|></td>
+ . $locale->text('button') . qq|></td>
|;
#write Trigger
$jsscript =
- Form->write_trigger(\%myconfig, "1", "datepaid", "BL", "trigger1", "",
- "", "");
+ Form->write_trigger(\%myconfig, "1", "datepaid", "BL", "trigger1");
} else {
# without JavaScript Calendar
<tr>
<th align=right nowrap>| . $locale->text('Amount') . qq|</th>
<td colspan=3><input name=amount size=10 value=|
- . $form->format_amount(\%myconfig, $form->{amount}, 2)
- . qq|></td>
+ . $form->format_amount(\%myconfig, $form->{amount}, 2) . qq|></td>
</tr>
</table>
</td>
for $i (1 .. $form->{rowcount}) {
map {
- $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
+ $form->{"${_}_$i"} =
+ $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
} qw(amount due paid);
$totalamount += $form->{"amount_$i"};
$media = qq|
<option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
- if ($myconfig{printer} && $latex) {
+ if ($myconfig{printer} && $latex_templates) {
$media .= qq|
<option value=printer $form->{OP}{printer}>|
. $locale->text('Printer');
}
- if ($latex) {
+ if ($latex_templates) {
$media .= qq|
<option value=queue $form->{OP}{queue}>| . $locale->text('Queue');
$format .= qq|
<input class=submit type=submit name=action value="|
. $locale->text('Post') . qq|">|;
- if ($latex) {
+ if ($latex_templates) {
print qq|
<input class=submit type=submit name=action value="|
. $locale->text('Print') . qq|">|;
print qq|
<select name=format>$format</select>
<select name=media>$media</select>
-|;
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
- print qq|
</form>
</body>
}
# recalculate
- $amount = $form->{amount};
+
+ # Modified from $amount = $form->{amount} by J.Zach to update amount to total
+ # payment amount in Zahlungsausgang
+ $amount = 0;
for $i (1 .. $form->{rowcount}) {
map {
- $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
+ $form->{"${_}_$i"} =
+ $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
} qw(amount due paid);
if ($form->{"checked_$i"}) {
$form->{"paid_$i"} = $form->{"due_$i"};
}
- $amount -= $form->{"paid_$i"};
+ # Modified by J.Zach, see abovev
+ $amount += $form->{"paid_$i"};
+
} else {
$form->{"paid_$i"} = "";
}
}
+ # Line added by J.Zach, see above
+ $form->{amount}=$amount;
+
&form_header;
&list_invoices;
&form_footer;
$form->{company} = $myconfig{company};
$form->{address} = $myconfig{address};
- @a =
- qw(name invnumber company address text_amount street zipcode city country memo);
- $form->format_string(@a);
-
$form->parse_template(\%myconfig, $userspath);
if ($form->{media} ne 'screen') {
$form->{amount} = $amount;
for $i (1 .. $form->{rowcount}) {
- if ($form->{"paid_$i"}) {
+ if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
$amount -= $form->parse_amount($myconfig, $form->{"paid_$i"});
push(@{ $form->{paid} }, $form->{"paid_$i"});