Skip to content

Commit

Permalink
rename remaining to Journal
Browse files Browse the repository at this point in the history
  • Loading branch information
epogrebnyak committed Jan 21, 2024
1 parent 425777f commit ba7b88f
Showing 1 changed file with 13 additions and 20 deletions.
33 changes: 13 additions & 20 deletions core/uncore.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,6 @@ def add(self, t: T, name: str, contra_names: list[str] | None = None):
self.dict.offset(name, contra_name)
return self

def create_ledger(self):
return Journal.from_chart(
self.dict, self.income_summary_account, self.retained_earnings_account
)


Amount = Decimal | int | float
Record = namedtuple("Record", ["side", "name", "amount"])
Expand Down Expand Up @@ -217,12 +212,12 @@ def new(
income_summary_account: str,
retained_earnings_account: str,
):
ledger = cls()
journal = cls()
for key in chart_dict.keys():
ledger[key] = Account(chart_dict.account_type(key))
ledger[retained_earnings_account] = Account(Regular(T.Capital))
ledger[income_summary_account] = Account(Intermediate(Side.Credit))
return ledger
journal[key] = Account(chart_dict.account_type(key))
journal[retained_earnings_account] = Account(Regular(T.Capital))
journal[income_summary_account] = Account(Intermediate(Side.Credit))
return journal

@classmethod
def from_chart(
Expand Down Expand Up @@ -326,7 +321,7 @@ def close_isa(self):

def close_first(self):
"""Close contra accounts to income and expenses.
Makes ledger ready for income statement."""
Makes journal ready for income statement."""
return self.close_contra([T.Income, T.Expense])

def close_second(self):
Expand All @@ -344,28 +339,26 @@ def flush(self):
return self


def close(chart, ledger):
return Pipeline(chart, ledger).close_first().close_second().close_last().journal
def close(chart, journal):
return Pipeline(chart, journal).close_first().close_second().close_last().journal


def statements(chart, ledger):
a = Pipeline(chart, ledger).close_first()
b = Pipeline(chart, ledger).close_first().close_second().close_last()
def statements(chart, journal):
a = Pipeline(chart, journal).close_first()
b = Pipeline(chart, journal).close_first().close_second().close_last()
return a.journal, b.journal


if __name__ == "__main__":
chart = (
Chart()
Chart("isa", "re")
.add_many(T.Asset, "cash", "ar")
.add(T.Capital, "equity", contra_names=["buyback"])
.add(T.Income, "sales", contra_names=["refunds", "voids"])
.add(T.Liability, "vat")
.add(T.Expense, "salary")
)
journal = Journal.from_chart(
chart.dict, "income_summary_account", "retained_earnings"
)
journal = Journal.from_chart(chart)
journal.post_many(
[
double_entry("cash", "equity", 1200),
Expand Down

0 comments on commit ba7b88f

Please sign in to comment.