sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure reconcile balance display can handle empty accounts. Also force balance display at the beginning of reconciliation.

Browse source
This commit is contained in:
Craig Earls 2013-03-01 09:37:33 -07:00
parent 99b84f2e52
commit 3a0182d8d7
2 changed files with 33 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/ldg-commodities.el
View file

@ -38,7 +38,8 @@
(with-temp-buffer (with-temp-buffer
(insert str) (insert str)
(goto-char (point-min)) (goto-char (point-min))
(re-search-forward "-?[1-9][0-9]*[.,][0-9]*" nil t) (cond ((re-search-forward "-?[1-9][0-9]*[.,][0-9]*" nil t)
;; found a decimal number
(setq val (setq val
(string-to-number (string-to-number
(ledger-commodity-string-number-decimalize (ledger-commodity-string-number-decimalize
@ -47,7 +48,13 @@
(re-search-forward "[^[:space:]]" nil t) (re-search-forward "[^[:space:]]" nil t)
(setq comm (setq comm
(delete-and-extract-region (match-beginning 0) (match-end 0))) (delete-and-extract-region (match-beginning 0) (match-end 0)))
(list val comm)))) (list val comm))
((re-search-forward "0" nil t)
;; couldn't find a decimal number, look for a single 0,
;; indicating account with zero balance
(list 0 ledger-reconcile-default-commodity))
(t
(error "split-commodity-string: cannot parse commodity string: %S" str))))))
(defun ledger-string-balance-to-commoditized-amount (str) (defun ledger-string-balance-to-commoditized-amount (str)

29
lisp/ldg-reconcile.el
View file

@ -63,10 +63,8 @@ reconcile-finish will mark all pending posting cleared."
:group 'ledger-reconcile) :group 'ledger-reconcile)
(defun ledger-reconcile-get-balances () (defun ledger-reconcile-get-cleared-or-pending-balance ()
"Calculate the cleared and uncleared balance of the account. "Calculate the cleared or pending balance of the account."
Return a list with the account, uncleared and cleared balances as
numbers"
(interactive) (interactive)
(let ((buffer ledger-buf) (let ((buffer ledger-buf)
(account ledger-acct) (account ledger-acct)
@ -77,15 +75,17 @@ numbers"
; separated from the actual format string. emacs does not ; separated from the actual format string. emacs does not
; split arguments like the shell does, so you need to ; split arguments like the shell does, so you need to
; specify the individual fields in the command line. ; specify the individual fields in the command line.
"balance" "--limit" "cleared or pending" "balance" "--limit" "cleared or pending" "--empty"
"--format" "(\"%(display_total)\")" account) "--format" "%(display_total)" account)
(setq val (read (buffer-substring-no-properties (point-min) (point-max))))))) (setq val
(ledger-split-commodity-string
(buffer-substring-no-properties (point-min) (point-max)))))))
(defun ledger-display-balance () (defun ledger-display-balance ()
"Calculate the cleared balance of the account being reconciled." "Display the cleared-or-pending balnce and calculate the
target-delta of the account being reconciled."
(interactive) (interactive)
(let* ((pending (car (ledger-string-balance-to-commoditized-amount (let* ((pending (ledger-reconcile-get-cleared-or-pending-balance))
(car (ledger-reconcile-get-balances)))))
(target-delta (if ledger-target (target-delta (if ledger-target
(-commodity ledger-target pending) (-commodity ledger-target pending)
nil))) nil)))
@ -156,7 +156,8 @@ numbers"
(ledger-do-reconcile) (ledger-do-reconcile)
(set-buffer-modified-p t) (set-buffer-modified-p t)
(goto-char (point-min)) (goto-char (point-min))
(forward-line line))) (forward-line line)
(ledger-display-balance)))
(defun ledger-reconcile-refresh-after-save () (defun ledger-reconcile-refresh-after-save ()
"Refresh the recon-window after the ledger buffer is saved." "Refresh the recon-window after the ledger buffer is saved."
@ -375,7 +376,8 @@ POSTING is used in `ledger-clear-whole-transactions' is nil."
(ledger-reconcile-refresh) (ledger-reconcile-refresh)
(goto-char (point-min)) (goto-char (point-min))
(setq ledger-target (setq ledger-target
(ledger-read-commodity-string "Set reconciliation target"))) (ledger-read-commodity-string "Set reconciliation target"))
(ledger-display-balance))
(progn ;; no recon-buffer, starting from scratch. (progn ;; no recon-buffer, starting from scratch.
(add-hook 'after-save-hook 'ledger-reconcile-refresh-after-save nil t) (add-hook 'after-save-hook 'ledger-reconcile-refresh-after-save nil t)
@ -389,7 +391,8 @@ POSTING is used in `ledger-clear-whole-transactions' is nil."
(set (make-local-variable 'ledger-acct) account) (set (make-local-variable 'ledger-acct) account)
(ledger-do-reconcile) (ledger-do-reconcile)
(set (make-local-variable 'ledger-target) (set (make-local-variable 'ledger-target)
(ledger-read-commodity-string "Set reconciliation target"))))))) (ledger-read-commodity-string "Set reconciliation target"))
(ledger-display-balance))))))
(defvar ledger-reconcile-mode-abbrev-table) (defvar ledger-reconcile-mode-abbrev-table)