NPO-Accounting/conservancy_beancount
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

accrual: Support limited punctuation in payment-method.

Browse source
This commit is contained in:
Brett Smith 2020-07-21 13:20:58 -04:00
parent a008c84e45
commit 56114cc66e
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
conservancy_beancount/reports/accrual.py
View file

@ -439,13 +439,20 @@ class OutgoingReport(BaseReport):
ach = 'ACH' ach = 'ACH'
check = 'Check' check = 'Check'
creditcard = 'Credit Card' creditcard = 'Credit Card'
credit_card = creditcard
debitcard = 'Debit Card' debitcard = 'Debit Card'
debit_card = debitcard
echeck = 'E-Check' echeck = 'E-Check'
e_check = echeck
paypal = 'PayPal' paypal = 'PayPal'
pay_pal = paypal
vendorportal = 'Vendor Portal' vendorportal = 'Vendor Portal'
vendor_portal = vendorportal
wire = 'Wire' wire = 'Wire'
fxwire = wire fxwire = wire
fx_wire = fxwire
uswire = wire uswire = wire
us_wire = uswire
def __init__(self, rt_wrapper: rtutil.RT, out_file: TextIO) -> None: def __init__(self, rt_wrapper: rtutil.RT, out_file: TextIO) -> None:
@ -495,7 +502,7 @@ class OutgoingReport(BaseReport):
self.logger.warning("%s invalid currency %r", self.logger.warning("%s invalid currency %r",
log_prefix, currency) log_prefix, currency)
try: try:
method_enum = self.PaymentMethods[method_key] method_enum = self.PaymentMethods[re.sub(r'[- ]', '_', method_key)]
except KeyError: except KeyError:
self.logger.warning("%s invalid method %r", self.logger.warning("%s invalid method %r",
log_prefix, method_key) log_prefix, method_key)

2
setup.py
View file

@ -5,7 +5,7 @@ from setuptools import setup
setup( setup(
name='conservancy_beancount', name='conservancy_beancount',
description="Plugin, library, and reports for reading Conservancy's books", description="Plugin, library, and reports for reading Conservancy's books",
version='1.5.12', version='1.5.13',
author='Software Freedom Conservancy', author='Software Freedom Conservancy',
author_email='info@sfconservancy.org', author_email='info@sfconservancy.org',
license='GNU AGPLv3+', license='GNU AGPLv3+',

4
tests/books/accruals.beancount
View file

@ -76,7 +76,7 @@
contract: "rt:310/3100" contract: "rt:310/3100"
invoice: "FIXME" ; still waiting on them to send it invoice: "FIXME" ; still waiting on them to send it
project: "Conservancy" project: "Conservancy"
payment-method: "USD USWire" payment-method: "USD US Wire"
Liabilities:Payable:Accounts -200 USD Liabilities:Payable:Accounts -200 USD
Expenses:Travel 200 USD Expenses:Travel 200 USD
@ -163,7 +163,7 @@
contract: "rt:520/5220" contract: "rt:520/5220"
project: "Conservancy" project: "Conservancy"
Liabilities:Payable:Accounts -1,000 EUR {1.100 USD} Liabilities:Payable:Accounts -1,000 EUR {1.100 USD}
payment-method: "eur fxwire" payment-method: "eur fx-wire"
Expenses:FilingFees 1,000 EUR {1.100 USD} Expenses:FilingFees 1,000 EUR {1.100 USD}
2010-06-20 * "StateGov" "Business registration" 2010-06-20 * "StateGov" "Business registration"