NPO-Accounting/conservancy_beancount Changeset - ba8aaaa98831

Changeset - ba8aaaa98831

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Brett Smith - 4 years ago 2020-06-09 18:52:55
brettcsmith@brettcsmith.org

accrual: Aging report uses group since last nonzero. RT#11600.

This makes it consistent with our other reports. The fact that it wasn't
already was basically an oversight.

4 files changed with 25 insertions and 2 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

@@ ... / @@ -471,25 +471,29 @@ class AgingReport(BaseReport): @@
     def __init__(self,
                  rt_client: rt.Rt,
                  out_file: BinaryIO,
                  date: Optional[datetime.date]=None,
     ) -> None:
         if date is None:
             date = datetime.date.today()
         self.out_bin = out_file
         self.logger = logger.getChild(type(self).__name__)
         self.ods = AgingODS(rt_client, date, self.logger)
     def run(self, groups: PostGroups) -> None:
         rows = list(group for group in groups.values() if not group.is_zero())
         rows = list(
             group.since_last_nonzero()
             for group in groups.values()
             if not group.is_zero()
+        )
         rows.sort(key=lambda related: (
             related.account,
             related[0].meta.date,
             min(related.entities()) if related.accrued_entities else '',
         ))
         self.ods.write(rows)
         self.ods.save_file(self.out_bin)
 class BalanceReport(BaseReport):
     def _report(self, posts: AccrualPostings, index: int) -> Iterable[str]:
         posts = posts.since_last_nonzero()

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.1.4',
+    version='1.1.5',
     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

@@ ... / @@ -15,24 +15,36 @@ @@
 -03-05 * "EarlyBird" "Payment for receivable from previous FY"
   rt-id: "rt:40"
   invoice: "rt:40/400"
   Assets:Receivable:Accounts  -500 USD
   Assets:Checking  500 USD
 -03-06 * "EarlyBird" "Payment for payment from previous FY"
   rt-id: "rt:44"
   invoice: "rt:44/440"
   Liabilities:Payable:Accounts  125 USD
   Assets:Checking  -125 USD
 -03-15 * "GrantCo" "2010Q1 grant"
   rt-id: "rt:470"
   invoice: "rt:470/4700"
   Assets:Receivable:Accounts  5000 USD
   Income:Donations           -5000 USD
 -03-25 * "GrantCo" "2010Q1 grant ACH payment"
   rt-id: "rt:470"
   invoice: "rt:470/4700"
   Assets:Receivable:Accounts  -5000 USD
   Assets:Checking              5000 USD
 -03-30 * "EarlyBird" "Travel reimbursement"
   rt-id: "rt:490"
   invoice: "rt:490/4900"
   Liabilities:Payable:Accounts  -75 USD
   Expenses:Travel  75 USD
 -04-15 * "Multiparty invoice"
   rt-id: "rt:480"
   invoice: "rt:480/4800"
   Expenses:Travel  250 USD
   Liabilities:Payable:Accounts  -125 USD
   entity: "MultiPartyA"
@@ ... / @@ -106,12 +118,18 @@ @@
   contract: "rt:510/4000"
   Expenses:FilingFees  60.00 USD
   Liabilities:Payable:Accounts  -60.00 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"
   Liabilities:Payable:Accounts  -1,000 EUR {1.100 USD}
   Expenses:FilingFees  1,000 EUR {1.100 USD}
 -06-15 * "GrantCo" "2010Q2 grant"
   rt-id: "rt:470"
   invoice: "rt:470/4700"
   Assets:Receivable:Accounts  5500 USD
   Income:Donations           -5500 USD

tests/test_reports_accrual.py

➞

Show inline comments

@@ ... / @@ -109,24 +109,25 @@ AGING_AP = [ @@
     AgingRow.make_simple('2010-03-06', 'EarlyBird', -125, 'rt:44/440'),
     AgingRow.make_simple('2010-03-30', 'EarlyBird', 75, 'rt:490/4900'),
     AgingRow.make_simple('2010-04-30', 'Vendor', 200, 'FIXME'),
     AgingRow.make_simple('2010-06-10', 'Lawyer', 280, 'rt:510/6100'),
     AgingRow.make_simple('2010-06-18', 'EuroGov', 1100, 'rt:520/5200',
                          orig_amount=[testutil.Amount(1000, 'EUR')]),
+]
 AGING_AR = [
     AgingRow.make_simple('2010-03-05', 'EarlyBird', -500, 'rt:40/400'),
     AgingRow.make_simple('2010-05-15', 'MatchingProgram', 1500,
                          'rt://ticket/515/attachments/5150'),
     AgingRow.make_simple('2010-06-15', 'GrantCo', 5500, 'rt:470/4700'),
+]
 class RTClient(testutil.RTClient):
     TICKET_DATA = {
         '40': [
             ('400', 'invoice feb.csv', 'text/csv', '40.4k'),
         ],
         '44': [
             ('440', 'invoice feb.csv', 'text/csv', '40.4k'),
         ],
         '490': [],
         '505': [],

0 comments (0 inline, 0 general)