X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=c23abeb59abe7d258a2832a350647f7699637c92;hb=6f2050063ffa5417ab4495af84625385c766bc2d;hp=209e082ff798c2aa23bde5b8562cb3d683ec8a66;hpb=d629acd82a27e980899a044ca8b0f4becc8e94bb;p=kivitendo-erp.git
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 209e082ff..c23abeb59 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -35,12 +35,16 @@
#
#======================================================================
-require "bin/mozilla/arap.pl";
-require "bin/mozilla/common.pl";
+use POSIX qw(strftime);
use SL::PE;
use SL::RP;
-use SL::USTVA;
+use SL::Iconv;
+use SL::ReportGenerator;
+
+require "bin/mozilla/arap.pl";
+require "bin/mozilla/common.pl";
+require "bin/mozilla/reportgenerator.pl";
1;
@@ -87,9 +91,32 @@ use SL::USTVA;
# $locale->text('Non-taxable Sales')
# $locale->text('Non-taxable Purchases')
+# $form->parse_html_template('rp/html_report_susa')
+
+my $rp_access_map = {
+ 'projects' => 'report',
+ 'ar_aging' => 'general_ledger',
+ 'ap_aging' => 'general_ledger',
+ 'receipts' => 'cash',
+ 'payments' => 'cash',
+ 'trial_balance' => 'report',
+ 'income_statement' => 'report',
+ 'bwa' => 'report',
+ 'balance_sheet' => 'report',
+};
+
+sub check_rp_access {
+ my $right = $rp_access_map->{$form->{report}};
+ $right ||= 'DOES_NOT_EXIST';
+
+ $auth->assert($right);
+}
+
sub report {
$lxdebug->enter_sub();
+ check_rp_access();
+
%title = ('balance_sheet' => 'Balance Sheet',
'income_statement' => 'Income Statement',
'trial_balance' => 'Trial Balance',
@@ -102,8 +129,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} });
@@ -146,51 +172,45 @@ sub report {
'-labels' => \%project_labels));
# use JavaScript Calendar or not
- $form->{jsscript} = $jscalendar;
+ $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
@@ -519,17 +539,65 @@ $jsscript
|;
}
- if ($form->{report} eq "ustva") {
-
+ if ($form->{report} eq "balance_sheet") {
print qq|
+
+
+ | | . $locale->text('as at') . qq| |
+
+ $button1
+ $button1_2
+ |
+ | . $locale->text('Compare to') . qq| |
+
+ $button2
+ $button2_2
+ |
+
+
+ | | . $locale->text('Decimalplaces') . qq| |
+ |
+
+
+
+
+
+ |
+
- |
-
-
- |
-
- |
-
-
-
-
-{login}>
-{password}>
-
-|;
-
- # 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');
- if ($form->{report} eq 'ustva') {
- print qq|
-
-
- |;
- print qq|
-
- |;
- }
-
- print qq|
|
@@ -1015,6 +997,9 @@ sub continue { call_sub($form->{"nextsub"}); }
sub get_project {
$lxdebug->enter_sub();
+
+ $auth->assert('report');
+
my $nextsub = shift;
$form->{project_id} = $form->{project_id_1};
@@ -1038,6 +1023,8 @@ sub get_project {
sub generate_income_statement {
$lxdebug->enter_sub();
+ $auth->assert('report');
+
$form->{padding} = " ";
$form->{bold} = "