Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[mfinanz.git] / SL / InstanceConfiguration.pm

diff --git a/SL/InstanceConfiguration.pm b/SL/InstanceConfiguration.pm
index 4e05b841fcec4c7f0d1161be5051f12311824f63..716edeed80dcb780e07f19248f3169bb45e5aecc 100644 (file)
--- a/SL/InstanceConfiguration.pm
+++ b/SL/InstanceConfiguration.pm
@@ -3,8 +3,7 @@ package SL::InstanceConfiguration;
 use strict;
 
 use Carp;
 use strict;
 
 use Carp;

-use SL::DB::Currency;
-use SL::DB::Default;
+use SL::DBUtils ();

 
 use parent qw(Rose::Object);
 use Rose::Object::MakeMethods::Generic (
 
 use parent qw(Rose::Object);
 use Rose::Object::MakeMethods::Generic (


@@ -12,15 +11,18 @@ use Rose::Object::MakeMethods::Generic (
 );
 
 sub init_data {
 );
 
 sub init_data {

-  my $default               = SL::DB::Default->get;
-  my $data                  = { map { $_ => $default->$_ } $default->meta->columns };
-  $data->{default_currency} = $default->currency ? $default->currency->name : undef;
+  return {} if !$::auth->client;
+
+  my $dbh                   = $::form->get_standard_dbh;
+  my $data                  = SL::DBUtils::selectfirst_hashref_query($::form, $dbh, qq|SELECT * FROM defaults|);
+  $data->{default_currency} = (SL::DBUtils::selectfirst_array_query($::form, $dbh, qq|SELECT name FROM currencies WHERE id = ?|, $data->{currency_id}))[0] if $data->{currency_id};

 
   return $data;
 }
 
 sub init_currencies {
 
   return $data;
 }
 
 sub init_currencies {

-  return [ map { $_->name } @{ SL::DB::Manager::Currency->get_all_sorted } ];
+  return [] if !$::auth->client;
+  return [ map { $_->{name} } SL::DBUtils::selectall_hashref_query($::form, $::form->get_standard_dbh, qq|SELECT name FROM currencies ORDER BY id ASC|) ];

 }
 
 sub reload {
 }
 
 sub reload {


@@ -42,6 +44,8 @@ sub AUTOLOAD {
   my $method =  $AUTOLOAD;
   $method    =~ s/.*:://;
 
   my $method =  $AUTOLOAD;
   $method    =~ s/.*:://;
 

+  return if $method eq 'DESTROY';
+

   if ($method =~ m/^get_/) {
     $method = substr $method, 4;
     return $self->data->{$method} if exists $self->data->{$method};
   if ($method =~ m/^get_/) {
     $method = substr $method, 4;
     return $self->data->{$method} if exists $self->data->{$method};


@@ -164,20 +168,20 @@ corresponding record type (true or false).
 Returns the default behavior for showing the delete button for the
 corresponding record type (true or false).
 
 Returns the default behavior for showing the delete button for the
 corresponding record type (true or false).
 

-=item C<get_default_warehouse_id>
+=item C<get_warehouse_id>

 
 Returns the default warehouse_id
 
 
 Returns the default warehouse_id
 

-=item C<get_default_bin_id>
+=item C<get_bin_id>

 
 Returns the default bin_id
 
 
 Returns the default bin_id
 

-=item C<get_default_warehouse_id_ignore_onhand>
+=item C<get_warehouse_id_ignore_onhand>

 
 Returns the default warehouse_id for transfers without checking the
 current stock quantity
 
 
 Returns the default warehouse_id for transfers without checking the
 current stock quantity
 

-=item C<get_default_bin_id_ignore_onhand>
+=item C<get_bin_id_ignore_onhand>

 
 Returns the default bin_id for transfers without checking the.
 current stock quantity
 
 Returns the default bin_id for transfers without checking the.
 current stock quantity


@@ -198,11 +202,11 @@ Returns the maximum interval value for future bookings
 
 =item C<get_webdav>
 
 
 =item C<get_webdav>
 

-Returns the configuration for webdav
+Returns the configuration for WebDAV

 
 =item C<get_webdav_documents>
 
 
 =item C<get_webdav_documents>
 

-Returns the configuration for storing documents in the corresponding webdav folder
+Returns the configuration for storing documents in the corresponding WebDAV folder

 
 =item C<get_vertreter>
 
 
 =item C<get_vertreter>