projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Jahresberechnung
[kivitendo-erp.git]
/
bin
/
mozilla
/
rp.pl
diff --git
a/bin/mozilla/rp.pl
b/bin/mozilla/rp.pl
index
a496faa
..
56e7f49
100644
(file)
--- a/
bin/mozilla/rp.pl
+++ b/
bin/mozilla/rp.pl
@@
-40,6
+40,7
@@
require "bin/mozilla/common.pl";
use SL::PE;
use SL::RP;
use SL::PE;
use SL::RP;
+use SL::USTVA;
1;
1;
@@
-109,9
+110,7
@@
sub report {
$accrual = ($eur) ? "" : "checked";
$cash = ($eur) ? "checked" : "";
$accrual = ($eur) ? "" : "checked";
$cash = ($eur) ? "checked" : "";
- ($null, $null, $null, $null, $null, $year, $null, $null, $null) =
- localtime();
- $year += 1900;
+ $year = (localtime)[5] + 1900;
# get departments
$form->all_departments(\%myconfig);
# get departments
$form->all_departments(\%myconfig);
@@
-199,7
+198,7
@@
sub report {
if ($name_1 eq "") {
$button1 = qq|
if ($name_1 eq "") {
$button1 = qq|
- <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}">|;
+ <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}"
onBlur=\"check_right_date_format(this)\"
>|;
$button1_2 = qq|
<input type=button name=$name_2 id="$trigger_2" value=|
. $locale->text('button') . qq|>|;
$button1_2 = qq|
<input type=button name=$name_2 id="$trigger_2" value=|
. $locale->text('button') . qq|>|;
@@
-209,12
+208,12
@@
sub report {
Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2");
} else {
$button1 = qq|
Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2");
} else {
$button1 = qq|
- <input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value=
$value_1
>|;
+ <input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value=
"$value_1" onBlur=\"check_right_date_format(this)\"
>|;
$button1_2 = qq|
<input type=button name=$name_1 id="$trigger_1" value=|
. $locale->text('button') . qq|>|;
$button2 = qq|
$button1_2 = qq|
<input type=button name=$name_1 id="$trigger_1" value=|
. $locale->text('button') . qq|>|;
$button2 = qq|
- <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}">|;
+ <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}"
onBlur=\"check_right_date_format(this)\"
>|;
$button2_2 = qq|
<input type=button name=$name_2 id="$trigger_2" value=|
. $locale->text('button') . qq|>
$button2_2 = qq|
<input type=button name=$name_2 id="$trigger_2" value=|
. $locale->text('button') . qq|>
@@
-230,19
+229,21
@@
sub report {
# without JavaScript Calendar
if ($name_1 eq "") {
$button1 =
# without JavaScript Calendar
if ($name_1 eq "") {
$button1 =
- qq|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}">|;
+ qq|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}"
onBlur=\"check_right_date_format(this)\"
>|;
} else {
$button1 =
} else {
$button1 =
- qq|<input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value=$value_1>|;
+ qq|<input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value=$value_1
onBlur=\"check_right_date_format(this)\"
>|;
$button2 =
$button2 =
- qq|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}">|;
+ qq|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}"
onBlur=\"check_right_date_format(this)\"
>|;
}
}
}
}
-
+ $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}>
@@
-983,9
+984,8
@@
$jsscript
. $locale->text('Continue') . qq|">
|;
. $locale->text('Continue') . qq|">
|;
- # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum
- # Einlesen der Finanzamtdaten
- get_config($userspath, 'finanzamt.ini');
+ # Hier Aufruf von get_config zum Einlesen der Finanzamtdaten
+ USTVA->get_config($userspath, 'finanzamt.ini');
$disabled = qq|disabled="disabled"|;
$disabled = '' if ($form->{elster} eq '1');
$disabled = qq|disabled="disabled"|;
$disabled = '' if ($form->{elster} eq '1');
@@
-1012,7
+1012,7
@@
$jsscript
$lxdebug->leave_sub();
}
$lxdebug->leave_sub();
}
-sub continue {
&{ $form->{nextsub} }
}
+sub continue {
call_sub($form->{"nextsub"});
}
sub get_project {
$lxdebug->enter_sub();
sub get_project {
$lxdebug->enter_sub();
@@
-1354,7
+1354,7
@@
sub list_accounts {
$description = $form->escape($ref->{description});
$href =
$description = $form->escape($ref->{description});
$href =
- qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&accno=$ref->{accno}&description=$description
"
;
+ qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&accno=$ref->{accno}&description=$description
|
;
$ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1;
$ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1;
@@
-2003,21
+2003,36
@@
sub print {
sub print_form {
$lxdebug->enter_sub();
sub print_form {
$lxdebug->enter_sub();
+ my %replacements =
+ (
+ "ä" => "ae", "ö" => "oe", "ü" => "ue",
+ "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue",
+ "ß" => "ss",
+ " " => "_"
+ );
+
$form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
$form->{templates} = "$myconfig{templates}";
$form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
$form->{templates} = "$myconfig{templates}";
-
$form->{IN} = "$form->{type}.
html";
-
+
my $suffix = "
html";
+ my $attachment_suffix = "html";
if ($form->{format} eq 'postscript') {
$form->{postscript} = 1;
if ($form->{format} eq 'postscript') {
$form->{postscript} = 1;
- $
form->{IN} =~ s/html$/tex/
;
- }
- if ($form->{format} eq 'pdf') {
+ $
suffix = "tex"
;
+ $attachment_suffix = "ps";
+
} els
if ($form->{format} eq 'pdf') {
$form->{pdf} = 1;
$form->{pdf} = 1;
- $form->{IN} =~ s/html$/tex/;
+ $suffix = "tex";
+ $attachment_suffix = "pdf";
}
}
+ $form->{IN} = "$form->{type}.$suffix";
+
+
+ # Save $form->{email} because it will be overwritten.
+ $form->{EMAIL_RECIPIENT} = $form->{email};
+
$i = 0;
while (@{ $form->{AG} }) {
$i = 0;
while (@{ $form->{AG} }) {
@@
-2074,6
+2089,9
@@
sub print_form {
$form->format_amount(\%myconfig, $form->{"${_}total"}, 2)
} (c0, c30, c60, c90, "");
$form->format_amount(\%myconfig, $form->{"${_}total"}, 2)
} (c0, c30, c60, c90, "");
+ $form->{attachment_filename} = $locale->text("Statement") . "_$form->{todate}.$attachment_suffix";
+ map({ $form->{attachment_filename} =~ s/$_/$replacements{$_}/g; } keys(%replacements));
+
$form->parse_template(\%myconfig, $userspath);
}
$form->parse_template(\%myconfig, $userspath);
}
@@
-2081,6
+2099,7
@@
sub print_form {
}
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
}
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
$form->{addition} = "PRINTED";
$form->{what_done} = $form->{type};
$form->save_history($form->dbconnect(\%myconfig));
$form->{addition} = "PRINTED";
$form->{what_done} = $form->{type};
$form->save_history($form->dbconnect(\%myconfig));
@@
-2864,9
+2883,8
@@
sub generate_bwa {
sub generate_ustva {
$lxdebug->enter_sub();
sub generate_ustva {
$lxdebug->enter_sub();
- # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum
- # Einlesen der Finanzamtdaten
- get_config($userspath, 'finanzamt.ini');
+ # Hier Aufruf von get_config zum Einlesen der Finanzamtdaten
+ USTVA->get_config($userspath, 'finanzamt.ini');
# &get_project(generate_bwa);
@anmeldungszeitraum =
# &get_project(generate_bwa);
@anmeldungszeitraum =