NPO-Accounting/conservancy_beancount Changeset - 948d3a2d14d1

Changeset - 948d3a2d14d1

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Brett Smith - 4 years ago 2020-06-09 19:59:09
brettcsmith@brettcsmith.org

accrual: Add columns to the aging report. RT#11439.

This adds almost all the metadata that's relevant to accruals.
I considered adding statement, but that cuased rows to get spaced out a lot,
and statement's kind of a low-value column, so I decided against it.

Ultimately I would like to make this configurable but that's for the
future.

4 files changed with 38 insertions and 6 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

@@ ... @@
         'Invoice Amount',
         'Booked Amount',
         'Project',
         'Ticket',
         'Invoice',
         'Approval',
         'Contract',
         'Purchase Order',
+    ]
     COL_COUNT = len(COLUMNS)
@@ ... @@
         total_balance = core.MutableBalance()
         text_style = self.merge_styles(self.style_bold, self.style_endtext)
-        text_span = self.COL_COUNT - 1
+        text_span = 4
         last_age_text: Optional[str] = None
         self.add_row()
@@ ... @@
         else:
             amount_cell = self.balance_cell(raw_balance)
         projects = {post.meta.get('project') or None for post in row}
         projects.discard(None)
         self.add_row(
             self.date_cell(row[0].meta.date),
@@ ... @@
             amount_cell,
             self.balance_cell(row.end_balance),
             self.multiline_cell(sorted(projects)),
             self.multilink_cell(self._link_seq(row, 'rt-id')),
             self.multilink_cell(self._link_seq(row, 'invoice')),
             self.multilink_cell(self._link_seq(row, 'approval')),
             self.multilink_cell(self._link_seq(row, 'contract')),
             self.multilink_cell(self._link_seq(row, 'purchase-order')),
+        )

setup.py

➞

Show inline comments

