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

Conflicts:
	SL/DB/MetaSetup/Default.pm
	locale/de/all

diff --cc SL/AM.pm
Simple merge

diff --cc SL/DB/MetaSetup/Default.pm
index 8063f9e,7b1df39..1fde1bb
--- 1/SL/DB/MetaSetup/Default.pm
--- 2/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@@ -68,21 -67,17 +67,28 @@@ __PACKAGE__->meta->setup
      ar_show_mark_as_paid                => { type => 'boolean', default => 'true' },
      ap_show_mark_as_paid                => { type => 'boolean', default => 'true' },
      assemblynumber                      => { type => 'text' },
 +    warehouse_id                        => { type => 'integer' },
 +    bin_id                              => { type => 'integer' },
+     currency_id                         => { type => 'integer', not_null => 1 },
    ],
  
    primary_key_columns => [ 'id' ],
  
+   allow_inline_column_values => 1,
+ 
    foreign_keys => [
 +    bin => {
 +      class       => 'SL::DB::Bin',
 +      key_columns => { bin_id => 'id' },
 +    },
 +
 +    warehouse => {
 +      class       => 'SL::DB::Warehouse',
 +      key_columns => { warehouse_id => 'id' },
++
+     currency => {
+       class       => 'SL::DB::Currency',
+       key_columns => { currency_id => 'id' },
      },
    ],
  );

diff --cc SL/DO.pm
Simple merge

diff --cc SL/IR.pm
Simple merge

diff --cc SL/IS.pm
Simple merge

diff --cc SL/InstanceConfiguration.pm
Simple merge

diff --cc SL/OE.pm
Simple merge

diff --cc bin/mozilla/ic.pl
Simple merge

diff --cc locale/de/all
index 44c068e,18470b1..c416d45
--- 1/locale/de/all
--- 2/locale/de/all
+++ b/locale/de/all
@@@ -613,10 -608,10 +616,13 @@@ $self->{texts} = 
    'Decrease'                    => 'Verringern',
    'Default (no language selected)' => 'Standard (keine Sprache ausgewählt)',
    'Default Accounts'            => 'Standardkonten',
 +  'Default Bin'                 => 'Standard-Lagerplatz',
 +  'Default Customer/Vendor Language' => 'Standard-Kunden-/Lieferantensprache',
 +  'Default Warehouse'           => 'Standard-Lager',
+   'Default Customer/Vendor Language' => 'Standard-Kunden-/Lieferantensprache',
    'Default buchungsgruppe'      => 'Standardbuchungsgruppe',
+   'Default currency'            => 'Standardwährung',
+   'Default currency missing!'   => 'Standardwährung fehlt!',
    'Default output medium'       => 'Standardausgabekanal',
    'Default printer'             => 'Standarddrucker',
    'Default template format'     => 'Standardvorlagenformat',