NPO-Accounting/conservancy_beancount Changeset - dfdb9b65d5cb

Changeset - dfdb9b65d5cb

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 4 years ago 2020-08-22 16:39:43
brettcsmith@brettcsmith.org

accrual: Add total divider lines.

2 files changed with 3 insertions and 3 deletions:

conservancy_beancount/reports/accrual.py

setup.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/accrual.py

➞

Show inline comments

@@ ... @@
             if years and days:
                 age_text = f"{years_text} {days_text}"
             elif years:
                 age_text = years_text
             else:
                 age_text = days_text
             if last_age_text is None:
                 age_range = f"Over {age_text}"
             elif threshold < 0:
                 self.add_row(
                     self.string_cell(
                         f"Total Unpaid Over {last_age_text}: ",
                         stylename=self.merge_styles(self.style_bold, self.style_endtext),
                         numbercolumnsspanned=text_span,
                     ),
                     *(odf.table.TableCell() for _ in range(1, text_span)),
                     self.balance_cell(total_balance),
+                    self.balance_cell(total_balance, stylename=self.style_total),
+                )
                 age_range = f"Under {last_age_text}"
             else:
                 age_range = f"{age_text}–{last_age_text}"
             self.add_row(
                 self.string_cell(
                     f"Total Aged {age_range}: ",
                     stylename=self.merge_styles(self.style_bold, self.style_endtext, style),
                     numbercolumnsspanned=text_span,
                 ),
                 *(odf.table.TableCell() for _ in range(1, text_span)),
                 self.balance_cell(balance),
+            )
             last_age_text = age_text
             total_balance += balance
         self.add_row(
             self.string_cell(
                 "Total Unpaid: ",
                 stylename=self.merge_styles(self.style_bold, self.style_endtext),
                 numbercolumnsspanned=text_span,
             ),
             *(odf.table.TableCell() for _ in range(1, text_span)),
             self.balance_cell(total_balance),
+            self.balance_cell(total_balance, stylename=self.style_bottomline),
+        )
     def write_row(self, row: AccrualPostings) -> None:
         row_date = row[0].meta.date
         row_balance = self.norm_func(row.balance_at_cost())
         age = (self.date - row_date).days
         for index, threshold in enumerate(self.age_thresholds):
             if age >= threshold:
                 if row_balance.ge_zero():
                     self.age_balances[index] += row_balance
                 break
         else:
             return
         raw_balance = self.norm_func(row.balance())
         if raw_balance == row_balance:
             amount_cell = odf.table.TableCell()

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.8.7',
+    version='1.8.8',
     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
         'GitPython>=2.0',  # Debian:python3-git
         # 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',
     ],
     setup_requires=[
         'pytest-mypy',

0 comments (0 inline, 0 general)