@@ ... / @@ -6,5 +6,5 @@ setup( @@
     name='conservancy_beancount',
     description="Plugin, library, and reports for reading Conservancy's books",
-    version='1.1.5',
+    version='1.1.6',
     author='Software Freedom Conservancy',
     author_email='info@sfconservancy.org',

tests/books/accruals.beancount

➞

Show inline comments

@@ ... / @@ -16,4 +16,5 @@ @@
   rt-id: "rt:40"
   invoice: "rt:40/400"
   project: "Conservancy"
   Assets:Receivable:Accounts  -500 USD
   Assets:Checking  500 USD
@@ ... / @@ -22,4 +23,5 @@ @@
   rt-id: "rt:44"
   invoice: "rt:44/440"
   project: "Conservancy"
   Liabilities:Payable:Accounts  125 USD
   Assets:Checking  -125 USD
@@ ... / @@ -28,4 +30,5 @@ @@
   rt-id: "rt:470"
   invoice: "rt:470/4700"
   project: "Development Grant"
   Assets:Receivable:Accounts  5000 USD
   Income:Donations           -5000 USD
@@ ... / @@ -34,4 +37,5 @@ @@
   rt-id: "rt:470"
   invoice: "rt:470/4700"
   project: "Development Grant"
   Assets:Receivable:Accounts  -5000 USD
   Assets:Checking              5000 USD
@@ ... / @@ -40,4 +44,5 @@ @@
   rt-id: "rt:490"
   invoice: "rt:490/4900"
   project: "Conservancy"
   Liabilities:Payable:Accounts  -75 USD
   Expenses:Travel  75 USD
@@ ... / @@ -46,4 +51,5 @@ @@
   rt-id: "rt:480"
   invoice: "rt:480/4800"
   project: "Conservancy"
   Expenses:Travel  250 USD
   Liabilities:Payable:Accounts  -125 USD
@@ ... / @@ -55,4 +61,5 @@ @@
   rt-id: "rt:480"
   invoice: "rt:480/4800"
   project: "Conservancy"
   Liabilities:Payable:Accounts  125 USD
   Assets:Checking  -125 USD
@@ ... / @@ -61,4 +68,5 @@ @@
   rt-id: "rt:480"
   invoice: "rt:480/4800"
   project: "Conservancy"
   Liabilities:Payable:Accounts  125 USD
   Assets:Checking  -125 USD
@@ ... / @@ -68,4 +76,5 @@ @@
   contract: "rt:310/3100"
   invoice: "FIXME"  ; still waiting on them to send it
   project: "Conservancy"
   Liabilities:Payable:Accounts  -200 USD
   Expenses:Travel  200 USD
@@ ... / @@ -75,4 +84,5 @@ @@
   invoice: "rt:505/5050"
   approval: "rt:505/5040"
   project: "Conservancy"
   Income:Donations  -2,500 EUR {1.100 USD}
   Assets:Receivable:Accounts  2,500 EUR {1.100 USD}
@@ ... / @@ -82,4 +92,5 @@ @@
   invoice: "rt:510/5100"
   contract: "rt:510/4000"
   project: "Conservancy"
   Expenses:Services:Legal  200.00 USD
   Liabilities:Payable:Accounts  -200.00 USD
@@ ... / @@ -88,4 +99,5 @@ @@
   invoice: "rt://ticket/515/attachments/5150"
   approval: "rt://ticket/515/attachments/5140"
   project: "Conservancy"
   Income:Donations  -1500.00 USD
   Assets:Receivable:Accounts  1500.00 USD
@@ ... / @@ -94,4 +106,5 @@ @@
   rt-id: "rt:505"
   invoice: "rt:505/5050"
   project: "Conservancy"
   Assets:Receivable:Accounts  -2,750.00 USD
   Assets:Checking  2,750.00 USD
@@ ... / @@ -101,4 +114,5 @@ @@
   rt-id: "rt:510"
   invoice: "rt:510/5100"
   project: "Conservancy"
   Liabilities:Payable:Accounts  200.00 USD
   contract: "rt:510/4000"
@@ ... / @@ -110,4 +124,5 @@ @@
   invoice: "rt:510/6100"
   contract: "rt:510/4000"
   project: "Conservancy"
   Expenses:Services:Legal  220.00 USD
   Liabilities:Payable:Accounts  -220.00 USD
@@ ... / @@ -117,4 +132,5 @@ @@
   invoice: "rt:510/6100"
   contract: "rt:510/4000"
   project: "Conservancy"
   Expenses:FilingFees  60.00 USD
   Liabilities:Payable:Accounts  -60.00 USD
@@ ... / @@ -126,4 +142,5 @@ @@
   invoice: "rt:520/5200"
   contract: "rt:520/5220"
   project: "Conservancy"
   Liabilities:Payable:Accounts  -1,000 EUR {1.100 USD}
   Expenses:FilingFees  1,000 EUR {1.100 USD}
@@ ... / @@ -132,4 +149,5 @@ @@
   rt-id: "rt:470"
   invoice: "rt:470/4700"
   project: "Development Grant"
   Assets:Receivable:Accounts  5500 USD
   Income:Donations           -5500 USD

tests/test_reports_accrual.py

➞

Show inline comments

@@ ... / @@ -76,7 +76,9 @@ class AgingRow(NamedTuple): @@
     rt_id: Sequence[str]
     invoice: Sequence[str]
     project: Sequence[str]
     @classmethod
     def make_simple(cls, date, entity, at_cost, invoice, rt_id=None, orig_amount=None):
     def make_simple(cls, date, entity, at_cost, invoice,
                     rt_id=None, orig_amount=None, project='Conservancy'):
         if isinstance(date, str):
             date = datetime.datetime.strptime(date, '%Y-%m-%d').date()
@@ ... / @@ -85,9 +87,9 @@ class AgingRow(NamedTuple): @@
         if rt_id is None:
             rt_id, _, _ = invoice.partition('/')
         return cls(date, [entity], orig_amount, at_cost, [rt_id], [invoice])
+        return cls(date, [entity], orig_amount, at_cost, [rt_id], [invoice], [project])
     def check_row_match(self, sheet_row):
         cells = testutil.ODSCell.from_row(sheet_row)
-        assert len(cells) == len(self)
+        assert len(cells) >= len(self)
         cells = iter(cells)
         assert next(cells).value == self.date
@@ ... / @@ -100,4 +102,5 @@ class AgingRow(NamedTuple): @@
         assert usd_cell.value_type == 'currency'
         assert usd_cell.value == self.at_cost.number
         assert next(cells).text == '\0'.join(self.project)
         for index, cell in enumerate(cells):
             links = cell.getElementsByType(odf.text.A)
@@ ... / @@ -119,5 +122,6 @@ AGING_AR = [ @@
     AgingRow.make_simple('2010-05-15', 'MatchingProgram', 1500,
                          'rt://ticket/515/attachments/5150'),
     AgingRow.make_simple('2010-06-15', 'GrantCo', 5500, 'rt:470/4700'),
     AgingRow.make_simple('2010-06-15', 'GrantCo', 5500, 'rt:470/4700',
                          project='Development Grant'),
+]

0 comments (0 inline, 0 general)