gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/e6573664 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/002b3918 (commit)
	from  https://github.com/Gnucash/gnucash/commit/ab24c346 (commit)



commit e6573664680b322ef59cd8a74f54a6633c5af56a
Merge: ab24c3466 002b39183
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Sep 7 12:20:47 2021 -0700

    Merge Yi TianXing's 'remove_FindCustomerDialog_Parameter_ShippingContact' into maint.


commit 002b391836a211756f92a9baef0a69ee97596dfc
Author: TianXing-Yi <ytx.cash at gmail.com>
Date:   Sat Jul 10 20:02:32 2021 +0800

    In find customer dialog, add a column for "Shipping Contact" parameter

diff --git a/gnucash/gnome/dialog-customer.c b/gnucash/gnome/dialog-customer.c
index f356bfa17..560b54060 100644
--- a/gnucash/gnome/dialog-customer.c
+++ b/gnucash/gnome/dialog-customer.c
@@ -930,6 +930,8 @@ gnc_customer_search (GtkWindow *parent, GncCustomer *start, QofBook *book)
     /* Build the column list in reverse order */
     if (columns == NULL)
     {
+        columns = gnc_search_param_prepend (columns, _("Shipping Contact"), NULL, type,
+                                            CUSTOMER_SHIPADDR, ADDRESS_NAME, NULL);
         columns = gnc_search_param_prepend (columns, _("Contact"), NULL, type,
                                             CUSTOMER_ADDR, ADDRESS_NAME, NULL);
         columns = gnc_search_param_prepend (columns, _("Company"), NULL, type,



Summary of changes:
 gnucash/gnome/dialog-customer.c | 2 ++
 1 file changed, 2 insertions(+)