X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Frp.pl;h=a6294f26a7fe9837625811ac11034d74be508208;hb=1d027d8883ed6b13cf6c78b95b3493acc1fb715f;hp=c06e79b4d34c16f85f5fdf989bb83192033caeb3;hpb=3da2dca2e601b311b6e464ffff02bfe98a7024d1;p=kivitendo-erp.git
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index c06e79b4d..a6294f26a 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -39,7 +39,6 @@ use POSIX qw(strftime);
use SL::PE;
use SL::RP;
-use SL::USTVA;
use SL::Iconv;
use SL::ReportGenerator;
@@ -107,8 +106,7 @@ sub report {
'receipts' => 'Receipts',
'payments' => 'Payments',
'projects' => 'Project Transactions',
- 'bwa' => 'Betriebswirtschaftliche Auswertung',
- 'ustva' => 'Umsatzsteuervoranmeldung',);
+ 'bwa' => 'Betriebswirtschaftliche Auswertung',);
$form->{title} = $locale->text($title{ $form->{report} });
@@ -153,49 +151,43 @@ sub report {
# use JavaScript Calendar or not
$form->{jsscript} = 1;
$jsscript = "";
- if ($form->{report} eq "ustva") {
- $department = "";
+ if ($form->{report} eq "balance_sheet") {
+ $name_1 = "asofdate";
+ $id_1 = "asofdate";
+ $value_1 = "$form->{asofdate}";
+ $trigger_1 = "trigger1";
+ $name_2 = "compareasofdate";
+ $id_2 = "compareasofdate";
+ $value_2 = "$form->{compareasofdate}";
+ $trigger_2 = "trigger2";
+ } elsif ($form->{report} =~ /(receipts|payments)$/) {
+ $name_1 = "fromdate";
+ $id_1 = "fromdate";
+ $value_1 = "$form->{fromdate}";
+ $trigger_1 = "trigger1";
+ $name_2 = "todate";
+ $id_2 = "todate";
+ $value_2 = "";
+ $trigger_2 = "trigger2";
+ } elsif (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) {
+ $name_1 = "";
+ $id_1 = "";
+ $value_1 = "";
+ $trigger_1 = "";
+ $name_2 = "todate";
+ $id_2 = "todate";
+ $value_2 = "";
+ $trigger_2 = "trigger2";
+
} else {
- if ($form->{report} eq "balance_sheet") {
- $name_1 = "asofdate";
- $id_1 = "asofdate";
- $value_1 = "$form->{asofdate}";
- $trigger_1 = "trigger1";
- $name_2 = "compareasofdate";
- $id_2 = "compareasofdate";
- $value_2 = "$form->{compareasofdate}";
- $trigger_2 = "trigger2";
- } elsif ($form->{report} =~ /(receipts|payments)$/) {
- $name_1 = "fromdate";
- $id_1 = "fromdate";
- $value_1 = "$form->{fromdate}";
- $trigger_1 = "trigger1";
- $name_2 = "todate";
- $id_2 = "todate";
- $value_2 = "";
- $trigger_2 = "trigger2";
- } else {
- if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) {
- $name_1 = "";
- $id_1 = "";
- $value_1 = "";
- $trigger_1 = "";
- $name_2 = "todate";
- $id_2 = "todate";
- $value_2 = "";
- $trigger_2 = "trigger2";
-
- } else {
- $name_1 = "fromdate";
- $id_1 = "fromdate";
- $value_1 = "$form->{fromdate}";
- $trigger_1 = "trigger1";
- $name_2 = "todate";
- $id_2 = "todate";
- $value_2 = "";
- $trigger_2 = "trigger2";
- }
- }
+ $name_1 = "fromdate";
+ $id_1 = "fromdate";
+ $value_1 = "$form->{fromdate}";
+ $trigger_1 = "trigger1";
+ $name_2 = "todate";
+ $id_2 = "todate";
+ $value_2 = "";
+ $trigger_2 = "trigger2";
}
# with JavaScript Calendar
@@ -524,107 +516,6 @@ $jsscript
|;
}
- if ($form->{report} eq "ustva") {
-
- print qq|
-
-
-
-
-
| - . $locale->text('Zeitraum') . qq| | -||||
---|---|---|---|---|
| . $locale->text('Year') . qq| | -- | |||
- | . $locale->text('Yearly') . qq| | -| . $locale->text('Quarterly') . qq| | -| . $locale->text('Monthly') . qq| | -||
- | 1. | - . $locale->text('Quarter') . qq| | -|; - $checked = "checked"; - print qq| -| - . $locale->text('January') . qq| | -|; - $checked = ""; - print qq| -| - . $locale->text('May') . qq| | -| - . $locale->text('September') . qq| | - -
- | 2. | - . $locale->text('Quarter') . qq| | -| - . $locale->text('February') . qq| | -| - . $locale->text('June') . qq| | -| - . $locale->text('October') . qq| | -
- | 3. | - . $locale->text('Quarter') . qq| | -| - . $locale->text('March') . qq| | -| - . $locale->text('July') . qq| | -| - . $locale->text('November') . qq| | - -
- | 4. | - . $locale->text('Quarter') . qq| | -| - . $locale->text('April') . qq| | -| - . $locale->text('August') . qq| | -| - . $locale->text('December') . qq| | - -
| . $locale->text('Method') . qq| | -| - . $locale->text('Accrual') . qq| - | - . $locale->text('EUR') . qq| | -|||
|; -########## - - &print_options(); - print qq| - | -