accrual: Support limited punctuation in payment-method.

conservancy_beancount/reports/accrual.py

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

setup.py

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

tests/books/accruals.beancount

@@ -76,7 +76,7 @@
   contract: "rt:310/3100"
   invoice: "FIXME"  ; still waiting on them to send it
   project: "Conservancy"
-  payment-method: "USD USWire"
+  payment-method: "USD US Wire"
   Liabilities:Payable:Accounts  -200 USD
   Expenses:Travel  200 USD
 
@@ -163,7 +163,7 @@
   contract: "rt:520/5220"
   project: "Conservancy"
   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}
 
 2010-06-20 * "StateGov" "Business registration"