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

[mfinanz.git] / SL / InstanceConfiguration.pm

diff --git a/SL/InstanceConfiguration.pm b/SL/InstanceConfiguration.pm
index 59ca8a0352920f51a08a9e5b2d9d4b630b535fa9..d03db2a5c9ec6c22f7e1e8289d425dcdfdbb6fb0 100644 (file)
--- a/SL/InstanceConfiguration.pm
+++ b/SL/InstanceConfiguration.pm
@@ -52,6 +52,21 @@ sub get_currencies {
   return @{ $self->currencies };
 }
 
+sub get_address {
+  # Compatibility function: back in the day there was only a single
+  # address field.
+  my ($self) = @_;
+
+  my $zipcode_city = join ' ', grep { $_ } ($self->get_address_zipcode, $self->get_address_city);
+
+  return join "\n", grep { $_ } ($self->get_address_street1, $self->get_address_street2, $zipcode_city, $self->get_address_country);
+}
+
+sub get_layout_style {
+  return $_[0]->data->{layout_style} if exists $_[0]->data->{layout_style};
+  return '';
+}
+
 sub AUTOLOAD {
   our $AUTOLOAD;
 
@@ -111,6 +126,11 @@ Returns an array of configured currencies.
 Returns the default currency or undef if no currency has been
 configured.
 
+=item C<get_layout_style>
+
+Returns the forced default layout style or '' if the database column
+does not exist yet.
+
 =item C<get_accounting_method>
 
 Returns the default accounting method, accrual or cash
@@ -232,14 +252,6 @@ Returns the configuration for storing documents in the corresponding WebDAV fold
 
 Returns the configuration for "vertreter"
 
-=item C<get_feature_experimental_assortment>
-
-Returns the configuration for experimental feature "assortment"
-
-=item C<get_feature_experimental_order>
-
-Returns the configuration for the experimental feature "order"
-
 =item C<get_parts_show_image>
 
 Returns the configuarion for show image in parts