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

After learning the scheme case syntax, implement it correctly this time.

Browse Source 
Fixes r19281, r19280, r19253, r19252.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19283 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming
2010-06-21 19:45:22 +00:00
parent 1351dc1c37
commit 14940a96fa
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app-utils/date-utilities.scm
View File

@@ -190,10 +190,10 @@
;; symbol was unknown
(define (gnc:date-get-fraction-func interval)
(case interval
('YearDelta gnc:date-to-year-fraction)
('MonthDelta gnc:date-to-month-fraction)
('WeekDelta gnc:date-to-week-fraction)
('DayDelta gnc:date-to-day-fraction)
((YearDelta) gnc:date-to-year-fraction)
((MonthDelta) gnc:date-to-month-fraction)
((WeekDelta) gnc:date-to-week-fraction)
((DayDelta) gnc:date-to-day-fraction)
(else #f)))
;; Modify a date

16
src/report/standard-reports/account-piecharts.scm
View File

@@ -108,7 +108,7 @@ balance at a given time"))
;; Option deactivated before 2.4.0 is out in order not to have
;; untranslated strings show up for the user (string freeze). Will be
;; activated in 2.4.1 or so by un-commenting the line below and
;; removing the line above, and changing line 217 and 262 and 280ff accordingly.
;; removing the line above, and changing line 217 accordingly.
;;(if do-intervals?
(add-option
(gnc:make-multichoice-option
@@ -259,7 +259,7 @@ balance at a given time"))
(tree-depth (if (equal? account-levels 'all)
(gnc:get-current-account-tree-depth)
account-levels))
(averaging-fraction-func #f) ;;(gnc:date-get-fraction-func averaging-selection))
(averaging-fraction-func (gnc:date-get-fraction-func averaging-selection))
(averaging-multiplier
(if averaging-fraction-func
;; Calculate the divisor of the amounts so that an
@@ -277,12 +277,12 @@ balance at a given time"))
1))
;; If there is averaging, the report-title is extended
;; accordingly.
; (report-title
; (case averaging-selection
; ('YearDelta (string-append report-title " " (_ "Yearly Average")))
; ('MonthDelta (string-append report-title " " (_ "Monthly Average")))
; ('WeekDelta (string-append report-title " " (_ "Weekly Average")))
; (else report-title)))
(report-title
(case averaging-selection
((YearDelta) (string-append report-title " " (_ "Yearly Average")))
((MonthDelta) (string-append report-title " " (_ "Monthly Average")))
((WeekDelta) (string-append report-title " " (_ "Weekly Average")))
(else report-title)))
(combined '())
(other-anchor "")
(print-info (gnc-commodity-print-info report-currency #t)))