disable quotations without fully-qualifying all other searches, RT#20688, RT#22232

2 files changed, 5 insertions, 1 deletions

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 4546741a9..0810a7ec3 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -45,6 +45,8 @@ our $nowarn_classload = 0;
 our $no_update_diff = 0;
 our $no_history = 0;
 
+our $qsearch_qualify_columns = 0;
+
 our $no_check_foreign = 1; #well, not inefficiently in perl by default anymore
 
 my $rsa_module;
@@ -754,7 +756,7 @@ sub get_real_fields {
 
       my $op = '=';
       my $column = $_;
-      my $table_column = "$table.$column";
+      my $table_column = $qsearch_qualify_columns ? "$table.$column" : $column;
       my $type = dbdef->table($table)->column($column)->type;
       my $value = $record->{$column};
       $value = $value->{'value'} if ref($value);
diff --git a/httemplate/search/quotation.html b/httemplate/search/quotation.html
index 6badb13b7..55c60f0c1 100755
--- a/httemplate/search/quotation.html
+++ b/httemplate/search/quotation.html
@@ -73,6 +73,8 @@ my $curuser = $FS::CurrentUser::CurrentUser;
 die "access denied"
   unless $curuser->access_right('List quotations');
 
+local($FS::Record::qsearch_qualify_columns) = 1;
+
 my $join_prospect_main = 'LEFT JOIN prospect_main USING ( prospectnum )';
 my $join_cust_main = FS::UI::Web::join_cust_main('quotation');