taxtxf.scm (gnucash-5.0.tar.bz2) | : | taxtxf.scm (gnucash-5.1.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 656 | skipping to change at line 656 | |||
(gnc-price-get-time64 pricedb-lookup-pri ce)) | (gnc-price-get-time64 pricedb-lookup-pri ce)) | |||
(gnc-pricedb-convert-balance-nearest-price-t64 | (gnc-pricedb-convert-balance-nearest-price-t64 | |||
pricedb | pricedb | |||
(if neg? | (if neg? | |||
(gnc-numeric-neg splt-rpt-amount) | (gnc-numeric-neg splt-rpt-amount) | |||
splt-rpt-amount) | splt-rpt-amount) | |||
account-commodity | account-commodity | |||
USD-currency | USD-currency | |||
;; Use midday as the transaction time so it matches a price | ;; Use midday as the transaction time so it matches a price | |||
;; on the same day. Otherwise it uses midnight which will | ;; on the same day. Otherwise it uses midnight which will | |||
;; likely match a price on the previous day | ;; likely match a price on the previous day | |||
(time64CanonicalDayTime lookup-date)) | (time64CanonicalDayTime lookup-date)) | |||
) | ) | |||
(begin ;; otherwise set flag and set to zero | (begin ;; otherwise set flag and set to zero | |||
(set! missing-pricedb-entry? #t) | (set! missing-pricedb-entry? #t) | |||
(gnc-numeric-zero) | (gnc-numeric-zero) | |||
))) | ))) | |||
) | ) | |||
) | ) | |||
) | ) | |||
(amount (if neg? | (amount (if neg? | |||
skipping to change at line 1041 | skipping to change at line 1041 | |||
(list trans-cap-gain-sales-USD-total | (list trans-cap-gain-sales-USD-total | |||
trans-cap-gain-basis-USD-total | trans-cap-gain-basis-USD-total | |||
output) | output) | |||
) ;; end of let* | ) ;; end of let* | |||
) | ) | |||
;; Process transaction detail; render, if appropriate; accum account totals | ;; Process transaction detail; render, if appropriate; accum account totals | |||
(define (process-account-transaction-detail table account split-list | (define (process-account-transaction-detail table account split-list | |||
split-details? full-names? currency-conversion-date to-value | split-details? full-names? currency-conversion-date to-value | |||
transaction-details? suppress-action-memo? | transaction-details? suppress-action-memo? | |||
shade-alternate-transactions? splits-period full- year? from-value | shade-alternate-transactions? splits-period full -year? from-value | |||
tax-mode? show-TXF-data? USD-currency account-type | tax-mode? show-TXF-data? USD-currency account-type | |||
tax-code acct-full-name acct-beg-bal-collector | tax-code acct-full-name acct-beg-bal-collector | |||
acct-end-bal-collector copy tax-entity-type) | acct-end-bal-collector copy tax-entity-type) | |||
(let* | (let* | |||
((account-commodity (xaccAccountGetCommodity account)) | ((account-commodity (xaccAccountGetCommodity account)) | |||
(format_type (get-acct-txf-info 'format account-type tax-code)) | (format_type (get-acct-txf-info 'format account-type tax-code)) | |||
(payer-src (gnc:account-get-txf-payer-source account)) | (payer-src (gnc:account-get-txf-payer-source account)) | |||
(code-pns (get-acct-txf-info 'pns account-type tax-code)) | (code-pns (get-acct-txf-info 'pns account-type tax-code)) | |||
(acct-collector (gnc:make-commodity-collector)) | (acct-collector (gnc:make-commodity-collector)) | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |