Merge branch 'master' of http://wagnertech.de/git/mfinanz

[mfinanz.git] / SL / Controller / ClientConfig.pm

diff --git a/SL/Controller/ClientConfig.pm b/SL/Controller/ClientConfig.pm
index 2279ef1dab0e01fc3a7ad94ab25c1849ca00787b..94d81d3d548854e0dda8aac4daf98758129d9dd1 100644 (file)
--- a/SL/Controller/ClientConfig.pm
+++ b/SL/Controller/ClientConfig.pm
@@ -12,21 +12,33 @@ use SL::DB::Default;
 use SL::DB::Language;
 use SL::DB::Part;
 use SL::DB::Unit;
 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::Helper::Flash;
 use SL::Locale::String qw(t8);

+use SL::PriceSource::ALL;

 use SL::Template;
 use SL::Template;

+use SL::DB::Order::TypeData;
+use SL::DB::DeliveryOrder::TypeData;
+use SL::DB::Reclamation::TypeData;
+use SL::Controller::TopQuickSearch;
+use SL::DB::Helper::AccountingPeriod qw(get_balance_startdate_method_options);
+use SL::VATIDNr;
+use SL::ZUGFeRD;

 
 __PACKAGE__->run_before('check_auth');
 
 use Rose::Object::MakeMethods::Generic (
 
 __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 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
+                                  all_project_statuses all_project_types zugferd_settings
+                                  posting_options payment_options accounting_options inventory_options profit_options balance_startdate_method_options yearend_options
+                                  displayable_name_specs_by_module available_documents_with_no_positions) ],

 );
 
 sub action_edit {
   my ($self, %params) = @_;
 
   $::form->{use_templates} = $self->defaults->templates ? 'existing' : 'new';
 );
 
 sub action_edit {
   my ($self, %params) = @_;
 
   $::form->{use_templates} = $self->defaults->templates ? 'existing' : 'new';

+  $::form->{feature_datev} = $self->defaults->feature_datev;

   $self->edit_form;
 }
 
   $self->edit_form;
 }
 


@@ -36,14 +48,13 @@ sub action_save {
   my $defaults             = delete($::form->{defaults}) || {};
   my $entered_currencies   = delete($::form->{currencies}) || [];
   my $original_currency_id = $self->defaults->currency_id;
   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->{$_};
   }
 
 
   # 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;
   $self->defaults->assign_attributes(%{ $defaults });
 
   my %errors_idx;


@@ -66,13 +77,21 @@ sub action_save {
       $existing_currency->name($new_name);
     }
   }
       $existing_currency->name($new_name);
     }
   }

-

   if ($::form->{new_currency} && $new_currency_names{ $::form->{new_currency} }) {
     $errors_idx{1} = t8('Currency names must be unique.');
   }
 
   my @errors = map { $errors_idx{$_} } sort keys %errors_idx;
 
   if ($::form->{new_currency} && $new_currency_names{ $::form->{new_currency} }) {
     $errors_idx{1} = t8('Currency names must be unique.');
   }
 
   my @errors = map { $errors_idx{$_} } sort keys %errors_idx;
 

+  # check valid mail adresses
+  foreach (qw(email_sender_sales_quotation email_sender_request_quotation email_sender_sales_order
+             email_sender_purchase_order email_sender_sales_delivery_order email_sender_purchase_delivery_order
+             email_sender_invoice email_sender_purchase_invoice email_sender_letter email_sender_dunning
+             global_bcc)) {
+    next unless $defaults->{$_};
+    next if     $defaults->{$_} =~ /^[a-z0-9.]+\@[a-z0-9.-]+$/i;
+    push @errors, t8('The email entry for #1 looks invalid', $_);
+  }

   # Check templates
   $::form->{new_templates}        =~ s:/::g;
   $::form->{new_master_templates} =~ s:/::g;
   # Check templates
   $::form->{new_templates}        =~ s:/::g;
   $::form->{new_master_templates} =~ s:/::g;


@@ -90,6 +109,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) {
   # Show form again if there were any errors. Nothing's been changed
   # yet in the database.
   if (@errors) {


@@ -125,6 +149,11 @@ sub action_save {
     $self->defaults->templates('templates/' . $::form->{new_templates});
   }
 
     $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;
 
   # Finally save defaults.
   $self->defaults->save;
 


@@ -143,7 +172,10 @@ 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_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_zugferd_settings     { \@SL::ZUGFeRD::customer_settings                                                         }

 
 sub init_posting_options {
   [ { title => t8("never"),           value => 0           },
 
 sub init_posting_options {
   [ { title => t8("never"),           value => 0           },


@@ -173,34 +205,49 @@ sub init_profit_options {
 }
 
 sub init_balance_startdate_method_options {
 }
 
 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"    }, ]
+  return SL::DB::Helper::AccountingPeriod::get_balance_startdate_method_options;

 }
 
 }
 

-sub init_accounts {
-  my %accounts;
+sub init_yearend_options {
+  [ { title => t8("default"),         value => "default"   },
+    { title => t8("simple"),          value => "simple"    }, ]
+}

 
 

-  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 ];
+}
+
+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,
+     },
+  };
+}

 
 

-  $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_documents_with_no_positions {
+  my @docs = ( @{SL::DB::Order::TypeData::valid_types()},
+               @{SL::DB::DeliveryOrder::TypeData::valid_types()},
+               @{SL::DB::Reclamation::TypeData::valid_types()} );

 
 

-  return \%accounts;
+  my @available_docs = map { {name => $_, description => $::form->get_formname_translation($_)} } @docs;
+
+  return \@available_docs;

 }
 
 #
 }
 
 #


@@ -218,10 +265,27 @@ sub check_auth {
 sub edit_form {
   my ($self) = @_;
 
 sub edit_form {
   my ($self) = @_;
 

+  $::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] },
               );
 }
 
   $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;
 1;