X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FClientConfig.pm;h=237185d50b61cb4ba582f35f94e4c6284cb3b8ba;hb=f319b065b828d7ac69ecbef68bfb16b4f3415422;hp=eac69561781723bb47ecc5e2592193a229ae12da;hpb=5384e5cb7568d04e61bb5c712d7953df046f3a2c;p=kivitendo-erp.git

diff --git a/SL/Controller/ClientConfig.pm b/SL/Controller/ClientConfig.pm
index eac695617..237185d50 100644
--- a/SL/Controller/ClientConfig.pm
+++ b/SL/Controller/ClientConfig.pm
@@ -16,18 +16,22 @@ use SL::Helper::Flash;
 use SL::Locale::String qw(t8);
 use SL::PriceSource::ALL;
 use SL::Template;
+use SL::Controller::TopQuickSearch;
+use SL::Helper::ShippedQty;
 
 __PACKAGE__->run_before('check_auth');
 
 use Rose::Object::MakeMethods::Generic (
-  'scalar --get_set_init' => [ qw(defaults all_warehouses all_weightunits all_languages all_currencies all_templates all_price_sources h_unit_name
-                                  posting_options payment_options accounting_options inventory_options profit_options accounts balance_startdate_method_options) ],
+  'scalar --get_set_init' => [ qw(defaults all_warehouses all_weightunits all_languages all_currencies all_templates all_price_sources h_unit_name available_quick_search_modules available_shipped_qty_item_identity_fields
+                                  all_project_statuses all_project_types
+                                  posting_options payment_options accounting_options inventory_options profit_options balance_startdate_method_options) ],
 );
 
 sub action_edit {
   my ($self, %params) = @_;
 
   $::form->{use_templates} = $self->defaults->templates ? 'existing' : 'new';
+  $::form->{feature_datev} = $self->defaults->feature_datev;
   $self->edit_form;
 }
 
@@ -145,7 +149,9 @@ sub init_all_languages   { SL::DB::Manager::Language->get_all_sorted
 sub init_all_currencies  { SL::DB::Manager::Currency->get_all_sorted                                                     }
 sub init_all_weightunits { my $unit = SL::DB::Manager::Unit->find_by(name => 'kg'); $unit ? $unit->convertible_units : [] }
 sub init_all_templates   { +{ SL::Template->available_templates }                                                        }
-sub init_h_unit_name     { first { SL::DB::Manager::Unit->find_by(name => $_) } qw(Std h Stunde)                         };
+sub init_h_unit_name     { first { SL::DB::Manager::Unit->find_by(name => $_) } qw(Std h Stunde)                         }
+sub init_all_project_types    { SL::DB::Manager::ProjectType->get_all_sorted                                             }
+sub init_all_project_statuses { SL::DB::Manager::ProjectStatus->get_all_sorted                                           }
 
 sub init_posting_options {
   [ { title => t8("never"),           value => 0           },
@@ -182,35 +188,20 @@ sub init_balance_startdate_method_options {
     { title => t8("Last opening balance or start of year"),     value => "last_ob_or_start_of_year"    }, ]
 }
 
-sub init_accounts {
-  my %accounts;
-
-  foreach my $chart (@{ SL::DB::Manager::Chart->get_all(where => [ link => { like => '%IC%' } ], sort_by => 'accno ASC') }) {
-    my %added;
-
-    foreach my $link (split m/:/, $chart->link) {
-      my $key = lc($link =~ /cogs/ ? 'IC_expense' : $link =~ /sale/ ? 'IC_income' : $link);
-      next if $added{$key};
-
-      $added{$key}      = 1;
-      $accounts{$key} ||= [];
-      push @{ $accounts{$key} }, $chart;
-    }
-  }
-
-  $accounts{fx_gain} = SL::DB::Manager::Chart->get_all(where => [ category => 'I', charttype => 'A' ], sort_by => 'accno ASC');
-  $accounts{fx_loss} = SL::DB::Manager::Chart->get_all(where => [ category => 'E', charttype => 'A' ], sort_by => 'accno ASC');
-  $accounts{ar_paid} = SL::DB::Manager::Chart->get_all(where => [ link => { like => '%AR_paid%' }   ], sort_by => 'accno ASC');
-
-  return \%accounts;
-}
-
 sub init_all_price_sources {
   my @classes = SL::PriceSource::ALL->all_price_sources;
 
   [ map { [ $_->name, $_->description ] } @classes ];
 }
 
+sub init_available_quick_search_modules {
+  [ SL::Controller::TopQuickSearch->new->available_modules ];
+}
+
+sub init_available_shipped_qty_item_identity_fields {
+  [ SL::Helper::ShippedQty->new->available_item_identity_fields ];
+}
+
 #
 # filters
 #
@@ -226,12 +217,27 @@ sub check_auth {
 sub edit_form {
   my ($self) = @_;
 
-  $::request->layout->use_javascript("${_}.js") for qw(jquery.selectboxes jquery.multiselect2side);
+  $::request->layout->use_javascript("${_}.js") for qw(jquery.selectboxes jquery.multiselect2side kivi.File);
 
+  $self->setup_edit_form_action_bar;
   $self->render('client_config/form', title => t8('Client Configuration'),
                 make_chart_title     => sub { $_[0]->accno . '--' . $_[0]->description },
                 make_templates_value => sub { 'templates/' . $_[0] },
               );
 }
 
+sub setup_edit_form_action_bar {
+  my ($self) = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Save'),
+        submit    => [ '#form', { action => 'ClientConfig/save' } ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}
+
 1;