NPO-Accounting/conservancy_beancount Changeset - f66460f34304

Changeset - f66460f34304

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Brett Smith - 4 years ago 2020-05-28 13:05:18
brettcsmith@brettcsmith.org

accrual: Outgoing report includes total at cost.

4 files changed with 39 insertions and 4 deletions:

conservancy_beancount/reports/accrual.py

setup.py

tests/books/accruals.beancount

tests/test_reports_accrual.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/accrual.py

➞

Show inline comments

@@ ... / @@ -296,6 +296,14 @@ def outgoing_report(groups: PostGroups, @@
+            )
             requestor = f'{requestor_name} <{rt_requestor["EmailAddress"]}>'.strip()
         raw_balance = -related.balance()
         cost_balance = -related.balance_at_cost()
         cost_balance_s = cost_balance.format(None)
         if raw_balance == cost_balance:
             balance_s = cost_balance_s
         else:
             balance_s = f'{raw_balance} ({cost_balance_s})'
         contract_links = related.all_meta_links('contract')
         if contract_links:
             contract_s = ' , '.join(rt_wrapper.iter_urls(
@@ ... / @@ -309,7 +317,7 @@ def outgoing_report(groups: PostGroups, @@
         print(
             "PAYMENT FOR APPROVAL:",
             f"REQUESTOR: {requestor}",
-            f"TOTAL TO PAY: {-related.balance()}",
+            f"TOTAL TO PAY: {balance_s}",
             f"AGREEMENT: {contract_s}",
             f"PAYMENT TO: {ticket.get('CF.{payment-to}') or requestor_name}",
             f"PAYMENT METHOD: {ticket.get('CF.{payment-method}', '')}",

setup.py

➞

Show inline comments

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

tests/books/accruals.beancount

➞

Show inline comments

@@ ... / @@ -73,3 +73,10 @@ @@
   contract: "rt:510/4000"
   Expenses:FilingFees  60.00 USD
   Liabilities:Payable:Accounts  -60.00 USD
 -06-18 * "EuroGov" "European legal fees"
   rt-id: "rt:520"
   invoice: "rt:520/5200"
   contract: "rt:520/5220"
   Liabilities:Payable:Accounts  -1,000 EUR {1.100 USD}
   Expenses:FilingFees  1,000 EUR {1.100 USD}

tests/test_reports_accrual.py

➞

Show inline comments

@@ ... / @@ -68,6 +68,7 @@ class RTClient(testutil.RTClient): @@
             ('6100', 'invoice may.pdf', 'application/pdf', '1.6m'),
         ],
         '515': [],
         '520': [],
+    }
@@ ... / @@ -281,7 +282,7 @@ def test_outgoing_report(accrual_postings): @@
     check_output(output, [
         r'^PAYMENT FOR APPROVAL:$',
         r'^REQUESTOR: Mx\. 510 <mx510@example\.org>$',
-        r'^TOTAL TO PAY: 280\.00 USD$',
+        r'^TOTAL TO PAY: \$280\.00$',
         fr'^AGREEMENT: {contract_url}',
         r'^PAYMENT TO: Hon\. Mx\. 510$',
         r'^PAYMENT METHOD: payment method 510$',
@@ ... @@
         r'^PAYMENT METHOD:\s*$',
     ])
 def test_outgoing_report_fx_amounts(accrual_postings):
     invoice = 'rt:520/5200'
     related = core.RelatedPostings(
         post for post in accrual_postings
         if post.meta.get('invoice') == invoice
         and post.account.is_under('Assets:Receivable', 'Liabilities:Payable')
+    )
     output = io.StringIO()
     errors = io.StringIO()
     rt_client = RTClient()
     rt_cache = rtutil.RT(rt_client)
     accrual.outgoing_report({invoice: related}, output, errors, rt_client, rt_cache)
     assert not errors.getvalue()
     check_output(output, [
         r'^PAYMENT FOR APPROVAL:$',
         r'^REQUESTOR: Mx\. 520 <mx520@example\.org>$',
         r'^TOTAL TO PAY: 1,000\.00 EUR \(\$1,100.00\)$',
     ])
 def run_main(arglist, config=None):
     if config is None:
         config = testutil.TestConfig(
@@ ... / @@ -375,7 +395,7 @@ def test_main_outgoing_report(arglist): @@
     contract_url = re.escape(f'<{rt_url}Ticket/Attachment/4000/4000/contract.pdf>')
     check_output(output, [
         r'^REQUESTOR: Mx\. 510 <mx510@example\.org>$',
-        r'^TOTAL TO PAY: 280\.00 USD$',
+        r'^TOTAL TO PAY: \$280\.00$',
         r'^\s*2020-06-12\s',
         r'^\s+Expenses:FilingFees\s+60\.00 USD$',
     ])

0 comments (0 inline, 0 general)