Merge branch 'master' into currency

Conflicts:
	locale/de/all

diff --cc SL/AM.pm
index 86b29d1,c85c479..e472704
--- 1/SL/AM.pm
--- 2/SL/AM.pm
+++ b/SL/AM.pm
@@@ -1083,8 -1084,10 +1080,9 @@@ sub save_defaults 
          vendornumber       = ?,
          articlenumber      = ?,
          servicenumber      = ?,
+         assemblynumber     = ?,
          sdonumber          = ?,
          pdonumber          = ?,
 -        curr               = ?,
          businessnumber     = ?,
          weightunit         = ?,
          language_id        = ?|;
@@@ -1095,7 -1098,9 +1093,8 @@@
                  $form->{sqnumber},        $form->{rfqnumber},
                  $form->{customernumber},  $form->{vendornumber},
                  $form->{articlenumber},   $form->{servicenumber},
+                 $form->{assemblynumber},
                  $form->{sdonumber},       $form->{pdonumber},
 -                $currency,
                  $form->{businessnumber},  $form->{weightunit},
                  conv_i($form->{language_id}));
    do_query($form, $dbh, $query, @values);

diff --cc SL/DO.pm
Simple merge

diff --cc SL/Form.pm
Simple merge

diff --cc SL/IR.pm
Simple merge

diff --cc SL/IS.pm
Simple merge

diff --cc SL/OE.pm
Simple merge

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

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

diff --cc locale/de/all
index bb7a9f3,cce6b2d..2e84032
mode 100644,100755..100755
--- 1/locale/de/all
--- 2/locale/de/all
+++ b/locale/de/all
@@@ -926,7 -931,8 +934,9 @@@ $self->{texts} = 
    'Fristsetzung'                => 'Fristsetzung',
    'From'                        => 'Von',
    'From Date'                   => 'Von',
 +  'From this version on it is necessary to name a default value.' => 'Ab dieser Version benötigt kivitendo eine Standardwährung.',
+   'From this version on a new feature is available.' => 'Ab dieser Version ist ein neues Feature verfügbar.',
+   'From this version on the partnumber of services, articles and assemblies have to be unique.' => 'Ab dieser Version müssen Artikelnummern eindeutig vergeben werden.',
    'From this version on the taxkey 0 must have a tax rate of 0 (for DATEV compatibility).' => 'Ab dieser Version muss der Steuerschlüssel 0 einen Steuersatz von 0% haben (auf Grund der DATEV-Kompatibilität).',
    'Full Access'                 => 'Vollzugriff',
    'Full Preview'                => 'Alles',

diff --cc templates/webpages/am/edit_defaults.html
Simple merge