X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FClientConfig.pm;h=df485c0a4b9f35c7b8cf09e9a854d6be73d598c2;hb=833f083eae2a4547c49f8f92a2fdca6ba4dfe5f4;hp=29965e1ef8479dbe0fa0467db7d9470a23a17356;hpb=05b30be4d26d9f1eb0481996cb864a96963226a2;p=kivitendo-erp.git

diff --git a/SL/Controller/ClientConfig.pm b/SL/Controller/ClientConfig.pm
index 29965e1ef..df485c0a4 100644
--- a/SL/Controller/ClientConfig.pm
+++ b/SL/Controller/ClientConfig.pm
@@ -10,6 +10,7 @@ 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);
@@ -18,7 +19,8 @@ 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 h_unit_name
+                                  posting_options payment_options accounting_options inventory_options profit_options accounts balance_startdate_method_options) ],
 );
 
 sub action_edit {
@@ -40,6 +42,8 @@ sub action_save {
     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 +137,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 { SL::DB::Manager::Unit->find_by(name => 'g')->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,6 +172,14 @@ sub init_profit_options {
     { title => t8("income"),          value => "income"    }, ]
 }
 
+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"    }, ]
+}
+
 sub init_accounts {
   my %accounts;
 
@@ -205,6 +218,8 @@ sub check_auth {
 sub edit_form {
   my ($self) = @_;
 
+  $::request->layout->use_javascript("${_}.js") for qw(autocomplete_part);
+
   $self->render('client_config/form', title => t8('Client Configuration'),
                 make_chart_title     => sub { $_[0]->accno . '--' . $_[0]->description },
                 make_templates_value => sub { 'templates/' . $_[0] },