IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-26 19:00:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
John Ralls 2020-12-29 12:55:40 -08:00
commit 8bf306fc53
15 changed files with 104 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
NEWS
View File

@ -1,5 +1,23 @@
Version history:
------- -------
4.4 - 28 December 2020
The fifth release of the 4.x stable series, a snap release to fix bug 798063.
Between 4.3 and 4.4, the following bugfixes were accomplished:
Bug 798038 - Incorrect spelling in german account templates 'common' and
'full' part 2: AT
Bug 798063 - Crash when opening SX Editor
No other improvements were made.
Deprecations
xaccAccountCountSplits: use gnc_account_has_child_splits
gnc:html-table-append-column!: Build a new table with all of the columns
and copy in the rows.
Updated Translations: German, Italian, Japanese
4.3 - 27 December 2020
The fourth release of the 4.x stable series.

4
data/accounts/de_AT/acctchrt_business.gnucash-xea
View File

@ -408,7 +408,7 @@
<act:parent type="new">92e8778ae32b3fb473352cf90345b154</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Einkommenssteuer</act:name>
<act:name>Einkommensteuer</act:name>
<act:id type="new">115085afb79a187b3f15a055196dbd8a</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
@ -416,7 +416,7 @@
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Einkommenssteuer</act:description>
<act:description>Einkommensteuer</act:description>
<act:parent type="new">92e8778ae32b3fb473352cf90345b154</act:parent>
</gnc:account>
<gnc:account version="2.0.0">

4
data/accounts/de_AT/acctchrt_common.gnucash-xea
View File

@ -594,7 +594,7 @@
<act:parent type="new">073ef0026c59c96d794935e1361602d0</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Einkommenssteuer</act:name>
<act:name>Einkommensteuer</act:name>
<act:id type="new">ab3b17af105254efa0aa4348773d34fc</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
@ -602,7 +602,7 @@
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Einkommenssteuer</act:description>
<act:description>Einkommensteuer</act:description>
<act:parent type="new">92bd7aeef848a997f1af8ac7b132035e</act:parent>
</gnc:account>
<gnc:account version="2.0.0">

2
gnucash/gnome-utils/dialog-account.c
View File

