use SL::IS;
use SL::IR;
-require "$form->{path}/arap.pl";
+require "bin/mozilla/arap.pl";
+require "bin/mozilla/common.pl";
1;
} @{ $form->{PR}{ $form->{ARAP} } };
# currencies
- @curr = split /:/, $form->{currencies};
+ @curr = split(/:/, $form->{currencies});
chomp $curr[0];
$form->{defaultcurrency} = $form->{currency} = $form->{oldcurrency} =
$curr[0];
</tr>
| if $form->{selectdepartment};
- $form->{jsscript} = $jscalendar;
+ $form->{jsscript} = 1;
$jsscript = "";
if ($form->{jsscript}) {
# with JavaScript Calendar
$button1 = qq|
- <td><input name=datepaid id=datepaid size=11 title="$myconfig{dateformat}" value="$form->{datepaid}">
+ <td><input name=datepaid id=datepaid size=11 title="$myconfig{dateformat}" value="$form->{datepaid}" onBlur=\"check_right_date_format(this)\">
<input type=button name=datepaid id="trigger1" value=|
- . $locale->text('button')
- . qq|></td>
+ . $locale->text('button') . qq|></td>
|;
#write Trigger
# without JavaScript Calendar
$button1 = qq|
- <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"></td>|;
+ <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\"></td>|;
}
-
+ $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
$form->header;
$arap = lc $form->{ARAP};
-
+ $onload = qq|focus()|;
+ $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
+ $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
print qq|
-<body>
+<body onLoad="$onload">
<form method=post action=$form->{script}>
<td colspan=3><input name=source value="$form->{source}" size=10></td>
</tr>
<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>
+ <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|" onBlur=\"check_right_number_format(this)\"></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|
</table>
<input type=hidden name=rowcount value=$form->{rowcount}>
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
<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;
&check_form;
- ($whole, $form->{decimal}) = split /\./, $form->{amount};
+ ($whole, $form->{decimal}) = split(/\./, $form->{amount});
$form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2);
- $form->{decimal} .= "00";
+ #$form->{decimal} .= "00";
$form->{decimal} = substr($form->{decimal}, 0, 2);
$check = new CP $myconfig{countrycode};
$check->init;
$form->{text_amount} = $check->num2text($whole);
- &{"$form->{vc}_details"};
+ call_sub("$form->{vc}_details");
$form->{callback} = "";
$form->{pdf} = 1;
}
+ delete $form->{OUT};
+
if ($form->{media} eq 'printer') {
$form->{OUT} = "| $myconfig{printer}";
}
if ($form->{media} eq 'queue') {
- %queued = split / /, $form->{queued};
+ %queued = map { s|.*/|| } split / /, $form->{queued};
if ($filename = $queued{ $form->{formname} }) {
unlink "$spool/$filename";
$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->{callback} =
- "$form->{script}?action=payment&vc=$form->{vc}&path=$form->{path}&login=$form->{login}&password=$form->{password}&all_vc=$form->{all_vc}";
+ "$form->{script}?action=payment&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&all_vc=$form->{all_vc}";
$form->redirect if (CP->process_payment(\%myconfig, \%$form));
$form->error($locale->text('Cannot post payment!'));
exit;
}
+ $form->error($locale->text('Zero amount posting!')) if !$form->parse_amount(\%myconfig, $form->{amount});
$form->error($locale->text('Date missing!')) unless $form->{datepaid};
$closedto = $form->datetonum($form->{closedto}, \%myconfig);
$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"});