X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FClientConfig.pm;h=bc0f28701be0bc57d3d53044aefa138ebdbd4930;hb=b293ff8ad52fc76ba0c44783e3982418114d6b08;hp=29965e1ef8479dbe0fa0467db7d9470a23a17356;hpb=05b30be4d26d9f1eb0481996cb864a96963226a2;p=kivitendo-erp.git diff --git a/SL/Controller/ClientConfig.pm b/SL/Controller/ClientConfig.pm index 29965e1ef..bc0f28701 100644 --- a/SL/Controller/ClientConfig.pm +++ b/SL/Controller/ClientConfig.pm @@ -10,21 +10,33 @@ 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::DB::Customer; use SL::Helper::Flash; use SL::Locale::String qw(t8); +use SL::PriceSource::ALL; use SL::Template; +use SL::Controller::TopQuickSearch; +use SL::DB::Helper::AccountingPeriod qw(get_balance_startdate_method_options); +use SL::Helper::ShippedQty; +use SL::VATIDNr; +use SL::ZUGFeRD; __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 available_quick_search_modules available_shipped_qty_item_identity_fields + all_project_statuses all_project_types zugferd_settings + posting_options payment_options accounting_options inventory_options profit_options balance_startdate_method_options + displayable_name_specs_by_module) ], ); sub action_edit { my ($self, %params) = @_; $::form->{use_templates} = $self->defaults->templates ? 'existing' : 'new'; + $::form->{feature_datev} = $self->defaults->feature_datev; $self->edit_form; } @@ -34,12 +46,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; @@ -86,6 +101,11 @@ sub action_save { } } + my $cleaned_ustid = SL::VATIDNr->clean($defaults->{co_ustid}); + if ($cleaned_ustid && !SL::VATIDNr->validate($cleaned_ustid)) { + push @errors, t8("The VAT ID number '#1' is invalid.", $defaults->{co_ustid}); + } + # Show form again if there were any errors. Nothing's been changed # yet in the database. if (@errors) { @@ -121,6 +141,11 @@ sub action_save { $self->defaults->templates('templates/' . $::form->{new_templates}); } + # Displayable name preferences + foreach my $specs (@{ $::form->{displayable_name_specs} }) { + $self->displayable_name_specs_by_module->{$specs->{module}}->{prefs}->store_default($specs->{default}); + } + # Finally save defaults. $self->defaults->save; @@ -133,12 +158,16 @@ 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_all_project_types { SL::DB::Manager::ProjectType->get_all_sorted } +sub init_all_project_statuses { SL::DB::Manager::ProjectStatus->get_all_sorted } +sub init_zugferd_settings { \@SL::ZUGFeRD::customer_settings } sub init_posting_options { [ { title => t8("never"), value => 0 }, @@ -167,27 +196,39 @@ sub init_profit_options { { title => t8("income"), value => "income" }, ] } -sub init_accounts { - my %accounts; +sub init_balance_startdate_method_options { + return SL::DB::Helper::AccountingPeriod::get_balance_startdate_method_options; +} - foreach my $chart (@{ SL::DB::Manager::Chart->get_all(where => [ link => { like => '%IC%' } ], sort_by => 'accno ASC') }) { - my %added; +sub init_all_price_sources { + my @classes = SL::PriceSource::ALL->all_price_sources; - foreach my $link (split m/:/, $chart->link) { - my $key = lc($link =~ /cogs/ ? 'IC_expense' : $link =~ /sale/ ? 'IC_income' : $link); - next if $added{$key}; + [ map { [ $_->name, $_->description ] } @classes ]; +} - $added{$key} = 1; - $accounts{$key} ||= []; - push @{ $accounts{$key} }, $chart; - } - } +sub init_available_quick_search_modules { + [ SL::Controller::TopQuickSearch->new->available_modules ]; +} - $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_available_shipped_qty_item_identity_fields { + [ SL::Helper::ShippedQty->new->available_item_identity_fields ]; +} - return \%accounts; +sub init_displayable_name_specs_by_module { + +{ + 'SL::DB::Customer' => { + specs => SL::DB::Customer->displayable_name_specs, + prefs => SL::DB::Customer->displayable_name_prefs, + }, + 'SL::DB::Vendor' => { + specs => SL::DB::Vendor->displayable_name_specs, + prefs => SL::DB::Vendor->displayable_name_prefs, + }, + 'SL::DB::Part' => { + specs => SL::DB::Part->displayable_name_specs, + prefs => SL::DB::Part->displayable_name_prefs, + }, + }; } # @@ -205,10 +246,27 @@ sub check_auth { sub edit_form { my ($self) = @_; + $::request->layout->use_javascript("${_}.js") for qw(jquery.selectboxes jquery.multiselect2side kivi.File ckeditor/ckeditor ckeditor/adapters/jquery); + + $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;