Merge branch 'gewicht'

[mfinanz.git] / SL / InstanceConfiguration.pm

diff --git a/SL/InstanceConfiguration.pm b/SL/InstanceConfiguration.pm
index ac14b0ae0f340338fef98a61e5166afb500058f8..d9b7129a7d5642991978846fb6f383de220638e6 100644 (file)
--- a/SL/InstanceConfiguration.pm
+++ b/SL/InstanceConfiguration.pm
@@ -15,9 +15,9 @@ sub init {
 
   $self->{data} = selectfirst_hashref_query($::form, $::form->get_standard_dbh, qq|SELECT * FROM defaults|);
 
 
   $self->{data} = selectfirst_hashref_query($::form, $::form->get_standard_dbh, qq|SELECT * FROM defaults|);
 

-  my $curr            =  $self->{data}->{curr} || '';
-  $curr               =~ s/\s+//g;
-  $self->{currencies} =  [ split m/:/, $curr ];
+  #To get all currencies and the default currency:
+  ($self->{data}->{curr}) = selectrow_query($::form, $::form->get_standard_dbh, qq|SELECT name AS curr FROM currencies WHERE id = (SELECT currency_id FROM defaults)|);
+  $self->{currencies}     = [ map { $_->{name} } selectall_hashref_query($::form, $::form->get_standard_dbh, qq|SELECT name FROM currencies ORDER BY id|) ];

 
   return $self;
 }
 
   return $self;
 }


@@ -25,13 +25,13 @@ sub init {
 sub get_default_currency {
   my ($self) = @_;
 
 sub get_default_currency {
   my ($self) = @_;
 

-  return ($self->get_currencies)[0];
+  return $self->{data}->{curr};

 }
 
 sub get_currencies {
   my ($self) = @_;
 
 }
 
 sub get_currencies {
   my ($self) = @_;
 

-  return $self->{currencies} ? @{ $self->{currencies} } : ();
+  return @{ $self->{currencies} };

 }
 
 sub get_accounting_method {
 }
 
 sub get_accounting_method {


@@ -144,6 +144,16 @@ sub get_purchase_delivery_order_show_delete {
   return $self->{data}->{purchase_delivery_order_show_delete};
 }
 
   return $self->{data}->{purchase_delivery_order_show_delete};
 }
 

+sub get_default_warehouse_id {
+  my ($self) = @_;
+  return ($self->{data}->{warehouse_id});
+}
+
+sub get_default_bin_id {
+  my ($self) = @_;
+  return ($self->{data}->{bin_id});
+}
+

 1;
 
 __END__
 1;
 
 __END__


@@ -158,7 +168,7 @@ SL::InstanceConfiguration - Provide instance-specific configuration data
 
 =head1 SYNOPSIS
 
 
 =head1 SYNOPSIS
 

-Lx-Office has two configuration levels: installation specific
+kivitendo has two configuration levels: installation specific

 (provided by the global variable C<%::lx_office_conf>) and instance
 specific. The latter is provided by a global instance of this class,
 C<$::instance_conf>.
 (provided by the global variable C<%::lx_office_conf>) and instance
 specific. The latter is provided by a global instance of this class,
 C<$::instance_conf>.


@@ -256,6 +266,14 @@ 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>
+
+Returns the default warehouse_id
+
+=item C<get_default_bin_id>
+
+Returns the default bin_id
+

 =back
 
 =head1 BUGS
 =back
 
 =head1 BUGS