From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 17 Feb 2015 14:19:29 +0000 (+0100)
Subject: GetModels-Filtered: CVars: default_value-Ersetzung besser greifen
X-Git-Tag: release-3.2.1~51^2~5
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=8a862ec020f773911c6ee60d459cc3206bfc7122;p=kivitendo-erp.git

GetModels-Filtered: CVars: default_value-Ersetzung besser greifen
---

diff --git a/SL/DB/Helper/CustomVariables.pm b/SL/DB/Helper/CustomVariables.pm
index fef521cfa..97837a287 100644
--- a/SL/DB/Helper/CustomVariables.pm
+++ b/SL/DB/Helper/CustomVariables.pm
@@ -309,7 +309,7 @@ sub make_cvar_custom_filter {
         query_is_sql       => 1,
       );
 
-      $query{config} =~ s{ \bdefault_value\b \s*=\s* (?!'') }{default_value::${conversion} = }x if $conversion;
+      $query{config} =~ s{ (?<! NOT\( ) default_value (?! \s*is\s+not\s+null) }{default_value::${conversion}}x if $conversion;
 
       ($query{not_customized}, $bind_vals{not_customized}) = Rose::DB::Object::QueryBuilder::build_select(
         dbh          => $config->dbh,