gnucash master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sat Jan 7 12:07:40 EST 2023
Updated via https://github.com/Gnucash/gnucash/commit/59410a95 (commit)
via https://github.com/Gnucash/gnucash/commit/40b76061 (commit)
via https://github.com/Gnucash/gnucash/commit/f7324d16 (commit)
via https://github.com/Gnucash/gnucash/commit/2733d23b (commit)
via https://github.com/Gnucash/gnucash/commit/a9a67c71 (commit)
from https://github.com/Gnucash/gnucash/commit/c65b3649 (commit)
commit 59410a9518388c1e274462968d2323ee8053b2d2
Merge: c65b36490 40b76061e
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jan 7 08:42:17 2023 -0800
Merge branch 'maint'
commit 40b76061e0c76b652559f297a71c5cca3ce8b267
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sat Jan 7 22:06:21 2023 +0800
Bug 798717 - Reports > Business > Fancy Invoice duplicates company details
company details were duplicated in error.
diff --git a/gnucash/report/reports/standard/invoice.scm b/gnucash/report/reports/standard/invoice.scm
index 02916ff7f..1468e5cb1 100644
--- a/gnucash/report/reports/standard/invoice.scm
+++ b/gnucash/report/reports/standard/invoice.scm
@@ -142,7 +142,7 @@
.invoice-notes { margin-top: 20px }
.entries-table > table { min-width: 600px }"))))
- (cons 'fancy-invoice (list (cons '1a 'company)
+ (cons 'fancy-invoice (list (cons '1a 'none)
(cons '1b 'invoice)
(cons '2a 'client)
(cons '2b 'company)
commit f7324d16b47ec180a0a79ebb5a50c169236f6074
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jan 7 03:49:48 2023 +0300
Bug 798625 - "Last up through report date" changed in 4.12
Don't adjust report dates with time64CanonicalDayTime. They're set
to 23:59:59 local which is always >= neutral time at which prices
and transactions are timestamped. Local noon is before neutral time for
all time zones east of UTC+2.
diff --git a/gnucash/report/commodity-utilities.scm b/gnucash/report/commodity-utilities.scm
index 84e218bde..5e1990de2 100644
--- a/gnucash/report/commodity-utilities.scm
+++ b/gnucash/report/commodity-utilities.scm
@@ -739,7 +739,7 @@
(gnc-pricedb-get-db (gnc-get-current-book))
(gnc:gnc-monetary-amount foreign)
(gnc:gnc-monetary-commodity foreign)
- domestic (time64CanonicalDayTime date))))))
+ domestic date)))))
(define (gnc:exchange-by-pricedb-nearest-before foreign domestic date)
(and (gnc:gnc-monetary? foreign) date
@@ -751,7 +751,7 @@
(gnc-pricedb-get-db (gnc-get-current-book))
(gnc:gnc-monetary-amount foreign)
(gnc:gnc-monetary-commodity foreign)
- domestic (time64CanonicalDayTime date))))))
+ domestic date)))))
;; Exchange by the nearest price from pricelist. This function takes
;; the <gnc-monetary> 'foreign' amount, the <gnc:commodity*>
@@ -817,9 +817,9 @@
(define pdb (gnc-pricedb-get-db (gnc-get-current-book)))
(case source
((pricedb-nearest) (cut gnc-pricedb-get-nearest-price pdb <> target-curr
- (time64CanonicalDayTime date)))
+ date))
((pricedb-before) (cut gnc-pricedb-get-nearest-before-price pdb <> target-curr
- (time64CanonicalDayTime date)))
+ date))
((pricedb-latest) (cut gnc-pricedb-get-latest-price pdb <> target-curr))
(else
(lambda (commodity)
diff --git a/gnucash/report/trep-engine.scm b/gnucash/report/trep-engine.scm
index 48e80cdfc..5a46604b2 100644
--- a/gnucash/report/trep-engine.scm
+++ b/gnucash/report/trep-engine.scm
@@ -1316,17 +1316,13 @@ be excluded from periodic reporting.")
(opt-val pagename-currency
optname-currency)))
""))))
- ;; For conversion to row-currency. Use midday as the
- ;; transaction time so it matches a price on the same day.
- ;; Otherwise it uses midnight which will likely match a
- ;; price on the previous day
+ ;; For conversion to row-currency.
(converted-amount (lambda (s)
(exchange-fn
(gnc:make-gnc-monetary (split-currency s)
(split-amount s))
(row-currency s)
- (time64CanonicalDayTime
- (xaccTransGetDate (xaccSplitGetParent s))))))
+ (xaccTransGetDate (xaccSplitGetParent s)))))
(converted-debit-amount (lambda (s) (and (positive? (split-amount s))
(converted-amount s))))
(converted-credit-amount (lambda (s)
commit 2733d23b687c9631a3429febeab27c38b59bcd2b
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Thu Jan 5 13:28:27 2023 +0800
[dialog-sx-editor] increase EX_CAL_NUM_MONTHS from 6 to 12
because the example calendar can show up to 12 months. This means a
daily SX will show all recurrences in the calendar instead of only 6
months.
diff --git a/gnucash/gnome/dialog-sx-editor.c b/gnucash/gnome/dialog-sx-editor.c
index b1c8942e7..74933d03e 100644
--- a/gnucash/gnome/dialog-sx-editor.c
+++ b/gnucash/gnome/dialog-sx-editor.c
@@ -83,7 +83,7 @@ static gint _sx_engine_event_handler_id = -1;
#define NUM_LEDGER_LINES_DEFAULT 6
-#define EX_CAL_NUM_MONTHS 6
+#define EX_CAL_NUM_MONTHS 12
#define EX_CAL_MO_PER_COL 3
#define GNC_D_WIDTH 25
commit a9a67c717e34ff53f8d9d1a6e808a1bf0b7fb9cf
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Thu Jan 5 14:37:10 2023 +0800
[dialog-sx-editor] plug GHashTable leaks when returning early
diff --git a/gnucash/gnome/dialog-sx-editor.c b/gnucash/gnome/dialog-sx-editor.c
index cfe19a712..b1c8942e7 100644
--- a/gnucash/gnome/dialog-sx-editor.c
+++ b/gnucash/gnome/dialog-sx-editor.c
@@ -862,7 +862,11 @@ gnc_sxed_check_consistent (GncSxEditorDialog *sxed)
xaccAccountForEachTransaction (tmpl_acct, check_transaction_splits, &sd);
if (sd.err)
+ {
+ g_hash_table_destroy (vars);
+ g_hash_table_destroy (txns);
return FALSE;
+ }
g_hash_table_foreach (txns, check_credit_debit_balance, &unbalanceable);
}
Summary of changes:
gnucash/gnome/dialog-sx-editor.c | 6 +++++-
gnucash/report/commodity-utilities.scm | 8 ++++----
gnucash/report/reports/standard/invoice.scm | 2 +-
gnucash/report/trep-engine.scm | 8 ++------
4 files changed, 12 insertions(+), 12 deletions(-)
More information about the gnucash-changes
mailing list