Freitagabendcommit Fixes

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index bf9e89c..109aabe 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -42,7 +42,6 @@ __PACKAGE__->meta->columns(
   datev_check_on_sales_invoice              => { type => 'boolean', default => 'true' },
   delivery_plan_calculate_transferred_do    => { type => 'boolean', default => 'false', not_null => 1 },
   delivery_plan_show_value_of_goods         => { type => 'boolean', default => 'false', not_null => 1 },
-  disabled_price_sources                    => { type => 'array' },
   dunning_ar                                => { type => 'integer' },
   dunning_ar_amount_fee                     => { type => 'integer' },
   dunning_ar_amount_interest                => { type => 'integer' },

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index e8af23f..5af1b88 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1000,7 +1000,6 @@ sub edit_e_mail {
   $form->{oldmedia} = $form->{media};
   $form->{media}    = "email";
 
-  my $defaults =
   my $global_bcc = AM->get_defaults()->{global_bcc};
 
   $form->{bcc} = join ', ', grep $_, $form->{bcc}, $global_bcc;