Fix r19227, r19228: Don't make the "Due Date" the primary search; fix erroneous parameters when inserting into list.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19230 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2010-06-04 13:37:13 +00:00
parent 12f2b9e624
commit 7c61b19357

View File

@ -2435,6 +2435,9 @@ gnc_invoice_search (GncInvoice *start, GncOwner *owner, QofBook *book)
inv_params = gnc_search_param_prepend (inv_params,
_("Date Opened"), NULL, type,
INVOICE_OPENED, NULL);
inv_params = gnc_search_param_prepend (inv_params,
_("Due Date"), NULL, type,
INVOICE_DUE, NULL);
inv_params = gnc_search_param_prepend (inv_params,
_("Company Name "), NULL, type,
INVOICE_OWNER, OWNER_PARENT,
@ -2442,9 +2445,6 @@ gnc_invoice_search (GncInvoice *start, GncOwner *owner, QofBook *book)
inv_params = gnc_search_param_prepend (inv_params,
_("Invoice ID"), NULL, type,
INVOICE_ID, NULL);
inv_params = gnc_search_param_prepend (inv_params,
_("Due Date"), NULL, type,
INVOICE_DUE, NULL);
}
if (bill_params == NULL)
{
@ -2469,6 +2469,9 @@ gnc_invoice_search (GncInvoice *start, GncOwner *owner, QofBook *book)
bill_params = gnc_search_param_prepend (bill_params,
_("Date Opened"), NULL, type,
INVOICE_OPENED, NULL);
bill_params = gnc_search_param_prepend (bill_params,
_("Due Date"), NULL, type,
INVOICE_DUE, NULL);
bill_params = gnc_search_param_prepend (bill_params,
_("Company Name "), NULL, type,
INVOICE_OWNER, OWNER_PARENT,
@ -2476,9 +2479,6 @@ gnc_invoice_search (GncInvoice *start, GncOwner *owner, QofBook *book)
bill_params = gnc_search_param_prepend (bill_params,
_("Bill ID"), NULL, type,
INVOICE_ID, NULL);
bill_params = gnc_search_param_prepend (inv_params,
_("Due Date"), NULL, type,
INVOICE_DUE, NULL);
}
if (emp_params == NULL)
{
@ -2503,6 +2503,9 @@ gnc_invoice_search (GncInvoice *start, GncOwner *owner, QofBook *book)
emp_params = gnc_search_param_prepend (emp_params,
_("Date Opened"), NULL, type,
INVOICE_OPENED, NULL);
emp_params = gnc_search_param_prepend (emp_params,
_("Due Date"), NULL, type,
INVOICE_DUE, NULL);
emp_params = gnc_search_param_prepend (emp_params,
_("Employee Name"), NULL, type,
INVOICE_OWNER, OWNER_PARENT,
@ -2510,9 +2513,6 @@ gnc_invoice_search (GncInvoice *start, GncOwner *owner, QofBook *book)
emp_params = gnc_search_param_prepend (emp_params,
_("Voucher ID"), NULL, type,
INVOICE_ID, NULL);
emp_params = gnc_search_param_prepend (inv_params,
_("Due Date"), NULL, type,
INVOICE_DUE, NULL);
}
/* Build the column list in reverse order */
@ -2525,13 +2525,13 @@ gnc_invoice_search (GncInvoice *start, GncOwner *owner, QofBook *book)
columns = gnc_search_param_prepend_with_justify (columns, _("Paid"),
GTK_JUSTIFY_CENTER, NULL, type,
INVOICE_IS_PAID, NULL);
columns = gnc_search_param_prepend (columns, _("Due"), NULL, type,
INVOICE_DUE, NULL);
columns = gnc_search_param_prepend (columns, _("Posted"), NULL, type,
INVOICE_POSTED, NULL);
columns = gnc_search_param_prepend (columns, _("Company"), NULL, type,
INVOICE_OWNER, OWNER_PARENT,
OWNER_NAME, NULL);
columns = gnc_search_param_prepend (columns, _("Due"), NULL, type,
INVOICE_DUE, NULL);
columns = gnc_search_param_prepend (columns, _("Opened"), NULL, type,
INVOICE_OPENED, NULL);
columns = gnc_search_param_prepend (columns, _("Num"), NULL, type,