From: Thomas Heck <theck@linet-services.de>
Date: Mon, 22 Apr 2013 13:02:51 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~482
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/0e5caa791bfdafd12579ac9896209e6f3209fb3f?hp=6e23f1ee6d4082f6cecb9adc69b14414e7059623

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

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index 55d1e5ee5..bb174ebaa 100644
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -67,7 +67,6 @@ __PACKAGE__->meta->setup(
     ir_show_mark_as_paid                => { type => 'boolean', default => 'true' },
     ar_show_mark_as_paid                => { type => 'boolean', default => 'true' },
     ap_show_mark_as_paid                => { type => 'boolean', default => 'true' },
-    deviating_fiscal_year               => { type => 'boolean' },
     assemblynumber                      => { type => 'text' },
   ],
 
diff --git a/SL/Form.pm b/SL/Form.pm
index 8859cae40..5af4dc287 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -3190,6 +3190,7 @@ sub update_defaults {
   my ($var) = $sth->fetchrow_array;
   $sth->finish;
 
+  $var   = 0 if !defined($var) || ($var eq '');
   $var   = SL::PrefixedNumber->new(number => $var)->get_next;
   $query = qq|UPDATE defaults SET $fld = ?|;
   do_query($self, $dbh, $query, $var);