From c02eef8bbee599ee7725c3f013cbd041f22afccb Mon Sep 17 00:00:00 2001
From: Robert Fewell <14uBobIT@gmail.com>
Date: Sat, 6 Jun 2020 10:14:50 +0100
Subject: [PATCH] Bug 797774 - Bill/Invoice due reminder confusion on CN?

The Bill/Invoice due reminder has a column header of 'CN?' which was
unclear of meaning which is 'Is this xxx a Credit Note'. A tooltip
was suggested but a better fix is to change the column to display the
'Type' so you would see Bill, Invoice or 'Credit Note' just like you
see in the find dialog.
---
 gnucash/gnome-utils/gnc-query-view.c       |  2 +-
 gnucash/gnome/dialog-invoice.c             | 11 +++++------
 gnucash/gtkbuilder/dialog-query-view.glade |  6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/gnucash/gnome-utils/gnc-query-view.c b/gnucash/gnome-utils/gnc-query-view.c
index 49b5acffd2..b61bee9481 100644
--- a/gnucash/gnome-utils/gnc-query-view.c
+++ b/gnucash/gnome-utils/gnc-query-view.c
@@ -192,7 +192,7 @@ gnc_query_view_init (GNCQueryView *qview)
     GNCQueryViewPrivate *priv;
 
     // Set the name for this widget so it can be easily manipulated with css
-    gtk_widget_set_name (GTK_WIDGET(qview), "gnc-id-query-view");
+    gtk_widget_set_name (GTK_WIDGET(qview), "gnc-id-query-view-view");
 
     qview->query = NULL;
 
diff --git a/gnucash/gnome/dialog-invoice.c b/gnucash/gnome/dialog-invoice.c
index 999a8fa887..7787fdc26d 100644
--- a/gnucash/gnome/dialog-invoice.c
+++ b/gnucash/gnome/dialog-invoice.c
@@ -3559,12 +3559,11 @@ gnc_invoice_show_docs_due (GtkWindow *parent, QofBook *book, double days_in_adva
     /* Create the param list (in reverse order) */
     if (param_list == NULL)
     {
-        /* Translators: This abbreviation is the column heading for
-           the condition "Is this invoice a Credit Note?" */
-        param_list = gnc_search_param_prepend (param_list, _("CN?"), NULL, type,
-                                               INVOICE_IS_CN, NULL);
-        param_list = gnc_search_param_prepend (param_list, _("Amount"), NULL, type,
-                                               INVOICE_POST_LOT, LOT_BALANCE, NULL);
+        param_list = gnc_search_param_prepend_with_justify (param_list, _("Amount"),
+                                                            GTK_JUSTIFY_RIGHT, NULL, type,
+                                                            INVOICE_POST_LOT, LOT_BALANCE, NULL);
+        param_list = gnc_search_param_prepend (param_list, _("Type"), NULL, type,
+                                               INVOICE_TYPE_STRING, NULL);
         param_list = gnc_search_param_prepend (param_list, _("Company"), NULL, type,
                                                INVOICE_OWNER, OWNER_PARENT, OWNER_NAME, NULL);
         param_list = gnc_search_param_prepend (param_list, _("Due"), NULL, type,
diff --git a/gnucash/gtkbuilder/dialog-query-view.glade b/gnucash/gtkbuilder/dialog-query-view.glade
index 09a84c2b6a..1f05a70b06 100644
--- a/gnucash/gtkbuilder/dialog-query-view.glade
+++ b/gnucash/gtkbuilder/dialog-query-view.glade
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.2 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="query_view_dialog">
     <property name="can_focus">False</property>
-    <property name="default_width">500</property>
+    <property name="default_width">600</property>
     <property name="default_height">300</property>
     <property name="type_hint">dialog</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">