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

Changed prompt for reconciliation target.

Browse source
This commit is contained in:
Craig Earls 2013-02-15 12:43:56 -07:00
parent adfb03cac0
commit d37a369c12
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ldg-commodities.el
View file

@ -69,12 +69,11 @@ longer one are after the value."
(concat val " " commodity) (concat val " " commodity)
(concat commodity " " val)))) (concat commodity " " val))))
(defun ledger-read-commodity-string (comm) (defun ledger-read-commodity-string (prompt)
"Return a commoditizd value (val 'comm') from COMM. "Return a commoditizd value (val 'comm') from COMM.
Assumes a space between the value and the commodity." Assumes a space between the value and the commodity."
(interactive (list (read-from-minibuffer (let ((parts (split-string (read-from-minibuffer
(concat "Enter commoditized amount (" ledger-reconcile-default-commodity "): ")))) (concat prompt " (" ledger-reconcile-default-commodity "): ")))))
(let ((parts (split-string comm)))
(if parts (if parts
(if (/= (length parts) 2) ;;assume a number was entered and use default commodity (if (/= (length parts) 2) ;;assume a number was entered and use default commodity
(list (string-to-number (car parts)) (list (string-to-number (car parts))

6
lisp/ldg-reconcile.el
View file

@ -360,7 +360,7 @@ POSTING is used in `ledger-clear-whole-transactions' is nil."
(ledger-occur-change-regex account ledger-buf)) (ledger-occur-change-regex account ledger-buf))
(set-buffer (get-buffer ledger-recon-buffer-name)) (set-buffer (get-buffer ledger-recon-buffer-name))
(setq ledger-target (setq ledger-target
(call-interactively #'ledger-read-commodity-string)) (ledger-read-commodity-string "Set reconciliation target"))
(unless (get-buffer-window rbuf) (unless (get-buffer-window rbuf)
(ledger-reconcile-open-windows buf rbuf)) (ledger-reconcile-open-windows buf rbuf))
(ledger-reconcile-refresh) (ledger-reconcile-refresh)
@ -377,7 +377,7 @@ POSTING is used in `ledger-clear-whole-transactions' is nil."
(set (make-local-variable 'ledger-buf) buf) (set (make-local-variable 'ledger-buf) buf)
(set (make-local-variable 'ledger-acct) account) (set (make-local-variable 'ledger-acct) account)
(set (make-local-variable 'ledger-target) (set (make-local-variable 'ledger-target)
(call-interactively #'ledger-read-commodity-string)) (ledger-read-commodity-string "Set reconciliation target"))
(ledger-do-reconcile)))))) (ledger-do-reconcile))))))
(defvar ledger-reconcile-mode-abbrev-table) (defvar ledger-reconcile-mode-abbrev-table)
@ -385,7 +385,7 @@ POSTING is used in `ledger-clear-whole-transactions' is nil."
(defun ledger-reconcile-change-target () (defun ledger-reconcile-change-target ()
"Change the traget amount for the reconciliation process." "Change the traget amount for the reconciliation process."
(interactive) (interactive)
(setq ledger-target (call-interactively #'ledger-read-commodity-string))) (setq ledger-target (ledger-read-commodity-string "Set reconciliation target")))
(define-derived-mode ledger-reconcile-mode text-mode "Reconcile" (define-derived-mode ledger-reconcile-mode text-mode "Reconcile"
"A mode for reconciling ledger entries." "A mode for reconciling ledger entries."