gnucash maint: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Thu Mar 10 16:45:05 EST 2022
Updated via https://github.com/Gnucash/gnucash/commit/c1001e66 (commit)
via https://github.com/Gnucash/gnucash/commit/301b9009 (commit)
from https://github.com/Gnucash/gnucash/commit/38b557df (commit)
commit c1001e66414e8ef4bd1da2b0c4865c45d3aa3ac7
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 6 11:39:24 2022 -0800
Better wording for tax table changed info message.
diff --git a/libgnucash/engine/gncEntry.c b/libgnucash/engine/gncEntry.c
index ca1b72545..449abcabf 100644
--- a/libgnucash/engine/gncEntry.c
+++ b/libgnucash/engine/gncEntry.c
@@ -1368,7 +1368,7 @@ gncEntryRecomputeValues (GncEntry *entry)
time64 modtime = gncTaxTableLastModifiedSecs (entry->i_tax_table);
if (entry->i_taxtable_modtime != modtime)
{
- PINFO ("Invoice tax table changed");
+ PINFO ("Invoice tax table changed since last recompute.");
entry->values_dirty = TRUE;
entry->i_taxtable_modtime = modtime;
}
@@ -1378,7 +1378,7 @@ gncEntryRecomputeValues (GncEntry *entry)
time64 modtime = gncTaxTableLastModifiedSecs (entry->b_tax_table);
if (entry->b_taxtable_modtime != modtime)
{
- PINFO ("Bill tax table changed");
+ PINFO ("Bill tax table changed since last recompute.");
entry->values_dirty = TRUE;
entry->b_taxtable_modtime = modtime;
}
@@ -1405,6 +1405,7 @@ gncEntryRecomputeValues (GncEntry *entry)
denom = get_entry_commodity_denom (entry);
/* Compute the invoice values */
+ DEBUG("Compute Invoice Values.");
gncEntryComputeValue (entry->quantity, entry->i_price,
(entry->i_taxable ? entry->i_tax_table : NULL),
entry->i_taxincluded,
@@ -1415,6 +1416,7 @@ gncEntryRecomputeValues (GncEntry *entry)
&(entry->i_tax_values));
/* Compute the bill values */
+ DEBUG("Compute BILL Values.");
gncEntryComputeValue (entry->quantity, entry->b_price,
(entry->b_taxable ? entry->b_tax_table : NULL),
entry->b_taxincluded,
commit 301b9009a0f022878052dd7e56870808140cdcc9
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 6 11:33:28 2022 -0800
[register] Checkbox any value other than 0x20 (ASCII space) is true.
Because it can be X or U+2716 now and could be something else
in future.
Fixes in particular the disappearing tax-included and tax-table
in the Invoice/Bill entry register.
diff --git a/gnucash/register/ledger-core/gncEntryLedgerModel.c b/gnucash/register/ledger-core/gncEntryLedgerModel.c
index 15cd3f2f9..c3504630b 100644
--- a/gnucash/register/ledger-core/gncEntryLedgerModel.c
+++ b/gnucash/register/ledger-core/gncEntryLedgerModel.c
@@ -348,7 +348,7 @@ gnc_entry_ledger_get_taxable_value (VirtualLocation virt_loc,
const char *valstr =
get_taxable_entry (virt_loc, translate, conditionally_changed,
user_data);
- if (valstr && *valstr == 'X')
+ if (valstr && *valstr != ' ')
return TRUE;
}
return FALSE;
diff --git a/gnucash/register/register-core/checkboxcell.c b/gnucash/register/register-core/checkboxcell.c
index fe0f08071..3f85deba8 100644
--- a/gnucash/register/register-core/checkboxcell.c
+++ b/gnucash/register/register-core/checkboxcell.c
@@ -51,7 +51,7 @@ gnc_checkbox_cell_set_value (BasicCell *_cell, const char *value)
CheckboxCell *cell = (CheckboxCell *) _cell;
gboolean flag = FALSE;
- if (value && *value == 'X')
+ if (value && *value != ' ')
flag = TRUE;
gnc_checkbox_cell_set_flag (cell, flag);
Summary of changes:
gnucash/register/ledger-core/gncEntryLedgerModel.c | 2 +-
gnucash/register/register-core/checkboxcell.c | 2 +-
libgnucash/engine/gncEntry.c | 6 ++++--
3 files changed, 6 insertions(+), 4 deletions(-)
More information about the gnucash-changes
mailing list