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

Reconciling using ledger.el is now line-based, instead of character based, due

Browse source 
to problems with UTF-8 characters.
This commit is contained in:
John Wiegley 2008-07-17 23:42:19 -04:00
parent 0f7776f7af
commit 899f79d032
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
emacs.cc
View file

@ -13,9 +13,9 @@ void format_emacs_transactions::write_entry(entry_t& entry)
break; break;
} }
out << (((unsigned long)entry.beg_pos) + 1) << " "; out << (((unsigned long)entry.beg_line) + 1) << " ";
std::time_t date = entry.date(); std::time_t date = entry.date().when;
out << "(" << (date / 65536) << " " << (date % 65536) << " 0) "; out << "(" << (date / 65536) << " " << (date % 65536) << " 0) ";
if (entry.code.empty()) if (entry.code.empty())
@ -47,7 +47,7 @@ void format_emacs_transactions::operator()(transaction_t& xact)
out << "\n"; out << "\n";
} }
out << " (" << (((unsigned long)xact.beg_pos) + 1) << " "; out << " (" << (((unsigned long)xact.beg_line) + 1) << " ";
out << "\"" << xact_account(xact)->fullname() << "\" \"" out << "\"" << xact_account(xact)->fullname() << "\" \""
<< xact.amount << "\""; << xact.amount << "\"";

14
ledger.el
View file

@ -416,7 +416,7 @@ dropped."
;; attempt to auto-reconcile in the background ;; attempt to auto-reconcile in the background
(with-temp-buffer (with-temp-buffer
(let ((exit-code (let ((exit-code
(ledger-run-ledger buffer "--format" "%xB\\n" (ledger-run-ledger buffer "--format" "%xb\\n"
"--reconcile" balance "--reconcile-date" date "--reconcile" balance "--reconcile-date" date
"register" account))) "register" account)))
(if (/= 0 exit-code) (if (/= 0 exit-code)
@ -427,7 +427,9 @@ dropped."
(error (buffer-string))) (error (buffer-string)))
(while (not (eobp)) (while (not (eobp))
(setq cleared (setq cleared
(cons (1+ (read (current-buffer))) cleared)) (cons (save-excursion
(goto-line (1+ (read (current-buffer))))
(point-marker)) cleared))
(forward-line))))) (forward-line)))))
(goto-char (point-min)) (goto-char (point-min))
(with-current-buffer ledger-buf (with-current-buffer ledger-buf
@ -531,8 +533,12 @@ dropped."
(cons (cons
(nth 0 item) (nth 0 item)
(if ledger-clear-whole-entries (if ledger-clear-whole-entries
(copy-marker (nth 1 item)) (save-excursion
(copy-marker (nth 0 xact))))))) (goto-line (nth 1 item))
(point-marker))
(save-excursion
(goto-line (nth 0 xact))
(point-marker)))))))
(insert (format "%s %-30s %-25s %15s\n" (insert (format "%s %-30s %-25s %15s\n"
(format-time-string "%m/%d" (nth 2 item)) (format-time-string "%m/%d" (nth 2 item))
(nth 4 item) (nth 1 xact) (nth 2 xact))) (nth 4 item) (nth 1 xact) (nth 2 xact)))