From c1c6288ab29bae1eaec8009a0a80aeb5ece70e4d Mon Sep 17 00:00:00 2001 From: "Martin Helmling martin.helmling@octosoft.eu" Date: Mon, 12 Sep 2016 10:13:54 +0200 Subject: [PATCH] Erstellen von Jahresabschluss-Buchungen(2) Auf Wunsch exaktere Bezeichnung des Controllers etc, also statt yearly ==> yearend --- .../{YearlyTransactions.pm => YearEndTransactions.pm} | 8 ++++---- ...rly-transactions.yaml => 11-yearend-transactions.yaml} | 2 +- t/bank/cb_ob_transactions.t | 4 ++-- .../gl/{yearly_bottom.html => yearend_bottom.html} | 0 .../gl/{yearly_filter.html => yearend_filter.html} | 0 .../webpages/gl/{yearly_top.html => yearend_top.html} | 0 6 files changed, 7 insertions(+), 7 deletions(-) rename SL/Controller/{YearlyTransactions.pm => YearEndTransactions.pm} (98%) rename menus/user/{11-yearly-transactions.yaml => 11-yearend-transactions.yaml} (87%) rename templates/webpages/gl/{yearly_bottom.html => yearend_bottom.html} (100%) rename templates/webpages/gl/{yearly_filter.html => yearend_filter.html} (100%) rename templates/webpages/gl/{yearly_top.html => yearend_top.html} (100%) diff --git a/SL/Controller/YearlyTransactions.pm b/SL/Controller/YearEndTransactions.pm similarity index 98% rename from SL/Controller/YearlyTransactions.pm rename to SL/Controller/YearEndTransactions.pm index 2639ef66c..b9bca983e 100644 --- a/SL/Controller/YearlyTransactions.pm +++ b/SL/Controller/YearEndTransactions.pm @@ -1,4 +1,4 @@ -package SL::Controller::YearlyTransactions; +package SL::Controller::YearEndTransactions; use strict; @@ -30,7 +30,7 @@ sub action_filter { $self->cb_reference(t8('CB Transaction')) if !$self->cb_reference; $self->ob_description(t8('OB Transaction')) if !$self->ob_description; $self->cb_description(t8('CB Transaction')) if !$self->cb_description; - $self->render('gl/yearly_filter', + $self->render('gl/yearend_filter', title => t8('CB/OB Transactions'), make_title_of_chart => sub { $_[0]->accno.' '.$_[0]->description } ); @@ -47,8 +47,8 @@ sub action_list { $report->set_options( output_format => 'HTML', - raw_top_info_text => $::form->parse_html_template('gl/yearly_top', { SELF => $self }), - raw_bottom_info_text => $::form->parse_html_template('gl/yearly_bottom', { SELF => $self }), + raw_top_info_text => $::form->parse_html_template('gl/yearend_top', { SELF => $self }), + raw_bottom_info_text => $::form->parse_html_template('gl/yearend_bottom', { SELF => $self }), allow_pdf_export => 0, allow_csv_export => 0, title => $::locale->text('CB/OB Transactions'), diff --git a/menus/user/11-yearly-transactions.yaml b/menus/user/11-yearend-transactions.yaml similarity index 87% rename from menus/user/11-yearly-transactions.yaml rename to menus/user/11-yearend-transactions.yaml index f6667f8c9..6906cdc89 100644 --- a/menus/user/11-yearly-transactions.yaml +++ b/menus/user/11-yearend-transactions.yaml @@ -13,4 +13,4 @@ order: 470 access: general_ledger params: - action: YearlyTransactions/filter + action: YearEndTransactions/filter diff --git a/t/bank/cb_ob_transactions.t b/t/bank/cb_ob_transactions.t index e03934004..d72c1a800 100644 --- a/t/bank/cb_ob_transactions.t +++ b/t/bank/cb_ob_transactions.t @@ -25,7 +25,7 @@ use SL::DB::PaymentTerm; use SL::DB::PurchaseInvoice; use SL::DB::BankTransaction; use SL::DB::AccTransaction; -use SL::Controller::YearlyTransactions; +use SL::Controller::YearEndTransactions; use Data::Dumper; my ($customer, $vendor, $currency_id, @parts, $unit, $employee, $tax, $tax7, $tax_9, $taxzone, $payment_terms, $bank_account); @@ -222,7 +222,7 @@ sub test1 { $ap_transaction = test_ap_transaction(invnumber => 'purchaseinv1'); my $ar_transaction_2 = test_ar_transaction(invnumber => 'salesinv_2'); - my $yt_controller = SL::Controller::YearlyTransactions->new; + my $yt_controller = SL::Controller::YearEndTransactions->new; my $report = SL::ReportGenerator->new(\%::myconfig, $::form); $::form->{"ob_date"} = DateTime->today->truncate(to => 'year')->add(years => 1)->to_kivitendo; diff --git a/templates/webpages/gl/yearly_bottom.html b/templates/webpages/gl/yearend_bottom.html similarity index 100% rename from templates/webpages/gl/yearly_bottom.html rename to templates/webpages/gl/yearend_bottom.html diff --git a/templates/webpages/gl/yearly_filter.html b/templates/webpages/gl/yearend_filter.html similarity index 100% rename from templates/webpages/gl/yearly_filter.html rename to templates/webpages/gl/yearend_filter.html diff --git a/templates/webpages/gl/yearly_top.html b/templates/webpages/gl/yearend_top.html similarity index 100% rename from templates/webpages/gl/yearly_top.html rename to templates/webpages/gl/yearend_top.html -- 2.20.1