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

@@ ... / @@ -430,31 +430,38 @@ class BalanceReport(BaseReport): @@
         balance_s = posts.balance_at_cost().format(zero="Zero balance")
         if index:
             yield ""
         yield f"{entity_s} {invoice_s}:"
         yield f"  {balance_s} outstanding since {date_s}"
 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
     def _primary_rt_id(self, posts: AccrualPostings) -> rtutil.TicketAttachmentIds:
         rt_ids = posts.first_meta_links('rt-id')
         rt_id = next(rt_ids, None)
         rt_id2 = next(rt_ids, None)
         if rt_id is None:
@@ ... / @@ -486,25 +493,25 @@ class OutgoingReport(BaseReport): @@
             return None
         try:
             currency, method_key = payment_method.split(None, 1)
         except ValueError:
             self.logger.warning("%s no method specified in %r",
                                 log_prefix, payment_method)
             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
         else:
             return f'{currency.upper()} {method_enum.value}'
     def _report(self, posts: AccrualPostings, index: int) -> Iterable[str]:
         try:
             ticket_id, _ = self._primary_rt_id(posts)

setup.py

➞

Show inline comments

 #!/usr/bin/env python3
 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
         'beancount>=2.2',  # Debian:beancount
         # 1.4.1 crashes when trying to save some documents.
         'odfpy>=1.4.0,!=1.4.1',  # Debian:python3-odf
         'PyYAML>=3.0',  # Debian:python3-yaml
         'regex',  # Debian:python3-regex
         'rt>=2.0',

tests/books/accruals.beancount

➞

Show inline comments

@@ ... / @@ -67,25 +67,25 @@ @@
 -04-20 * "MultiPartyB" "Payment for 480"
   rt-id: "rt:480"
   invoice: "rt:480/4800"
   project: "Conservancy"
   Liabilities:Payable:Accounts  125 USD
   Assets:Checking  -125 USD
 -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"
   invoice: "rt:310/3120"
   project: "Conservancy"
   payment-method: "USD Check"
   Liabilities:Payable:Accounts  -220 USD
   Expenses:Travel  220 USD
@@ ... / @@ -154,25 +154,25 @@ @@
   project: "Development Grant"
   Assets:Receivable:Accounts  5500 USD
   Income:Donations           -5500 USD
 -06-18 * "EuroGov" "European legal fees"
   ; Multiple rt-ids are used to test proper handling for both
   ; 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"
   Liabilities:Payable:Accounts  -50 USD
   Expenses:FilingFees  50 USD
 -09-15 * "GrantCo" "2010Q3 grant"
   rt-id: "rt:470"
   invoice: "rt:470/4700"

0 comments (0 inline, 0 general)