NPO-Accounting/conservancy_beancount Changeset - 56114cc66ef7

Changeset - 56114cc66ef7

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Brett Smith - 4 years ago 2020-07-21 17:20:58
brettcsmith@brettcsmith.org

accrual: Support limited punctuation in payment-method.

3 files changed with 11 insertions and 4 deletions:

conservancy_beancount/reports/accrual.py

setup.py

tests/books/accruals.beancount

0 comments (0 inline, 0 general)

conservancy_beancount/reports/accrual.py

➞

Show inline comments

@@ ... / @@ -436,19 +436,26 @@ class BalanceReport(BaseReport): @@
 class OutgoingReport(BaseReport):
     class PaymentMethods(enum.Enum):
         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:
         super().__init__(out_file)
         self.rt_wrapper = rt_wrapper
         self.rt_client = rt_wrapper.rt
@@ ... / @@ -492,13 +499,13 @@ class OutgoingReport(BaseReport): @@
             return None
         curr_match = re.fullmatch(r'[a-z]{3}', currency)
         if curr_match is None:
             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)
             curr_match = None
         if curr_match is None:
             return None

setup.py

➞

Show inline comments

@@ ... / @@ -2,13 +2,13 @@ @@
 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+',
     install_requires=[
         'babel>=2.6',  # Debian:python3-babel

tests/books/accruals.beancount

➞

Show inline comments

@@ ... / @@ -73,13 +73,13 @@ @@
 -04-25 ! "Vendor" "First trip travel reimbursement"
   rt-id: "rt:310"
   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
 -04-30 * "Vendor" "Second trip travel reimbursement"
   rt-id: "rt:310"
   contract: "rt:310/3100"
@@ ... / @@ -160,13 +160,13 @@ @@
   ; searching and generating the outgoing report.
   rt-id: "rt:520 rt:525"
   invoice: "rt:520/5200"
   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}
 -06-20 * "StateGov" "Business registration"
   ; Intentionally has no rt-id
   invoice: "Invoices/2010StateRegistration.pdf"
   project: "Conservancy"

0 comments (0 inline, 0 general)