From: Jan Büren <jan@kivitendo-premium.de>
Date: Thu, 30 May 2013 11:38:24 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~401
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=82053b457be3de2ee5285dc13633222f4d30802c;p=kivitendo-erp.git

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

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

82053b457be3de2ee5285dc13633222f4d30802c
diff --cc SL/DB/MetaSetup/Default.pm
index 8063f9ed5,7b1df394f..1fde1bbfa
--- a/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 locale/de/all
index 44c068ea7,18470b177..c416d452e
--- a/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',