projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Den Dialog zum Bearbeiten der Mahnungskonfiguration auf die Verwendung von HTML-Vorla...
[kivitendo-erp.git]
/
bin
/
mozilla
/
gl.pl
diff --git
a/bin/mozilla/gl.pl
b/bin/mozilla/gl.pl
index
464fb01
..
faaad58
100644
(file)
--- a/
bin/mozilla/gl.pl
+++ b/
bin/mozilla/gl.pl
@@
-34,7
+34,7
@@
use SL::GL;
use SL::PE;
use SL::GL;
use SL::PE;
-require "
$form->{path}
/arap.pl";
+require "
bin/mozilla
/arap.pl";
require "bin/mozilla/common.pl";
1;
require "bin/mozilla/common.pl";
1;
@@
-75,7
+75,7
@@
sub add {
$form->{title} = "Add";
$form->{callback} =
$form->{title} = "Add";
$form->{callback} =
- "$form->{script}?action=add&
path=$form->{path}&
login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
# we use this only to set a default date
unless $form->{callback};
# we use this only to set a default date
@@
-233,12
+233,12
@@
sub search {
# with JavaScript Calendar
$button1 = qq|
# with JavaScript Calendar
$button1 = qq|
- <td><input name=datefrom id=datefrom size=11 title="$myconfig{dateformat}">
+ <td><input name=datefrom id=datefrom size=11 title="$myconfig{dateformat}"
onBlur=\"check_right_date_format(this)\"
>
<input type=button name=datefrom id="trigger1" value=|
. $locale->text('button') . qq|></td>
|;
$button2 = qq|
<input type=button name=datefrom id="trigger1" value=|
. $locale->text('button') . qq|></td>
|;
$button2 = qq|
- <td><input name=dateto id=dateto size=11 title="$myconfig{dateformat}">
+ <td><input name=dateto id=dateto size=11 title="$myconfig{dateformat}"
onBlur=\"check_right_date_format(this)\"
>
<input type=button name=dateto id="trigger2" value=|
. $locale->text('button') . qq|></td>
|;
<input type=button name=dateto id="trigger2" value=|
. $locale->text('button') . qq|></td>
|;
@@
-251,15
+251,17
@@
sub search {
# without JavaScript Calendar
$button1 =
# without JavaScript Calendar
$button1 =
- qq|<td><input name=datefrom id=datefrom size=11 title="$myconfig{dateformat}"></td>|;
+ qq|<td><input name=datefrom id=datefrom size=11 title="$myconfig{dateformat}"
onBlur=\"check_right_date_format(this)\"
></td>|;
$button2 =
$button2 =
- qq|<td><input name=dateto id=dateto size=11 title="$myconfig{dateformat}"></td>|;
+ qq|<td><input name=dateto id=dateto 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;
$form->header;
-
+ $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}>
@@
-362,7
+364,6
@@
$jsscript
<input type=hidden name=nextsub value=generate_report>
<input type=hidden name=nextsub value=generate_report>
-<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}>
@@
-385,7
+386,7
@@
sub generate_report {
GL->all_transactions(\%myconfig, \%$form);
$callback =
GL->all_transactions(\%myconfig, \%$form);
$callback =
- "$form->{script}?action=generate_report&
path=$form->{path}&
login=$form->{login}&password=$form->{password}";
+ "$form->{script}?action=generate_report&login=$form->{login}&password=$form->{password}";
$href = $callback;
$href = $callback;
@@
-766,7
+767,7
@@
sub generate_report {
$column_data{id} = "<td align=right> $ref->{id} </td>";
$column_data{transdate} = "<td align=center>$transdate</td>";
$column_data{reference} =
$column_data{id} = "<td align=right> $ref->{id} </td>";
$column_data{transdate} = "<td align=center>$transdate</td>";
$column_data{reference} =
- "<td align=center><a href=$ref->{module}.pl?action=edit&id=$ref->{id}&
path=$form->{path}&
login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{reference}</td>";
+ "<td align=center><a href=$ref->{module}.pl?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{reference}</td>";
$column_data{description} = "<td align=center>$ref->{description} </td>";
$column_data{source} = "<td align=center>$ref->{source} </td>";
$column_data{notes} = "<td align=center>$ref->{notes} </td>";
$column_data{description} = "<td align=center>$ref->{description} </td>";
$column_data{source} = "<td align=center>$ref->{source} </td>";
$column_data{notes} = "<td align=center>$ref->{notes} </td>";
@@
-869,7
+870,6
@@
sub generate_report {
<input name=callback type=hidden value="$form->{callback}">
<input name=callback type=hidden value="$form->{callback}">
-<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}>
@@
-1296,7
+1296,7
@@
sub form_header {
# with JavaScript Calendar
$button1 = qq|
# with JavaScript Calendar
$button1 = qq|
- <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" $readonly>
+ <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" $readonly
onBlur=\"check_right_date_format(this)\"
>
<input type=button name=transdate id="trigger1" value=|
. $locale->text('button') . qq|></td>
|;
<input type=button name=transdate id="trigger1" value=|
. $locale->text('button') . qq|></td>
|;
@@
-1308,7
+1308,7
@@
sub form_header {
# without JavaScript Calendar
$button1 =
# without JavaScript Calendar
$button1 =
- qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" $readonly></td>|;
+ qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" $readonly
onBlur=\"check_right_date_format(this)\"
></td>|;
}
$form->header;
}
$form->header;
@@
-1354,7
+1354,7
@@
sub form_header {
<table>
<tr>
<th align=right width=50%>| . $locale->text('Buchungsdatum') . qq|</th>
<table>
<tr>
<th align=right width=50%>| . $locale->text('Buchungsdatum') . qq|</th>
- <td align=left><input name=gldate size=11 title="$myconfig{dateformat}" value=$form->{gldate} $readonly></td>
+ <td align=left><input name=gldate size=11 title="$myconfig{dateformat}" value=$form->{gldate} $readonly
onBlur=\"check_right_date_format(this)\"
></td>
</tr>
</table>
</td>
</tr>
</table>
</td>
@@
-1453,7
+1453,6
@@
sub form_footer {
</tr>
</table>
</tr>
</table>
-<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}>
@@
-1542,6
+1541,7
@@
sub yes {
if (GL->delete_transaction(\%myconfig, \%$form)){
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
if (GL->delete_transaction(\%myconfig, \%$form)){
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
$form->{addition} = "DELETED";
$form->save_history($form->dbconnect(\%myconfig));
}
$form->{addition} = "DELETED";
$form->save_history($form->dbconnect(\%myconfig));
}
@@
-1735,6
+1735,7
@@
sub post {
undef($form->{callback});
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
undef($form->{callback});
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
$form->{addition} = "SAVED";
$form->{what_done} = $locale->text("Buchungsnummer") . " = " . $form->{id};
$form->save_history($form->dbconnect(\%myconfig));
$form->{addition} = "SAVED";
$form->{what_done} = $locale->text("Buchungsnummer") . " = " . $form->{id};
$form->save_history($form->dbconnect(\%myconfig));
@@
-1761,6
+1762,7
@@
sub storno {
$form->{storno} = 1;
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
$form->{storno} = 1;
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
$form->{addition} = "STORNO";
$form->save_history($form->dbconnect(\%myconfig));
}
$form->{addition} = "STORNO";
$form->save_history($form->dbconnect(\%myconfig));
}