DATEV: Abteilungsname und globalen Projektnamen mitnehmen

[kivitendo-erp.git] / SL / Controller / Chart.pm

diff --git a/SL/Controller/Chart.pm b/SL/Controller/Chart.pm
index 68c75bf..0e3e2b6 100644 (file)
--- a/SL/Controller/Chart.pm
+++ b/SL/Controller/Chart.pm
@@ -6,12 +6,11 @@ use parent qw(SL::Controller::Base);
 use Clone qw(clone);
 use SL::DB::Chart;
 use SL::Controller::Helper::GetModels;
-use SL::DB::Helper::Paginated;
 use SL::Locale::String qw(t8);
 use SL::JSON;
 
 use Rose::Object::MakeMethods::Generic (
-  'scalar --get_set_init' => [ qw(charts models chart) ],
+  'scalar --get_set_init' => [ qw(charts models chart filter) ],
 );
 
 sub action_ajax_autocomplete {
@@ -30,6 +29,7 @@ sub action_ajax_autocomplete {
     if (1 == scalar @{ $exact_matches = SL::DB::Manager::Chart->get_all(
       query => [
         SL::DB::Manager::Chart->type_filter($::form->{filter}{type}),
+        charttype => 'A',
         or => [
           description => { ilike => $::form->{filter}{'all:substr:multi::ilike'} },
           accno       => { ilike => $::form->{filter}{'all:substr:multi::ilike'} },
@@ -55,7 +55,7 @@ sub action_ajax_autocomplete {
 }
 
 sub action_test_page {
-  $_[0]->render('chart/test_page');
+  $_[0]->render('chart/test_page', pre_filled_chart => SL::DB::Manager::Chart->get_first);
 }
 
 sub action_chart_picker_search {
@@ -74,9 +74,8 @@ sub action_show {
     if (!$self->chart) {
       # TODO error
     } else {
-      require Rose::DB::Object::Helpers;
-        $chart_hash                     = $self->chart->as_tree;
-        $chart_hash->{displayable_name} = $self->chart->displayable_name;
+      $chart_hash                     = $self->chart->as_tree;
+      $chart_hash->{displayable_name} = $self->chart->displayable_name;
     }
 
     $self->render(\ SL::JSON::to_json($chart_hash), { layout => 0, type => 'json', process => 0 });
@@ -110,7 +109,12 @@ sub init_models {
       accno       => t8('Account number'),
       description => t8('Description'),
     },
+    query => [
+      charttype => 'A',
+    ],
   );
 }
 
+sub init_filter { $_[0]->models->filtered->laundered }
+
 1;