From: Sven Schöling Date: Fri, 13 May 2016 16:38:09 +0000 (+0200) Subject: Revert "Erfolgsrechnung" X-Git-Tag: release-3.4.1~143 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=335fc788611b85c4879e701fba2892ec1ed2c8dd;p=kivitendo-erp.git Revert "Erfolgsrechnung" This reverts commit e3f8237101c331c52098cf6f7db86e1db2a2b36a. --- diff --git a/SL/RP.pm b/SL/RP.pm index a18452e67..48a3d2809 100644 --- a/SL/RP.pm +++ b/SL/RP.pm @@ -1866,88 +1866,4 @@ sub income_statement { } $main::lxdebug->leave_sub(); } - -sub erfolgsrechnung { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - $form->{company} = $::instance_conf->get_company; - $form->{address} = $::instance_conf->get_address; - - # wrong user inputs should be handled during users input - # e.g. spaces, tabs, wrong format or wrong dates - $form->{fromdate} = "01.01.2000" if !$form->{fromdate}; - $form->{todate} = $form->current_date(%{$myconfig}) if !$form->{todate}; - - my %categories = (I => "ERTRAG", E => "AUFWAND"); - my $fromdate = conv_dateq($form->{fromdate}); - my $todate = conv_dateq($form->{todate}); - - $form->{total} = 0; - foreach my $category (keys %categories) { - my %category = ( - name => $categories{$category}, - total => 0, - accounts => get_accounts_ch($category), - ); - foreach my $account (@{$category{accounts}}) { - $account->{total} += ($account->{category} eq $category ? 1 : -1) * get_total_ch($account->{id}, $fromdate, $todate); - $category{total} += $account->{total}; - $account->{total} = $form->format_amount($myconfig, $form->parse_amount($myconfig, $account->{total}), 2); - } - $form->{total} += $category{total}; - $category{total} = $form->format_amount($myconfig, $form->parse_amount($myconfig, $category{total}), 2); - push(@{$form->{categories}}, \%category); - } - $form->{total} = $form->format_amount($myconfig, $form->parse_amount($myconfig, $form->{total}), 2); - - $main::lxdebug->leave_sub(); - return {}; -} - -sub get_accounts_ch { - $main::lxdebug->enter_sub(); - - my ($category) = @_; - my ($inclusion); - - if ($category eq 'I') { - $inclusion = "AND pos_er = NULL OR pos_er > '0' AND pos_er <= '5'"; - } elsif ($category eq 'E') { - $inclusion = "AND pos_er = NULL OR pos_er >= '6' AND pos_er < '100'"; - } else { - $inclusion = ""; - } - - my $query = qq| - SELECT id, accno, description, category - FROM chart - WHERE category = ? $inclusion - ORDER BY accno - |; - my $accounts = selectall_hashref_query($::form, $::form->get_standard_dbh, $query, $category); - - $main::lxdebug->leave_sub(); - return $accounts; -} - -sub get_total_ch { - $main::lxdebug->enter_sub(); - - my ($chart_id, $fromdate, $todate) = @_; - my $total = 0; - my $query = qq| - SELECT SUM(amount) - FROM acc_trans - WHERE chart_id = ? - AND transdate >= ? - AND transdate <= ? - |; - my $data = selectfirst_hashref_query($::form, $::form->get_standard_dbh, $query, $chart_id, $fromdate, $todate); - $total += $data->{sum}; - - $main::lxdebug->leave_sub(); - return $total; -} - 1; diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 87f84b217..ae2669fe3 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -101,16 +101,15 @@ use strict; # $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', - 'erfolgsrechnung' => 'report', - 'bwa' => 'report', - 'balance_sheet' => 'report', + '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 { @@ -130,7 +129,6 @@ sub report { my %title = ( balance_sheet => $::locale->text('Balance Sheet'), income_statement => $::locale->text('Income Statement'), - erfolgsrechnung => $::locale->text('Erfolgsrechnung'), trial_balance => $::locale->text('Trial Balance'), ar_aging => $::locale->text('Search AR Aging'), ap_aging => $::locale->text('Search AP Aging'), @@ -144,8 +142,6 @@ sub report { $::form->{title} = $title{$::form->{report}}; $::request->{layout}->add_javascripts('autocomplete_customer.js'); - $::form->{fromdate} = DateTime->today->truncate(to => 'year')->to_kivitendo; - $::form->{todate} = DateTime->today->truncate(to => 'year')->add(years => 1)->add(days => -1)->to_kivitendo; # get departments $::form->all_departments(\%::myconfig); @@ -156,14 +152,13 @@ sub report { $::form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }); - my $is_projects = $::form->{report} eq "projects"; - my $is_income_statement = $::form->{report} eq "income_statement"; - my $is_erfolgsrechnung = $::form->{report} eq "erfolgsrechnung"; - my $is_bwa = $::form->{report} eq "bwa"; - my $is_balance_sheet = $::form->{report} eq "balance_sheet"; - my $is_trial_balance = $::form->{report} eq "trial_balance"; - my $is_aging = $::form->{report} =~ /^a[rp]_aging$/; - my $is_payments = $::form->{report} =~ /(receipts|payments)$/; + my $is_projects = $::form->{report} eq "projects"; + my $is_income_statement = $::form->{report} eq "income_statement"; + my $is_bwa = $::form->{report} eq "bwa"; + my $is_balance_sheet = $::form->{report} eq "balance_sheet"; + my $is_trial_balance = $::form->{report} eq "trial_balance"; + my $is_aging = $::form->{report} =~ /^a[rp]_aging$/; + my $is_payments = $::form->{report} =~ /(receipts|payments)$/; my ($label, $nextsub, $vc); if ($is_aging) { @@ -196,21 +191,20 @@ sub report { $::form->header; print $::form->parse_html_template('rp/report', { - paymentaccounts => $paymentaccounts, - selection => $selection, - is_aging => $is_aging, - vc => $vc, - label => $label, - year => DateTime->today->year, - today => DateTime->today, - nextsub => $nextsub, - is_payments => $is_payments, - is_trial_balance => $is_trial_balance, - is_balance_sheet => $is_balance_sheet, - is_bwa => $is_bwa, - is_income_statement => $is_income_statement, - is_erfolgsrechnung => $is_erfolgsrechnung, - is_projects => $is_projects, + paymentaccounts => $paymentaccounts, + selection => $selection, + is_aging => $is_aging, + vc => $vc, + label => $label, + year => DateTime->today->year, + today => DateTime->today, + nextsub => $nextsub, + is_payments => $is_payments, + is_trial_balance => $is_trial_balance, + is_balance_sheet => $is_balance_sheet, + is_bwa => $is_bwa, + is_income_statement => $is_income_statement, + is_projects => $is_projects, }); $::lxdebug->leave_sub; @@ -401,25 +395,6 @@ sub generate_income_statement { $main::lxdebug->leave_sub(); } -sub generate_erfolgsrechnung { - $::lxdebug->enter_sub; - $::auth->assert('report'); - - $::form->{decimalplaces} = $::form->{decimalplaces} * 1 || 2; - $::form->{padding} = " "; - $::form->{bold} = ""; - $::form->{endbold} = ""; - $::form->{br} = "
"; - - my $data = RP->erfolgsrechnung(\%::myconfig, $::form); - - $::form->header(); - print $::form->parse_html_template('rp/erfolgsrechnung', $data); - - $::lxdebug->leave_sub; -} - - sub generate_balance_sheet { $::lxdebug->enter_sub; $::auth->assert('report'); diff --git a/templates/webpages/rp/erfolgsrechnung.html b/templates/webpages/rp/erfolgsrechnung.html deleted file mode 100644 index f3a73c76d..000000000 --- a/templates/webpages/rp/erfolgsrechnung.html +++ /dev/null @@ -1,40 +0,0 @@ -[%- USE T8 %] -[%- USE HTML %] -[%- USE LxERP %] - -

-
[% company %] -
[% address %] -

[% 'ERFOLGSRECHNUNG' %] -
[% fromdate %] bis [% todate %] -

- - - - - [%- FOREACH category = categories %] - - - - [%- FOREACH row = category.accounts %] - - - - - - [%- END %] - - - - - - - - - - [%- END %] - - - - -

[% category.name %]
[% row.accno %][% row.description %][% row.total %]
TOTAL[% category.total %]
GEWINN/VERLUST[% total %]
diff --git a/templates/webpages/rp/report.html b/templates/webpages/rp/report.html index f73c99ba3..2e9775a96 100644 --- a/templates/webpages/rp/report.html +++ b/templates/webpages/rp/report.html @@ -9,9 +9,7 @@ [% 'Year' | $T8 %] - - - + [% 'Yearly' | $T8 %] @@ -19,66 +17,32 @@ [% 'Monthly' | $T8 %] -   - - - -  1. [% 'Quarter' | $T8 %] - - -  [% 'January' | $T8 %] - - -  [% 'May' | $T8 %] - - -  [% 'September' | $T8 %] - +   +  1. [% 'Quarter' | $T8 %] +  [% 'January' | $T8 %] +  [% 'May' | $T8 %] +  [% 'September' | $T8 %]   - -  2. [% 'Quarter' | $T8 %] - - -  [% 'February' | $T8 %] - - -  [% 'June' | $T8 %] - - -  [% 'October' | $T8 %] - +  2. [% 'Quarter' | $T8 %] +  [% 'February' | $T8 %] +  [% 'June' | $T8 %] +  [% 'October' | $T8 %]   - -  3. [% 'Quarter' | $T8 %] - - -  [% 'March' | $T8 %] - - -  [% 'July' | $T8 %] - - -  [% 'November' | $T8 %] - +  3. [% 'Quarter' | $T8 %] +  [% 'March' | $T8 %] +  [% 'July' | $T8 %] +  [% 'November' | $T8 %]   - -  4. [% 'Quarter' | $T8 %] - - -  [% 'April' | $T8 %] - - -  [% 'August' | $T8 %] - - -  [% 'December' | $T8 %] - +  4. [% 'Quarter' | $T8 %] +  [% 'April' | $T8 %] +  [% 'August' | $T8 %] +  [% 'December' | $T8 %]
@@ -87,7 +51,7 @@ [% 'Free report period' | $T8 %] [% 'From' | $T8 %] [% L.date_tag('fromdate', fromdate) %] - [% 'Bis' | $T8 %] [% L.date_tag('todate', todate) %] + [% 'Bis' | $T8 %] [% L.date_tag('todate') %] @@ -161,7 +125,6 @@ [%- END %] - [%- IF is_bwa %] [%- PROCESS projectnumber %] @@ -175,15 +138,6 @@ [%- END %] - -[%- IF is_erfolgsrechnung %] - - - -[%- PROCESS customized_report %] -[%- END %] - - [%- IF is_balance_sheet %] @@ -369,33 +323,3 @@ - - -