gnucash unstable: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Mon Mar 5 11:00:39 EST 2018
Updated via https://github.com/Gnucash/gnucash/commit/30fb1dc4 (commit)
via https://github.com/Gnucash/gnucash/commit/ddba926e (commit)
via https://github.com/Gnucash/gnucash/commit/e2d69b17 (commit)
via https://github.com/Gnucash/gnucash/commit/8a338641 (commit)
via https://github.com/Gnucash/gnucash/commit/41d79f4e (commit)
via https://github.com/Gnucash/gnucash/commit/21ea6d56 (commit)
via https://github.com/Gnucash/gnucash/commit/22517f98 (commit)
via https://github.com/Gnucash/gnucash/commit/41322ec3 (commit)
via https://github.com/Gnucash/gnucash/commit/551e9843 (commit)
via https://github.com/Gnucash/gnucash/commit/a72e0bdd (commit)
via https://github.com/Gnucash/gnucash/commit/7ef8e6d4 (commit)
from https://github.com/Gnucash/gnucash/commit/580ce72d (commit)
commit 30fb1dc4799225a5e27d21dc3a214d072878c43a
Merge: ddba926 21ea6d5
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Mar 5 16:57:00 2018 +0100
Merge branch 'unstable-bugfix' of https://github.com/christopherlam/gnucash into unstable
commit ddba926e4900ec81aee25714ba505840b25afdc6
Merge: e2d69b1 a72e0bd
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Mar 5 16:56:07 2018 +0100
Merge branch 'unstable-transfer-02' of https://github.com/DiMan/gnucash into unstable
commit e2d69b174ec9dca538285ceb00c45a2bc38e0daa
Merge: 8a33864 7ef8e6d
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Mar 5 16:54:24 2018 +0100
Merge branch 'master' of https://github.com/nielsegberts/gnucash into unstable
commit 8a33864168b359bac600f881190c6a0f97b88868
Merge: 580ce72 41d79f4
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Mar 5 16:52:55 2018 +0100
Merge branch 'cpack' of https://github.com/TheBiggerGuy/gnucash into unstable
commit 41d79f4ef324210a70d8c63c28d844861cb8cf35
Author: Guy Taylor <thebigguy.co.uk at gmail.com>
Date: Mon Mar 5 15:38:41 2018 +0000
Fix CPack package version number
Currently running "ninja-build package" produces a file with and incorrect
version number. This patch passes the CMake version variables into CPack to get
the correct filename.
Old "gnucash-0.1.1-Linux.tar.gz" new "gnucash-2.7.5-Linux.tar.gz"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 670fe8f..86607a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -921,6 +921,11 @@ ENDIF()
# ############################################################
# Package creation rules
+SET(CPACK_PACKAGE_VERSION_MAJOR "${GNUCASH_MAJOR_VERSION}")
+SET(CPACK_PACKAGE_VERSION_MINOR "${GNUCASH_MINOR_VERSION}")
+SET(CPACK_PACKAGE_VERSION_PATCH "${GNUCASH_MICRO_VERSION}")
+SET(CPACK_PACKAGE_VERSION "${VERSION}")
+
IF(UNIX)
SET(CPACK_GENERATOR "TGZ")
ENDIF(UNIX)
commit 21ea6d56bf70a85ad1c76a914677b9f05fd34830
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Mar 5 07:45:03 2018 +0800
Modernise chart colours
This commit changes chart colours from the dated CSS defaults to
modern colours as suggested by http://clrs.cc/
diff --git a/gnucash/report/report-system/html-utilities.scm b/gnucash/report/report-system/html-utilities.scm
index 2357036..62224c2 100644
--- a/gnucash/report/report-system/html-utilities.scm
+++ b/gnucash/report/report-system/html-utilities.scm
@@ -106,12 +106,20 @@
value)))
(define (gnc:assign-colors num-colors)
- (define base-colors '("red" "orange" "yellow" "green"
- "cyan" "blue" "purple" "magenta"
- "orchid" "khaki" "gold" "orange"
- "red3" "orange3" "yellow3" "green3"
- "cyan3" "blue3" "purple3" "magenta3"
- "orchid3" "khaki3" "gold3" "orange3"))
+ ;; default CSS colours
+ ;; (define base-colors '("red" "orange" "yellow" "green"
+ ;; "cyan" "blue" "purple" "magenta"
+ ;; "orchid" "khaki" "gold" "orange"
+ ;; "red3" "orange3" "yellow3" "green3"
+ ;; "cyan3" "blue3" "purple3" "magenta3"
+ ;; "orchid3" "khaki3" "gold3" "orange3"))
+
+ ;; new base-colors from http://clrs.cc/ and flatuicolors.com
+ (define base-colors (list "#FF4136" "#FF851B" "#FFDC00" "#2ECC40"
+ "#0074D9" "#001f3f" "#85144b" "#7FDBFF"
+ "#F012BE" "#3D9970" "#39CCCC" "#f39c12"
+ "#e74c3c" "#e67e22" "#9b59b6" "#8e44ad"
+ "#16a085" "#d35400"))
(define (assign-colors i)
(if (<= num-colors i)
'()
diff --git a/gnucash/report/standard-reports/average-balance.scm b/gnucash/report/standard-reports/average-balance.scm
index 2d96d33..ad6e785 100644
--- a/gnucash/report/standard-reports/average-balance.scm
+++ b/gnucash/report/standard-reports/average-balance.scm
@@ -479,7 +479,7 @@
(append col-labels
(list (list-ref columns 2))))
(set! col-colors
- (append col-colors (list "blue")))
+ (append col-colors (list "#0074D9")))
(set! all-zeros? #f)))))
@@ -495,7 +495,7 @@
(append col-labels
(list (list-ref columns 7))))
(set! col-colors
- (append col-colors (list "green")))
+ (append col-colors (list "#2ECC40")))
(set! all-zeros? #f)))))
(if (memq 'GLPlot plot-type)
@@ -515,7 +515,7 @@
(append col-labels
(list (list-ref columns 5))))
(set! col-colors
- (append col-colors (list "black")))
+ (append col-colors (list "#111111")))
;; credit
(gnc:html-barchart-append-column!
@@ -525,7 +525,7 @@
(append col-labels
(list (list-ref columns 6))))
(set! col-colors
- (append col-colors (list "red")))
+ (append col-colors (list "#FF4136")))
(set! all-zeros? #f)))))
(if (not all-zeros?)
diff --git a/gnucash/report/standard-reports/budget-barchart.scm b/gnucash/report/standard-reports/budget-barchart.scm
index 05b721c..6ba3697 100644
--- a/gnucash/report/standard-reports/budget-barchart.scm
+++ b/gnucash/report/standard-reports/budget-barchart.scm
@@ -156,7 +156,7 @@
(gnc:html-barchart-set-col-labels!
chart (list (_ "Budget") (_ "Actual")))
(gnc:html-barchart-set-col-colors!
- chart '("blue" "red"))
+ chart '("#0074D9" "#FF4136"))
)
;; else
(begin
@@ -169,7 +169,7 @@
(gnc:html-linechart-set-col-labels!
chart (list (_ "Budget") (_ "Actual")))
(gnc:html-linechart-set-col-colors!
- chart '("blue" "red"))
+ chart '("#0074D9" "#FF4136"))
)
)
diff --git a/gnucash/report/standard-reports/cashflow-barchart.scm b/gnucash/report/standard-reports/cashflow-barchart.scm
index 28738d9..7666e23 100644
--- a/gnucash/report/standard-reports/cashflow-barchart.scm
+++ b/gnucash/report/standard-reports/cashflow-barchart.scm
@@ -334,9 +334,9 @@
))
(gnc:html-barchart-set-col-colors!
chart (append
- (if show-in? '("blue") '())
- (if show-out? '("red") '())
- (if show-net? '("green") '())
+ (if show-in? '("#0074D9") '())
+ (if show-out? '("#FF4136") '())
+ (if show-net? '("#2ECC40") '())
))
(gnc:report-percent-done 95)
diff --git a/gnucash/report/standard-reports/net-barchart.scm b/gnucash/report/standard-reports/net-barchart.scm
index d424263..53dd3ba 100644
--- a/gnucash/report/standard-reports/net-barchart.scm
+++ b/gnucash/report/standard-reports/net-barchart.scm
@@ -375,9 +375,9 @@
(gnc:html-barchart-set-col-colors!
chart (append
(if show-sep?
- '("blue" "red") '())
+ '("#0074D9" "#FF4136") '())
(if show-net?
- '("green") '())))
+ '("#2ECC40") '())))
;; URLs for income/expense or asset/liabilities bars.
;; (if show-sep?
diff --git a/gnucash/report/standard-reports/net-linechart.scm b/gnucash/report/standard-reports/net-linechart.scm
index 7d2d554..ec8f23a 100644
--- a/gnucash/report/standard-reports/net-linechart.scm
+++ b/gnucash/report/standard-reports/net-linechart.scm
@@ -418,9 +418,9 @@
(gnc:html-linechart-set-col-colors!
chart (append
(if show-sep?
- '("blue" "red") '())
+ '("#0074D9" "#FF4136") '())
(if show-net?
- '("green") '())))
+ '("#2ECC40") '())))
;; Set the line width and markers
(gnc:html-linechart-set-line-width!
commit 22517f98cec657c2fbb81ad539a1bd19bc680fef
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Mar 4 14:56:35 2018 +0800
taxtxf: schemify
diff --git a/gnucash/report/locale-specific/us/taxtxf.scm b/gnucash/report/locale-specific/us/taxtxf.scm
index 321501e..ef7e6b5 100644
--- a/gnucash/report/locale-specific/us/taxtxf.scm
+++ b/gnucash/report/locale-specific/us/taxtxf.scm
@@ -3184,12 +3184,9 @@
from-date
to-date
tax-year
- (if (gnc:txf-get-tax-entity-type-description
- (string->symbol tax-entity-type))
- (gnc:txf-get-tax-entity-type-description
- (string->symbol tax-entity-type))
- "None specified"
- )
+ (or (gnc:txf-get-tax-entity-type-description
+ (string->symbol tax-entity-type))
+ "None specified")
)))))
(if (not (null? txf-invalid-alist))
commit 41322ec3d8ab6af48143a9489aa6ab9da54988c3
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Mar 4 08:36:39 2018 +0800
<br> to <br/> and ~s to ~a
diff --git a/gnucash/report/business-reports/fancy-invoice.scm b/gnucash/report/business-reports/fancy-invoice.scm
index 2cc8f20..64c36c2 100644
--- a/gnucash/report/business-reports/fancy-invoice.scm
+++ b/gnucash/report/business-reports/fancy-invoice.scm
@@ -635,10 +635,10 @@
(gnc:html-table-append-row!
table
(list
- (string-expand (gnc:owner-get-address-dep owner) #\newline "<br>")))
+ (string-expand (gnc:owner-get-address-dep owner) #\newline "<br/>")))
(gnc:html-table-append-row!
table
- (list "<br>"))
+ (list "<br/>"))
(for-each
(lambda (order)
(let* ((reference (gncOrderGetReference order)))
@@ -722,7 +722,7 @@
'attribute (list "align" "right")
'attribute (list "width" "33%"))
(gnc:html-table-append-row!
- table (list (string-expand (string-append (if addy addy "") (if id (string-append "\n" id) "")) #\newline "<br>")
+ table (list (string-expand (string-append (if addy addy "") (if id (string-append "\n" id) "")) #\newline "<br/>")
(string-expand
(string-append (if phone
(string-append (_ "Phone:") " " phone)
@@ -730,7 +730,7 @@
(if fax (string-append (if phone "\n" "")
(_ "Fax:") " " fax)
""))
- #\newline "<br>" )
+ #\newline "<br/>" )
(if url (string-append (_ "Web:") " " url) "")))
;; oli-custom - I didn't want today's date on the invoice.
@@ -863,20 +863,20 @@
(due-date (gncInvoiceGetDateDue invoice)))
(set! date-table (make-date-table))
(gnc:html-table-append-row!
- ;; Translators: %s below is "Invoice" or "Bill" or even the
+ ;; Translators: ~a below is "Invoice" or "Bill" or even the
;; custom title from the options. The next column contains
;; the number of the document.
- date-table (list (format #f (_ "~s #") title) (gncInvoiceGetID invoice)))
- ;; Translators: The first %s below is "Invoice" or
+ date-table (list (format #f (_ "~a #") title) (gncInvoiceGetID invoice)))
+ ;; Translators: The first ~a below is "Invoice" or
;; "Bill" or even the custom title from the
;; options. This string sucks for i18n, but I don't
;; have a better solution right now without breaking
;; other people's invoices.
- (make-date-row! date-table (format #f (_ "~s Date") title) post-date date-format)
- (make-date-row! date-table (_ "Due Date") due-date date-format)
+ (make-date-row! date-table (format #f (_ "~a Date") title) post-date date-format)
+ (make-date-row! date-table (_ "Due Date") due-date date-format)
date-table)
(gnc:make-html-text
- (string-append title "<br>"
+ (string-append title "<br/>"
(_ "Invoice in progress...")))))
(gnc:html-table-append-row!
@@ -910,7 +910,7 @@
(gnc:make-html-text
(string-append
(_ "Reference") ": "
- (string-expand billing-id #\newline "<br>"))))
+ (string-expand billing-id #\newline "<br/>"))))
(make-break! document)))))
(if (opt-val "Display" "Billing Terms")
@@ -922,7 +922,7 @@
(gnc:make-html-text
(string-append
(_ "Terms") ": "
- (string-expand terms #\newline "<br>")))))))
+ (string-expand terms #\newline "<br/>")))))))
(make-break! document)
@@ -948,7 +948,7 @@
document
(gnc:make-html-text
(string-append name-str ": "
- (string-expand name #\newline "<br>")))))))
+ (string-expand name #\newline "<br/>")))))))
(make-break! document)
@@ -960,13 +960,13 @@
document
(gnc:make-html-text
(string-append contact-str ": "
- (string-expand contact #\newline "<br>")))))))
+ (string-expand contact #\newline "<br/>")))))))
(gnc:html-document-add-object!
document
(gnc:make-html-text
(gnc:html-markup-br)
- (string-expand (opt-val "Display" "Extra Notes") #\newline "<br>")
+ (string-expand (opt-val "Display" "Extra Notes") #\newline "<br/>")
(gnc:html-markup-br))))
; else
diff --git a/gnucash/report/business-reports/job-report.scm b/gnucash/report/business-reports/job-report.scm
index 8ec2dad..260d02a 100644
--- a/gnucash/report/business-reports/job-report.scm
+++ b/gnucash/report/business-reports/job-report.scm
@@ -478,10 +478,10 @@
(gnc:html-table-append-row!
table
(list
- (string-expand (gnc:owner-get-name-and-address-dep owner) #\newline "<br>")))
+ (string-expand (gnc:owner-get-name-and-address-dep owner) #\newline "<br/>")))
(gnc:html-table-append-row!
table
- (list "<br>"))
+ (list "<br/>"))
(set-last-row-style!
table "td"
'attribute (list "valign" "top"))
@@ -521,7 +521,7 @@
(gnc:html-table-append-row! table (list (if name name "")))
(gnc:html-table-append-row! table (list (string-expand
(if addy addy "")
- #\newline "<br>")))
+ #\newline "<br/>")))
(gnc:html-table-append-row! table (list
(strftime
date-format
diff --git a/gnucash/report/locale-specific/us/taxtxf.scm b/gnucash/report/locale-specific/us/taxtxf.scm
index bb0d067..321501e 100644
--- a/gnucash/report/locale-specific/us/taxtxf.scm
+++ b/gnucash/report/locale-specific/us/taxtxf.scm
@@ -3176,11 +3176,10 @@
"center"
(gnc:html-markup/format
(string-append (if (and (gnc-get-current-book-tax-name)
- (not (string=? ""
- (gnc-get-current-book-tax-name))))
- "Tax Name: %s<BR>"
+ (not (string-null? (gnc-get-current-book-tax-name))))
+ "Tax Name: ~a<br/>"
"~a")
- "Period from ~a to ~s<BR>Tax Year ~a<BR>Tax Entity Type: %s<BR>All amounts in USD unless otherwise noted")
+ "Period from ~a to ~a<br/>Tax Year ~a<br/>Tax Entity Type: ~a<br/>All amounts in USD unless otherwise noted")
(gnc-get-current-book-tax-name)
from-date
to-date
@@ -3199,7 +3198,7 @@
doc (gnc:make-html-text
(gnc:html-markup-p
(gnc:html-markup/format
- "<BR>The following Account(s) have errors with their Income Tax code assignments (use 'Edit->Tax Report Options' to correct):"))))
+ "<br/>The following Account(s) have errors with their Income Tax code assignments (use 'Edit->Tax Report Options' to correct):"))))
(gnc:html-document-add-object! doc error-table)
(gnc:html-table-append-row!
error-table
@@ -3262,7 +3261,7 @@
doc (gnc:make-html-text
(gnc:html-markup-p
(gnc:html-markup/format
- " <BR> "))))
+ " <br/> "))))
)
)
@@ -3453,29 +3452,29 @@
(gnc:html-markup-p
(gnc:html-markup/format
(string-append
- "Selected Report Options:<BR>"
+ "Selected Report Options:<br/>"
;; selected accounts
- " ~a <BR>"
+ " ~a <br/>"
;; suppress 0.00 values
- " ~a <BR>"
+ " ~a <br/>"
;; full acct names
- " ~a <BR>"
+ " ~a <br/>"
;; transfer detail
- " ~a <BR>"
+ " ~a <br/>"
;; TXF detail
- " ~a <BR>"
+ " ~a <br/>"
;; action:memo detail
- " ~a <BR>"
+ " ~a <br/>"
;; transaction detail
- " ~a <BR>"
+ " ~a <br/>"
;; special dates
- " ~a <BR>"
+ " ~a <br/>"
;; currency conversion date
- " ~a <BR>"
+ " ~a <br/>"
;; alternate transaction shading
(if (gnc-html-engine-supports-css)
""
- " ~a <BR>"
+ " ~a <br/>"
))
(if (not (null? user-sel-accnts))
"Subset of accounts"
diff --git a/gnucash/report/standard-reports/income-statement.scm b/gnucash/report/standard-reports/income-statement.scm
index c57e2a2..412b1d6 100644
--- a/gnucash/report/standard-reports/income-statement.scm
+++ b/gnucash/report/standard-reports/income-statement.scm
@@ -431,7 +431,7 @@
(gnc:html-document-set-title!
doc (format #f
(string-append "~a ~a "
- (_ "For Period Covering %s to %s"))
+ (_ "For Period Covering ~a to ~a"))
company-name report-title
(qof-print-date start-date-printable)
(qof-print-date end-date)))
commit 551e98435d6adc7f48703a58ad27c980a79b7f39
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Mar 4 08:10:45 2018 +0800
remove begindate in qofquery
This was producing a date corresponding to 01-01-1970. make-zdate was
being used in aging.scm as a hack to search all splits prior to
end-date. fix the date query logic to set begin-date match to #f.
diff --git a/gnucash/report/business-reports/aging.scm b/gnucash/report/business-reports/aging.scm
index f09e15a..4c2dc45 100644
--- a/gnucash/report/business-reports/aging.scm
+++ b/gnucash/report/business-reports/aging.scm
@@ -322,21 +322,15 @@ more than one currency. This report is not designed to cope with this possibilit
;; set up the query to get the splits in the chosen account
-;; XXX: FIXME: begindate is a hack -- we currently only go back a year
(define (setup-query query account date)
- (let ((begindate (gnc-mktime (make-zdate)))) ;Set begindate to the start of the Epoch
-; (gnc:debug "Account: " account)
- (gnc:debug "begindate" begindate)
- (gnc:debug "date" date)
- (qof-query-set-book query (gnc-get-current-book))
- (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
- (xaccQueryAddSingleAccountMatch query account QOF-QUERY-AND)
- (xaccQueryAddDateMatchTT query #t begindate #t date QOF-QUERY-AND)
- (qof-query-set-sort-order query
- (list SPLIT-TRANS TRANS-DATE-POSTED)
- '() '())
- (qof-query-set-sort-increasing query #t #t #t)))
-
+ (qof-query-set-book query (gnc-get-current-book))
+ (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
+ (xaccQueryAddSingleAccountMatch query account QOF-QUERY-AND)
+ (xaccQueryAddDateMatchTT query #f 0 #t date QOF-QUERY-AND)
+ (qof-query-set-sort-order query
+ (list SPLIT-TRANS TRANS-DATE-POSTED)
+ '() '())
+ (qof-query-set-sort-increasing query #t #t #t))
(define (aging-options-generator options)
(let* ((add-option
diff --git a/libgnucash/app-utils/app-utils.scm b/libgnucash/app-utils/app-utils.scm
index f80776e..a3d838a 100644
--- a/libgnucash/app-utils/app-utils.scm
+++ b/libgnucash/app-utils/app-utils.scm
@@ -221,8 +221,7 @@
(export gnc:time64-ge-date)
(export gnc:make-date-interval-list)
(export gnc:make-date-list)
-(export make-zdate)
-(export SecDelta )
+(export SecDelta)
(export DayDelta)
(export WeekDelta )
(export TwoWeekDelta)
commit a72e0bdd5ed40a7306f67508b61c640748177aa8
Author: Di Mang <dimang.freenet at gmail.com>
Date: Sun Mar 4 14:09:24 2018 +0100
Add spacing between border and text in dialog "New Accounts Hierarchy Setup".
There is no spacing between the text and the frame in the dialog
"New File" > "New Accounts Hierarchy Setup". In some cases - when
changing the window size - the text appears next to the frame.
It does not look very clean. As a solution, I have defined here a small spacing: 5px.
diff --git a/gnucash/gtkbuilder/assistant-hierarchy.glade b/gnucash/gtkbuilder/assistant-hierarchy.glade
index 497c7fd..8e48b56 100644
--- a/gnucash/gtkbuilder/assistant-hierarchy.glade
+++ b/gnucash/gtkbuilder/assistant-hierarchy.glade
@@ -14,6 +14,8 @@
<object class="GtkLabel" id="intro_page_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">5</property>
+ <property name="margin_right">5</property>
<property name="label" translatable="yes">This assistant will help you create a set of GnuCash accounts for your assets (such as investments, checking or savings accounts), liabilities (such as loans) and different kinds of income and expenses you might have.
You can pick a set of accounts here that seem close to your needs. After the assistant completes you will be able to add, rename, modify, and remove accounts, at any time later on. You will also be able to add sub-accounts, as well as move accounts (along with their sub-accounts) from one parent to another.
@@ -111,6 +113,8 @@ Please choose the currency to use for new accounts.</property>
<object class="GtkLabel" id="pickAccountsDescriptionLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">5</property>
+ <property name="margin_right">5</property>
<property name="label" translatable="yes">
Select categories that correspond to the ways that you foresee you will use GnuCash. Each category you select will cause several accounts to be created.
@@ -346,6 +350,8 @@ Select categories that correspond to the ways that you foresee you will use GnuC
<object class="GtkLabel" id="finalAccountLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">5</property>
+ <property name="margin_right">5</property>
<property name="label" translatable="yes">
If you would like to change an account's name, click on the row containing the account, then click on the account name and change it.
@@ -392,6 +398,8 @@ If you would like an account to have an opening balance, click on the row contai
<object class="GtkLabel" id="finish_page_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">5</property>
+ <property name="margin_right">5</property>
<property name="label" translatable="yes">Press `Apply' to create your new accounts. You will then be able to save them to a file or database.
Press `Back' to review your selections.
commit 7ef8e6d4890a80637634b931dfea740f80d271a0
Author: Niels <gitlab at nielsegberts.nl>
Date: Wed Feb 28 00:32:41 2018 +0000
Fix fall through in Account.cpp
Found with -Wimplicit-fallthrough, but older versions of GCC don't support it. So it will take some effort to add it to the build config.
I think it did not result in a reproducible bug.
diff --git a/libgnucash/engine/Account.cpp b/libgnucash/engine/Account.cpp
index 312b04b..e5325ab 100644
--- a/libgnucash/engine/Account.cpp
+++ b/libgnucash/engine/Account.cpp
@@ -409,6 +409,7 @@ gnc_account_get_property (GObject *object,
break;
case PROP_SORT_REVERSED:
g_value_set_boolean(value, xaccAccountGetSortReversed(account));
+ break;
case PROP_LOT_NEXT_ID:
/* Pre-set the value in case the frame is empty */
g_value_set_int64 (value, 0);
@@ -533,6 +534,7 @@ gnc_account_set_property (GObject *object,
break;
case PROP_SORT_REVERSED:
xaccAccountSetSortReversed(account, g_value_get_boolean(value));
+ break;
case PROP_LOT_NEXT_ID:
qof_instance_set_path_kvp (QOF_INSTANCE (account), value, {"lot-mgmt", "next-id"});
break;
Summary of changes:
CMakeLists.txt | 5 +++
gnucash/gtkbuilder/assistant-hierarchy.glade | 8 +++++
gnucash/report/business-reports/aging.scm | 22 +++++-------
gnucash/report/business-reports/fancy-invoice.scm | 30 ++++++++--------
gnucash/report/business-reports/job-report.scm | 6 ++--
gnucash/report/locale-specific/us/taxtxf.scm | 42 ++++++++++------------
gnucash/report/report-system/html-utilities.scm | 20 +++++++----
.../report/standard-reports/average-balance.scm | 8 ++---
.../report/standard-reports/budget-barchart.scm | 4 +--
.../report/standard-reports/cashflow-barchart.scm | 6 ++--
.../report/standard-reports/income-statement.scm | 2 +-
gnucash/report/standard-reports/net-barchart.scm | 4 +--
gnucash/report/standard-reports/net-linechart.scm | 4 +--
libgnucash/app-utils/app-utils.scm | 3 +-
libgnucash/engine/Account.cpp | 2 ++
15 files changed, 89 insertions(+), 77 deletions(-)
More information about the gnucash-changes
mailing list