ursjoss / lola-sumup Goto Github PK

Extend accoung report with an additional column 10930/10100. It has the same values as 20051/10930 and has the purpose of using the correct accounts for the payment to Mittagtisch.

10000/30200 [Cafe_Cash]
10000/30700 [Verm_Cash]
10000/23050 [Deposit_Cash]
10000/31X00 [Rental_Cash]
10000/32000 [Culture_Cash]

• replace 31X00 with 31000, as we now only use a consolidated account for rental income
• also: reorder columns in accounting report, moving up the accounts concerning 23050.

• move Payment Sumup after 20051/30500
• new column Total Cash Debit that should reflect the cash debit in Kassendokument
• new column Total Card Debit that should reflect the card debit in Kassendokument

using assert_eq! when comparing dataframes from polars is quite uncomfortable.

Maybe https://docs.rs/pretty_assertions/latest/pretty_assertions/ could alleviate that to some degree...

• use test instead of rstest for simple tests
• re-evaluate how to assert data frames with a more helpful output in case of failing tests
• use test fixtures for intermediate data frame (see here)

This will resolve a few open issues:

Pros:

• current problem that date is expected to be dd.mm.yyyy. dd.mm.yy has to be manually corrected before continuing the process
• diffing on file level is possible, but once saved as CSV from Excel, next to the data format, also the number format is contorted, e.g. 0.0 is saved as 0, depending on the number format, the digits after the decimal point may even be rounded, what not only obfuscates the diff but may even change the content.

Cons:

• diffing on file level will not be possible

Steps:

• have the prepare task create an XLSX instead of CSV
• have the export task expect an XSLX istead of CSV

If it is cheap to support both CSV and XLSX (with XLSX as default), prefer that.

• Date
• Gross Card LoLa
• Net Card MiTi
• Net Card Total
• LoLa_Commission

• Gross Card LoLa -> 10920/30200
• Net Card Total MiTi -> 10920/20051
• Tips Card LoLa -> 10920/10910
• Payment SumUp -> stays
• Commission LoLa -> 68450/10920
• Debt to MiTi -> 20051/10900
• Income LoLa MiTi -> 20051/30200

• Condition: Topic=MiTi & Owner=MiTi & Description startsWith "Hauptgang" && (description endsWith "Praktikum" || descriptio endsWith "Reduziert")
• Cost Account: 59991

• Date
• MiTi_Cash
• MiTi_Card
• MiTi Total
• Gross MiTi (MiTi)
• Gross MiTi (LoLa)
• Gross MiTi (MiTi) Card
• Net MiTi (MiTi) Card
• Contribution LoLa
• Credit MiTi

• summary
• miti
• accounting

correlate using transaction id

Consider tips payed to MiTi via card in Credit MiTi

Don't silently discard transactions found in the transaction report but not in the sales report.

Adjustment in Accounting report:

Total Gross Payments Paid out to external parties ([PaidOut_Card]) should not be posted against the cash account ([10920/10000]) but instead against the transitory account ([10920/10910]), together with Tips LoLa paid via Card ([Tips_Card - MiTi_Tips_Card])

• Count of Menus (Adults)
• Count of Menus (Children)

In #55 we introduced a split of the items summarized in Gross Card LoLa (aliased 10920/30200) into

• Cafe_Card (aliased still 10920/30200) and
• Verm_Card (aliased 10920/30700).

The newly introduced latter column still captures too much. Postings identified to belong somewhere else are e.g.:

• Schlüsseldepot -> 10920/23050
• Income for cultural event (e.g. Quartierkultur) -> 10920/32000
• Rental fee -> 10920/31000 or 10920/31100 -> maybe 10920/31X00

Probably the easiest way of maintaining that would be to have dedicated Topics, which maintain their own accounts to post this into.

Consider only maintaining one other category that indicates to look up the account in the Kassa-Dokument.

Paid out in cash

Adjust FilterExpressionProvider for MitiMealType.

• contains "Hauptsp"
• starts with "Menü"
• starts with "Praktika"

Check for more improvements

allowing to

• reference the input files
• prepare/export via button click
• ...

For some configurations regarding Tips, the only indication of the tipped amount is found in the TransactionReport (Column 'Trinkgeldbetrag'). The Sales Report is missing the additional entry 'Trinkgeld'.

Two examples from the March reports:

• TEQYG3SYCX (Amount Tip 7.20)
• TFRNL6VQSH (Amount Tip 0.80)

We have to consider the tip in such configurations, which also fixes the issue that w/o the tip, the commission is decreased proportionally.

Also, rename and re-sort columns in the summary.

Even though I do not know what you plan to do but I tried some stuff with CSV and:

If you map or filter I found that rayon is the way to go for doing it in parallel.

to handle the Depsit for reusable dishes

• New Topic Packaging
• Accounts 10000/46000 and 10920/46000

Senioren-Mittagstisch -> MiTi, MiTi
Kinderpasta -> MiTi, MiTi

Also consider for meal-count

especially consider "Kooperationspartner mit eigenem Essensverkauf"

Prepare

Preparing the intermediate file for a particular month from sales report and transaction report as input, enriching it with the auto-evaluated columns Topic, Owner, Purpose. Will produce output file intermediate_<yyyymm>.csv (with <yyyymm> representing the month of transactions).

lola-sumup prepare <yyyymm> --sales-report <file> --transaction-report <file>

or

lola-sumup prepare <yyyymm> -s <file> -t <file>

Export

Consumes a (potentially redacted) copy of the intermediate report and exports different outputs for special purposes.

lola-sumup export -i intermediate_<yyyymm>*.csv

produces:

• summary_<yyyymm>_<ts>.csv
• accounting_<yyyymm>_<ts>.csv
• mittagstisch_<yyyymm>_<ts>.csv

With:

• <yyyymm> the processed month (derived from the file name intermediate_<yyyymm>*.csv
• <ts> timestamp of running the export

Similar to "Culture", but it will land in a new accounting columns 10000/30800 or 10920/30800 respectively.

• description for Tip
• decription patterns for consumptions MiTi
• thresholds MiTi, LoLa, Vermietung
• ...

This issue lists Renovate updates and detected dependencies. Read the Dependency Dashboard docs to learn more.

Awaiting Schedule

These updates are awaiting their schedule. Click on a checkbox to get an update now.

• chore(deps): lock file maintenance

Detected dependencies

• Check this box to trigger a request for Renovate to run again on this repository

Separe asciidoc documentation for different steps and reports.

Readme to contain minimum.

Fix effect of PaidOut on cash account:

• After Columns 10000/XXXX new column 10920/10000 with values of PaidOut_Card
• Column 10920/10910 should be not contain PaidOut_Card
• Total Cash Debit: Total daily cash debit - formula must be:
  • [Gross Cash - MiTi_Cash - PaidOut Total] instead of
  • [Gross Cash - MiTi_Cash]
• Move reconcilation columns (Payment SumUp, Total Cash Debit, Total Card Debit) up front, right after Date

potentially with a set of Owners for Topic Vermiet to distinguish the credit account (Vermietung, Key deposit...)

• Gross Card LoLa is Cafe_Card + Verm_Card
• Only use Cafe_Card for 10920/30200
• add Verm_Card with alias 10920/30700

... knowlingly, that some postings will be wrong in 30700. We need to split further, but that will require the introduction of another abstraction (e.g. new Topics that maintain a dedicated account to use). That will be tackled in a separate ticket.