@ -211,7 +211,7 @@ gnc_account_opening_balance_button_update (AccountWindow *aw, gnc_commodity *com
{
Account *account = aw_get_account (aw);
Account *ob_account = gnc_account_lookup_by_opening_balance (gnc_book_get_root_account (aw->book), commodity);
gboolean has_splits = xaccAccountCountSplits (account, FALSE) > 0;
gboolean has_splits = (xaccAccountGetSplitList (account) != NULL);
if (xaccAccountGetType (account) != ACCT_TYPE_EQUITY)
{

1
gnucash/gnome-utils/gnc-main-window.c
View File

@ -2456,6 +2456,7 @@ main_window_update_page_set_read_only_icon (GncPluginPage *page,
ENTER(" ");
g_return_if_fail(page && page->window && GNC_IS_MAIN_WINDOW(page->window));
window = GNC_MAIN_WINDOW(page->window);
/* Get the notebook tab widget */

2
gnucash/report/html-table.scm
View File

@ -415,6 +415,8 @@
(define (gnc:html-table-append-column! table newcol)
(define width (apply max (cons 0 (map length (gnc:html-table-data table)))))
(define (add-fn a b) (list-set-safe! b width a))
(issue-deprecation-warning "gnc:html-table-append-column! deprecated. please \
populate html-table row-wise using gnc:html-table-append-row! instead.")
(let lp ((newcol newcol)
(olddata (reverse (gnc:html-table-data table)))
(res '())

6
gnucash/report/reports/example/hello-world.scm
View File

@ -427,8 +427,10 @@ new, totally cool report, consult the mailing list ~a.")
(if (not (null? list-val))
(let ((table (gnc:make-html-table)))
(gnc:html-table-append-column!
table (map symbol->string list-val))
(for-each
(lambda (cell)
(gnc:html-table-append-row! table (list (symbol->string cell))))
list-val)
(gnc:html-table-set-style! table "table"
'attribute (list "style" "width:200px"))
(gnc:html-table-set-caption! table

29
gnucash/report/reports/standard/cashflow-barchart.scm
View File

@ -35,6 +35,7 @@
(use-modules (gnucash app-utils))
(use-modules (gnucash reports cash-flow-calc))
(use-modules (gnucash report))
(use-modules (srfi srfi-26))
(define reportname (N_ "Cash Flow Barchart"))
@ -327,6 +328,17 @@
(if (and non-zeros show-table?)
(let* ((table (gnc:make-html-table)))
(define (add-row date in out net)
(gnc:html-table-append-row!
table
(cons date
(map (cut gnc:make-html-table-cell/markup "number-cell" <>)
(append
(if show-in? (list in) '())
(if show-out? (list out) '())
(if show-net? (list net) '()))))))
(gnc:html-table-set-col-headers!
table (append (list (G_ "Date"))
(if show-in? (list (G_ "Money In")) '())
@ -335,22 +347,9 @@
(gnc:html-document-add-object!
doc (gnc:make-html-text (gnc:html-markup-h3 (G_ "Overview:"))))
(gnc:html-table-append-column! table (append date-string-list (list "Total")))
(if show-in?
(gnc:html-table-append-column! table (append in-list (list total-in))))
(if show-out?
(gnc:html-table-append-column! table (append out-list (list total-out))))
(if show-net?
(gnc:html-table-append-column! table (append net-list (list total-net))))
;; set numeric columns to align right
(for-each
(lambda (col)
(gnc:html-table-set-col-style!
table col "td"
'attribute (list "class" "number-cell")))
'(1 2 3))
(for-each add-row date-string-list in-list out-list net-list)
(add-row (G_ "Total") total-in total-out total-net)
(gnc:html-document-add-object! doc table))))

31
gnucash/report/reports/standard/net-charts.scm
View File

@ -229,11 +229,7 @@
;; This exchanges the commodity-collector 'c' to one single
;; 'report-currency' according to the exchange-fn. Returns a gnc:monetary
(define (collector->monetary c date)
(if (not (number? date))
(throw 'wrong))
(gnc:sum-collector-commodity
c report-currency
(lambda (a b) (exchange-fn a b date))))
(gnc:sum-collector-commodity c report-currency (cut exchange-fn <> <> date)))
;; gets an account alist balances
;; output: (list acc bal0 bal1 bal2 ...)
@ -425,21 +421,20 @@
(list (G_ "Net Profit"))
(list (G_ "Net Worth")))
'())))
(gnc:html-table-append-column! table date-string-list)
(when show-sep?
(gnc:html-table-append-column! table minuend-balances)
(gnc:html-table-append-column! table subtrahend-balances))
(if show-net?
(gnc:html-table-append-column! table difference-balances))
;; set numeric columns to align right
(for-each
(lambda (col)
(gnc:html-table-set-col-style!
table col "td"
'attribute (list "class" "number-cell")))
'(1 2 3))
(lambda (date minuend subtrahend difference)
(gnc:html-table-append-row!
table
(cons date
(map
(cut gnc:make-html-table-cell/markup "number-cell" <>)
(append (if show-sep? (list minuend subtrahend) '())
(if show-net? (list difference) '()))))))
date-string-list
minuend-balances
subtrahend-balances
difference-balances)
(gnc:html-document-add-object! document table)))

4
libgnucash/engine/Account.cpp
View File

@ -3905,6 +3905,10 @@ xaccAccountCountSplits (const Account *acc, gboolean include_children)
{
gint64 nr, i;
PWARN ("xaccAccountCountSplits is deprecated and will be removed \
in GnuCash 5.0. If testing for an empty account, use \
xaccAccountGetSplitList(account) == NULL instead. To test descendants \
as well, use gnc_account_and_descendants_empty.");
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), 0);
nr = g_list_length(xaccAccountGetSplitList(acc));

46
po/de.po
View File

@ -18,6 +18,7 @@
# K. Herbert <herbert.ka@mailo.com>, 2020.
# Milo Ivir <mail@milotype.de>, 2020.
# Alois Spitzbart <spitz234@hotmail.com>, 2020.
# Christian Wehling <christian.wehling@web.de>, 2020.
#
# Konventionen/Tastenkürzel:
# »Zitate«: [altgr]+[Y]/[X]
@ -29,8 +30,8 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2020-12-13 22:01+0100\n"
"PO-Revision-Date: 2020-12-27 01:10+0000\n"
"Last-Translator: Frank H. Ellenberger <frank.h.ellenberger@gmail.com>\n"
"PO-Revision-Date: 2020-12-29 02:29+0000\n"
"Last-Translator: Milo Ivir <mail@milotype.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/gnucash/gnucash/"
"de/>\n"
"Language: de\n"
@ -1879,7 +1880,7 @@ msgstr "Steuerrelevant"
#: gnucash/gnome/dialog-find-account.c:447
msgid "Search from "
msgstr " Suchen "
msgstr "Suche von "
#: gnucash/gnome/dialog-find-transactions2.c:107
#: gnucash/gnome/dialog-find-transactions.c:105
@ -2103,7 +2104,7 @@ msgstr "Buchungstext"
#: gnucash/report/trep-engine.scm:972 gnucash/report/trep-engine.scm:1134
#: gnucash/report/trep-engine.scm:1242
msgid "Notes"
msgstr "Bemerkung"
msgstr "Bemerkungen"
#: gnucash/gnome/dialog-find-transactions2.c:229
#: gnucash/gnome/dialog-find-transactions.c:229
@ -9036,7 +9037,7 @@ msgstr "Datei %s geöffnet. %s"
#: gnucash/gnome-utils/gnc-main-window.c:2863
msgctxt "lower case key for short cut to 'Accounts'"
msgid "a"
msgstr ""
msgstr "k"
#: gnucash/gnome-utils/gnc-main-window.c:2953
msgid "Unable to save to database."
@ -12531,7 +12532,7 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:14
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:117
msgid "Confirm Window Close"
msgstr ""
msgstr "Fenster schließen bestätigen"
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:15
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:118
@ -16620,9 +16621,9 @@ msgid ""
"will be displayed again next time you start GnuCash. If you press the <i>No</"
"i> button, it will not be displayed again."
msgstr ""
"Wenn Sie <i>Ja</i> klicken, wird dieses Begrüßungsfenster beim nächsten "
"Starten von GnuCash wieder angezeigt. Wenn Sie <i>Nein</i> klicken, wird es "
"nicht wieder angezeigt."
"Wenn Sie <i>Ja</i> klicken, wird das Begrüßungsfenster beim nächsten Starten "
"von GnuCash wieder angezeigt. Wenn Sie <i>Nein</i> klicken, wird es nicht "
"wieder angezeigt."
#: gnucash/gtkbuilder/dialog-new-user.glade:211
msgid "<span size=\"larger\" weight=\"bold\">Welcome to GnuCash!</span>"
@ -16809,11 +16810,15 @@ msgid "<b>Separator Character</b>"
msgstr "<b>Trennzeichen</b>"
#: gnucash/gtkbuilder/dialog-preferences.glade:204
#, fuzzy
msgid ""
"Press 'Reset' to use the original account separator and close the preference "
"window\n"
"Press 'Close' to return to the preference window\n"
msgstr ""
"Drücken Sie \"Zurücksetzen\", um das ursprüngliche Kontentrennzeichen zu "
"verwenden und das Einstellungsfenster zu schließen\n"
"Drücken Sie \"Schließen\", um zum Einstellungsfenster zurückzukehren\n"
#: gnucash/gtkbuilder/dialog-preferences.glade:240
msgid "GnuCash Preferences"
@ -18383,7 +18388,7 @@ msgstr "Erzeugte Buchungen _durchsehen"
#: gnucash/gtkbuilder/dialog-tax-info.glade:13
msgid "Income Tax Information"
msgstr "Einkommenssteuerinformation"
msgstr "Einkommensteuerinformation"
#: gnucash/gtkbuilder/dialog-tax-info.glade:89
msgid "<b>Income Tax Identity</b>"
@ -19471,11 +19476,15 @@ msgid "Caution!"
msgstr "Vorsicht!"
#: gnucash/gtkbuilder/window-autoclear.glade:116
#, fuzzy
msgid ""
"This tool might be slow or abort if the number of uncleared splits is more "
"than approximately 20. In that case please clear at least some of them "
"manually."
msgstr ""
"Dieses Tool ist möglicherweise langsam oder bricht ab, wenn die Anzahl der "
"nicht gelöschten Splits mehr als etwa 20 beträgt. In diesem Fall löschen Sie "
"bitte zumindest einige von ihnen manuell."
#: gnucash/gtkbuilder/window-autoclear.glade:138
#: gnucash/gtkbuilder/window-reconcile.glade:117
@ -19491,6 +19500,8 @@ msgstr "Erzeugte Buchungen _durchsehen"
#: gnucash/gtkbuilder/window-autoclear.glade:181
msgid "Select this option to open a register tab with newly cleared splits."
msgstr ""
"Wählen Sie diese Option, um eine Registerkarte mit kürzlich gelöschten "
"Aufteilungen zu öffnen."
#: gnucash/gtkbuilder/window-reconcile.glade:71
msgid "<b>Reconcile Information</b>"
@ -19841,7 +19852,7 @@ msgstr "Namen für neue Überweisungsvorlage"
#: gnucash/import-export/aqb/dialog-ab.glade:942
msgid " _Name of the new template:"
msgstr "_Namen für neue Überweisungsvorlage"
msgstr " _Namen der neuen Vorlage:"
#: gnucash/import-export/aqb/dialog-ab.glade:956
msgid "Enter a unique name for the new template."
@ -22296,9 +22307,7 @@ msgstr "Kapitalertrag (kurzfristig)"
#: gnucash/report/reports/support/balsheet-eg.eguile.scm:189
#: libgnucash/app-utils/gnc-ui-util.c:954
msgid "Retained Earnings"
msgstr ""
"Einbehaltener Gewinn, Gewinnvortrag (<=2.6: -rücklagen) # TODO: ist das "
"wirklich, was das balance sheet ausgibt?"
msgstr "Einbehaltener Gewinn"
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:118
msgid "Commissions"
@ -27396,7 +27405,7 @@ msgstr "Sekundäre Sortierreihenfolge"
#: gnucash/report/reports/standard/income-gst-statement.scm:39
msgid "Income and GST Statement"
msgstr "Einkommens- und Umsatzsteuererklärung"
msgstr "Einkommen- und Umsatzsteuererklärung"
#: gnucash/report/reports/standard/income-gst-statement.scm:41
#: gnucash/report/trep-engine.scm:108
@ -27457,7 +27466,7 @@ msgstr ""
#: gnucash/report/reports/standard/income-gst-statement.scm:71
msgid "This message will be removed when tax accounts are specified."
msgstr ""
msgstr "Diese Meldung wird entfernt, wenn Steuerkonten angegeben werden."
# Todo: Versteht keiner (ff)
#: gnucash/report/reports/standard/income-gst-statement.scm:110
@ -27553,14 +27562,17 @@ msgid "Default Format"
msgstr "Voreingestelltes Format"
#: gnucash/report/reports/standard/income-gst-statement.scm:167
#, fuzzy
msgid "Australia BAS"
msgstr ""
msgstr "Australien BAS"
#: gnucash/report/reports/standard/income-gst-statement.scm:168
msgid ""
"Australia Business Activity Statement. Specify sales, purchase and tax "
"accounts."
msgstr ""
"Erklärung zur Geschäftstätigkeit in Australien. Geben Sie Verkaufs-, "
"Einkaufs- und Steuerkonten an."
#: gnucash/report/reports/standard/income-gst-statement.scm:171
msgid "UK VAT Return"

8
po/glossary/de.po
View File

@ -12,8 +12,8 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2020-12-06 18:14+0100\n"
"PO-Revision-Date: 2020-12-27 01:10+0000\n"
"Last-Translator: Frank H. Ellenberger <frank.h.ellenberger@gmail.com>\n"
"PO-Revision-Date: 2020-12-29 02:29+0000\n"
"Last-Translator: Milo Ivir <mail@milotype.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/gnucash/glossary/"
"de/>\n"
"Language: de\n"
@ -690,9 +690,7 @@ msgstr "Staffel-Form"
#. "name of an equity account (?); to be distinguished from the opening balance."
msgid "Retained Earnings"
msgstr ""
"Einbehaltener Gewinn, Gewinnvortrag (<=2.6: -rücklagen) # TODO: ist das "
"wirklich, was das balance sheet ausgibt?"
msgstr "Einbehaltener Gewinn"
#. "Create a new transaction that is the inverse of the old one. When you add the two together they completely cancel out. Accounts use this instead of voiding transactions, usually because the prior month has been closed and can no longer be changed, or the entire accounting system is 'write only'."
msgid "reverse transaction, to (Action in the register)"

4
po/glossary/it.po
View File

@ -19,7 +19,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2020-12-06 18:14+0100\n"
"PO-Revision-Date: 2020-12-26 19:29+0000\n"
"PO-Revision-Date: 2020-12-27 14:29+0000\n"
"Last-Translator: Giuseppe Foti <foti.giuseppe@gmail.com>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/gnucash/glossary/"
"it/>\n"
@ -208,7 +208,7 @@ msgstr "operazione: prelievo"
#. "As in: payable aging, or: receivable aging. The aging report categorizes payables or receivables based on time buckets. This gives an overview of which bills or invoices are overdue at which time in the future. "
msgid "aging"
msgstr "scadenziario"
msgstr "scadenzario"
#. "A sum of money"
msgid "amount"

12
po/it.po
View File

@ -55,7 +55,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2020-12-13 22:27+0100\n"
"PO-Revision-Date: 2020-12-26 19:29+0000\n"
"PO-Revision-Date: 2020-12-27 16:29+0000\n"
"Last-Translator: Giuseppe Foti <foti.giuseppe@gmail.com>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/gnucash/gnucash/"
"it/>\n"
@ -6537,7 +6537,7 @@ msgid ""
"because that will cause your reconciled balance to be off."
msgstr ""
"Questa transazione contiene delle suddivisioni riconciliate. Modificarla non "
"è una buona idea dato poichè il saldo riconciliato risulterà sbilanciato."
"è una buona idea dato poiché il saldo riconciliato risulterà sbilanciato."
#. Translators: This is the confirmation button in a warning dialog
#: gnucash/gnome/gnc-split-reg.c:1238
@ -15831,7 +15831,7 @@ msgid ""
"Enter the full name of the commodity. Example: Cisco Systems Inc., or Apple "
"Computer, Inc."
msgstr ""
"Immettere il nome completo della commodity; per esempio: Cisco Sytems Inc, "
"Immettere il nome completo della commodity; per esempio: Cisco Systems Inc, "
"or Apple Computer, Inc."
# Tooltip
@ -26717,7 +26717,7 @@ msgstr "Converti tutte gli importi in un'unica valuta."
#: gnucash/report/reports/standard/balsheet-pnl.scm:123
#: gnucash/report/trep-engine.scm:104
msgid "Show original currency amount"
msgstr "VIsualizza gli importi nella valuta originale"
msgstr "Visualizza gli importi nella valuta originale"
#: gnucash/report/reports/standard/balsheet-pnl.scm:124
#: gnucash/report/trep-engine.scm:574
@ -28762,11 +28762,11 @@ msgstr "Campi indirizzo dall'indirizzo di spedizione."
#: gnucash/report/reports/standard/new-aging.scm:437
msgid "Payable Aging"
msgstr "Scadenziario dei debiti"
msgstr "Scadenzario dei debiti"
#: gnucash/report/reports/standard/new-aging.scm:446
msgid "Receivable Aging"
msgstr "Scadenziario dei crediti"
msgstr "Scadenzario dei crediti"
#: gnucash/report/reports/standard/new-owner-report.scm:54
#: gnucash/report/reports/standard/owner-report.scm:55

6
po/ja.po
View File

@ -22,7 +22,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2020-12-13 22:01+0100\n"
"PO-Revision-Date: 2020-12-26 20:25+0000\n"
"PO-Revision-Date: 2020-12-27 05:29+0000\n"
"Last-Translator: YOSHINO Yoshihito <yy.y.ja.jp@gmail.com>\n"
"Language-Team: Japanese <https://hosted.weblate.org/projects/gnucash/gnucash/"
"ja/>\n"
@ -14433,7 +14433,7 @@ msgstr "隠し勘定科目を表示する(_H)"
#: gnucash/gtkbuilder/dialog-account.glade:972
msgid "Show accounts which have the option \"Hidden\" checked."
msgstr " \"隠し勘定科目\" オプションにチェックが入った勘定科目を表示します。"
msgstr "\"隠し勘定科目\" オプションにチェックが入った勘定科目を表示します。"
#: gnucash/gtkbuilder/dialog-account.glade:986
msgid "Show _unused accounts"
@ -17435,7 +17435,7 @@ msgstr "検索(_F)"
#: gnucash/gtkbuilder/dialog-search.glade:134
msgid " Search "
msgstr "検索 "
msgstr " 検索 "
#: gnucash/gtkbuilder/dialog-search.glade:207
msgid "Search for items where"