IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-20 11:48:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bug #639365: Revert r18546 so that the bills-due dialog displays only bills but not invoices.

Browse Source 
The INVOICE_TYPE string unfortunately is
stored in translated form due to the usage of gncInvoiceGetType()
for user-visible strings as well. Hence, as an exception we
must also search for the translated here even though it's an
internal flag.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20087 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2011-01-13 19:05:59 +00:00
parent 7f25a62f33
commit 15bc162e7c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/business/business-gnome/dialog-invoice.c
View File

@ -2698,7 +2698,7 @@ gnc_invoice_show_bills_due (QofBook *book, double days_in_advance)
/* we want to find all invoices where:
* invoice -> is_posted == TRUE
* AND invoice -> lot -> is_closed? == FALSE
* AND invoice -> type != "Invoice"
* AND invoice -> type != _("Invoice") // note: currently the translated form
* AND invoice -> due >= (today - days_in_advance)
*/
@ -2708,10 +2708,12 @@ gnc_invoice_show_bills_due (QofBook *book, double days_in_advance)
qof_query_add_boolean_match (q, g_slist_prepend(g_slist_prepend(NULL, LOT_IS_CLOSED),
INVOICE_POST_LOT), FALSE, QOF_QUERY_AND);
/* Watch out: Do *not* translate the string "Invoice" here because
it must match the QofObject.type_label string exactly, which
implies it is used in untranslated form! */
pred_data = qof_query_string_predicate (QOF_COMPARE_NEQ, "Invoice",
/* Bug#602091, #639365: The INVOICE_TYPE string unfortunately is
* stored in translated form due to the usage of gncInvoiceGetType
* for user-visible strings as well. Hence, as an exception we
* must also search for the translated here even though it's an
* internal flag. */
pred_data = qof_query_string_predicate (QOF_COMPARE_NEQ, _("Invoice"),
QOF_STRING_MATCH_NORMAL, FALSE);
qof_query_add_term (q, g_slist_prepend(NULL, INVOICE_TYPE), pred_data, QOF_QUERY_AND);