projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
$form->parse_template() verwendet $form->{OUT} direkt oder indirekt in open(). Desweg...
[kivitendo-erp.git]
/
bin
/
mozilla
/
cp.pl
diff --git
a/bin/mozilla/cp.pl
b/bin/mozilla/cp.pl
index
ce41747
..
c7b85c6
100644
(file)
--- a/
bin/mozilla/cp.pl
+++ b/
bin/mozilla/cp.pl
@@
-36,7
+36,8
@@
use SL::OP;
use SL::IS;
use SL::IR;
use SL::IS;
use SL::IR;
-require "$form->{path}/arap.pl";
+require "bin/mozilla/arap.pl";
+require "bin/mozilla/common.pl";
1;
1;
@@
-87,7
+88,7
@@
sub payment {
} @{ $form->{PR}{ $form->{ARAP} } };
# currencies
} @{ $form->{PR}{ $form->{ARAP} } };
# currencies
- @curr = split
/:/, $form->{currencies}
;
+ @curr = split
(/:/, $form->{currencies})
;
chomp $curr[0];
$form->{defaultcurrency} = $form->{currency} = $form->{oldcurrency} =
$curr[0];
chomp $curr[0];
$form->{defaultcurrency} = $form->{currency} = $form->{oldcurrency} =
$curr[0];
@@
-183,7
+184,7
@@
sub form_header {
# with JavaScript Calendar
$button1 = qq|
# 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>
|;
<input type=button name=datepaid id="trigger1" value=|
. $locale->text('button') . qq|></td>
|;
@@
-195,15
+196,17
@@
sub form_header {
# without JavaScript Calendar
$button1 = qq|
# 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};
$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|
print qq|
-<body>
+<body
onLoad="$onload"
>
<form method=post action=$form->{script}>
<form method=post action=$form->{script}>
@@
-305,7
+308,7
@@
sub form_header {
<tr>
<th align=right nowrap>| . $locale->text('Amount') . qq|</th>
<td colspan=3><input name=amount size=10 value=|
<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|
onBlur=\"check_right_number_format(this)\"
></td>
</tr>
</table>
</td>
</tr>
</table>
</td>
@@
-464,7
+467,6
@@
sub form_footer {
</table>
<input type=hidden name=rowcount value=$form->{rowcount}>
</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 type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
@@
-483,14
+485,7
@@
sub form_footer {
print qq|
<select name=format>$format</select>
<select name=media>$media</select>
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>
</form>
</body>
@@
-675,7
+670,7
@@
sub print {
&check_form;
&check_form;
- ($whole, $form->{decimal}) = split
/\./, $form->{amount}
;
+ ($whole, $form->{decimal}) = split
(/\./, $form->{amount})
;
$form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2);
$form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2);
@@
-686,7
+681,7
@@
sub print {
$check->init;
$form->{text_amount} = $check->num2text($whole);
$check->init;
$form->{text_amount} = $check->num2text($whole);
-
&{"$form->{vc}_details"}
;
+
call_sub("$form->{vc}_details")
;
$form->{callback} = "";
$form->{callback} = "";
@@
-700,11
+695,13
@@
sub print {
$form->{pdf} = 1;
}
$form->{pdf} = 1;
}
+ delete $form->{OUT};
+
if ($form->{media} eq 'printer') {
$form->{OUT} = "| $myconfig{printer}";
}
if ($form->{media} eq 'queue') {
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";
if ($filename = $queued{ $form->{formname} }) {
unlink "$spool/$filename";
@@
-728,7
+725,7
@@
sub print {
if ($form->{media} ne 'screen') {
$form->{callback} =
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!'));
$form->redirect if (CP->process_payment(\%myconfig, \%$form));
$form->error($locale->text('Cannot post payment!'));
@@
-762,7
+759,7
@@
sub check_form {
$form->{amount} = $amount;
for $i (1 .. $form->{rowcount}) {
$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"});
$amount -= $form->parse_amount($myconfig, $form->{"paid_$i"});
push(@{ $form->{paid} }, $form->{"paid_$i"});