X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FClientConfig.pm;h=ded1a33fb9d3d5ca231a180528bf52562a8dbfef;hb=eb07117b26f569d689835471cab6665e510e123e;hp=fd2cf6526529050f0ab2e4589d160150655425e3;hpb=8ad1534a0b797b1889ab90870b652b7ebe21be66;p=kivitendo-erp.git

diff --git a/SL/Controller/ClientConfig.pm b/SL/Controller/ClientConfig.pm
index fd2cf6526..ded1a33fb 100644
--- a/SL/Controller/ClientConfig.pm
+++ b/SL/Controller/ClientConfig.pm
@@ -10,15 +10,18 @@ use SL::DB::Chart;
 use SL::DB::Currency;
 use SL::DB::Default;
 use SL::DB::Language;
+use SL::DB::Part;
 use SL::DB::Unit;
 use SL::Helper::Flash;
 use SL::Locale::String qw(t8);
+use SL::PriceSource::ALL;
 use SL::Template;
 
 __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 posting_options payment_options accounting_options inventory_options profit_options accounts) ],
+  '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 balance_startdate_method_options) ],
 );
 
 sub action_edit {
@@ -34,12 +37,15 @@ sub action_save {
   my $defaults             = delete($::form->{defaults}) || {};
   my $entered_currencies   = delete($::form->{currencies}) || [];
   my $original_currency_id = $self->defaults->currency_id;
+  $defaults->{disabled_price_sources} ||= [];
 
   # undef several fields if an empty value has been selected.
   foreach (qw(warehouse_id bin_id warehouse_id_ignore_onhand bin_id_ignore_onhand)) {
     undef $defaults->{$_} if !$defaults->{$_};
   }
 
+  $defaults->{$_} = $::form->parse_amount(\%::myconfig, $defaults->{$_}) for qw(customer_hourly_rate);
+
   $self->defaults->assign_attributes(%{ $defaults });
 
   my %errors_idx;
@@ -133,12 +139,13 @@ sub action_save {
 # initializers
 #
 
-sub init_defaults        { SL::DB::Default->get                                           }
-sub init_all_warehouses  { SL::DB::Manager::Warehouse->get_all_sorted                     }
-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 => 'g'); $unit ? $unit->convertible_units : [] }
-sub init_all_templates   { +{ SL::Template->available_templates }                         }
+sub init_defaults        { SL::DB::Default->get                                                                          }
+sub init_all_warehouses  { SL::DB::Manager::Warehouse->get_all_sorted                                                    }
+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_posting_options {
   [ { title => t8("never"),           value => 0           },
@@ -167,27 +174,18 @@ sub init_profit_options {
     { title => t8("income"),          value => "income"    }, ]
 }
 
-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;
-    }
-  }
+sub init_balance_startdate_method_options {
+  [ { title => t8("After closed period"),                       value => "closed_to"                   },
+    { title => t8("Start of year"),                             value => "start_of_year"               },
+    { title => t8("All transactions"),                          value => "all_transactions"            },
+    { title => t8("Last opening balance or all transactions"),  value => "last_ob_or_all_transactions" },
+    { title => t8("Last opening balance or start of year"),     value => "last_ob_or_start_of_year"    }, ]
+}
 
-  $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');
+sub init_all_price_sources {
+  my @classes = SL::PriceSource::ALL->all_price_sources;
 
-  return \%accounts;
+  [ map { [ $_->name, $_->description ] } @classes ];
 }
 
 #
@@ -205,6 +203,8 @@ sub check_auth {
 sub edit_form {
   my ($self) = @_;
 
+  $::request->layout->use_javascript("${_}.js") for qw(jquery.selectboxes jquery.multiselect2side);
+
   $self->render('client_config/form', title => t8('Client Configuration'),
                 make_chart_title     => sub { $_[0]->accno . '--' . $_[0]->description },
                 make_templates_value => sub { 'templates/' . $_[0] },