Feature/new journal cash models by fivetran-avinash · Pull Request #78 · fivetran/dbt_xero

fivetran-avinash · 2026-06-30T08:55:21Z

PR Overview

Package version introduced in this PR:

1.5.0

This PR addresses the following Issue/Feature(s):

GA-1025972

Summary of changes:

Pairs the new Xero journal cash updates to create a cash general ledger mirroring the existing general ledger.

Submission Checklist

Alignment meeting with the reviewer (if needed)
- Timeline and validation requirements discussed
Provide validation details:
- Validation Steps: Check for unintentional effects (e.g., add/run consistency & integrity tests)
- Testing Instructions: Confirm the change addresses the issue(s)
- Focus Areas: Complex logic or queries that need extra attention
Merge any relevant open PRs into this PR

Changelog

Draft changelog for PR
Final changelog for release review

- Add all untracked cash model files: stg_xero__journal_cash, stg_xero__journal_cash_line, stg_xero__journal_cash_line_has_tracking_category (tmp + staging layers), int_xero__journal_cash_line_pivoted_tracking_categories, xero__cash_general_ledger, get_*_columns macros, and integration test seeds - Add consistency_cash_general_ledger.sql integration test to match pattern of all other end models - Fix README source table links pointing to feature/new-union-data (now point to main) - Add not_null tests to journal_id and journal_line_id in stg_xero__journal_cash_line_has_tracking_category Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Ensures the second dbt run verifies the package executes cleanly when cash-basis journal models are turned off, closing a coverage gap where all three CI passes ran with xero__using_journal_cash: true. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

fivetran-catfritz

A tiny yml update needed, but also there are a couple more philosophical questions on columns.

fivetran-catfritz · 2026-07-06T18:53:19Z

+    journal_cash: "{{ source('xero', 'journal_cash') }}"
+    journal_cash_line: "{{ source('xero', 'journal_cash_line') }}"
+    journal_cash_line_has_tracking_category: "{{ source('xero', 'journal_cash_line_has_tracking_category') }}"
+    xero_sources: []


Suggested change

xero_sources: []

I think we should remove this since you provided default values but let me know otherwise.

fivetran-catfritz · 2026-07-07T15:44:48Z

        description: >
          The source where this data was pulled from. If you are making use of the `union_schemas` variable, this will be the source schema.
-          If you are making use of the `union_databases` variable, this will be the source database. If you are not unioining together multiple
+          If you are making use of the `union_databases` variable, this will be the source database. If you are not unioning together multiple


Haha oh dear... I think this made it into several packages with our last round of updates. Good catch tho.

Haha it happens

fivetran-catfritz · 2026-07-07T15:59:51Z

+        accounts.account_class,
+        'cash' as accounting_basis,
+
+        case when journals.source_type in ('ACCPAY', 'ACCREC') then journals.source_id end as invoice_id,


Question on invoice_id (Claude flagged):

According to Claude, ACCPAY and ACCREC are accrual-basis source types that shouldn't appear in a cash journal, so this will never fire. In the cash context, payment_id already plays the equivalent role — it captures AR/AP transactions at the payment stage rather than invoice creation. So there isn't really a cash-basis equivalent for invoice_id. Should we remove it in favor of keeping only what's conceptually valid for cash, or keep it for structural consistency with xero__general_ledger? Maybe discuss with the team?

suggested changes of docs updates applied

fivetran-catfritz · 2026-07-07T16:08:48Z

+
+    select
+        first_contact.*,
+        contacts.contact_name


Another Claude-flagged question:

According to Claude, contact_id and contact_name will be NULL for payment-type source types in xero__cash_general_ledger (since ACCRECPAYMENT, ACCPAYPAYMENT, and the other payment types that map to payment_id). This is because contact resolution only works through the invoice, bank transaction, and credit note joins — and there's no payment staging model in the package to fill the gap.

This same limitation exists in xero__general_ledger, but it's less noticeable there since accrual journals also include the original invoice entries (ACCREC/ACCPAY) which do resolve contacts. In the cash ledger, payments are the only entries, so a larger share of rows will have NULL contact info.

Not suggesting we fix it in this PR — adding a payment model is a bigger lift. But it might be worth updating the contact_id field description in xero.yml to set expectations:

- name: contact_id description: > The identifier for the contact associated with the source transaction, where resolvable. Will be null for payment source types (e.g. ACCRECPAYMENT, ACCPAYPAYMENT) as the package does not currently include a payment staging model.

Or, we just don't bother with the contact_name.

Maybe another question for the team.

suggested changes of docs updates applied

fivetran-catfritz · 2026-07-07T16:15:00Z

+        journal_lines.tax_name,
+        journal_lines.tax_type,
+        accounts.account_class,
+        'cash' as accounting_basis,


Perhaps add a similar column 'accrual' as accounting_basis to xero__general_ledger?

Good call! updated.

…fivetran/dbt_xero into feature/new-journal-cash-models

fivetran-avinash · 2026-07-07T18:22:02Z

A tiny yml update needed, but also there are a couple more philosophical questions on columns.

@fivetran-catfritz

Ready for re-review once docs get regenerated /Buildkite passes

…fivetran/dbt_xero into feature/new-journal-cash-models

fivetran-catfritz

lgtm!

fivetran-avinash and others added 3 commits June 28, 2026 18:32

Feature: New journal cash models

7abe755

fivetran-avinash self-assigned this Jun 30, 2026

fivetran-avinash added 8 commits June 30, 2026 13:31

resovle buildkite errors

17c7ff4

small changes

bbc2cf3

Merge in v1.4.0

8d17830

Macro fixes

c9ffda8

Additional suggestions

12ae109

Standardizing journal cash updates

6197063

Schema

8ab9b7c

ledger alignment

a2be6f9

fivetran-avinash added the docs:ready Triggers the docs generator workflow. label Jul 6, 2026

Generate dbt docs via GitHub Actions

41678d3

fivetran-avinash marked this pull request as ready for review July 6, 2026 18:52

fivetran-avinash added 3 commits July 6, 2026 15:54

Merge conflicts + docs updates

fb3650f

Final checks

eec29d1

Changelog link

0259829

fivetran-avinash added docs:ready Triggers the docs generator workflow. and removed docs:ready Triggers the docs generator workflow. labels Jul 7, 2026

Generate dbt docs via GitHub Actions

633e1c4

fivetran-catfritz requested changes Jul 7, 2026

View reviewed changes

fivetran-catfritz reviewed Jul 7, 2026

View reviewed changes

fivetran-avinash added 2 commits July 7, 2026 11:18

PR suggestions

2e3ede6

Merge branch 'feature/new-journal-cash-models' of https://github.com/…

49e2d95

…fivetran/dbt_xero into feature/new-journal-cash-models

fivetran-avinash added docs:ready Triggers the docs generator workflow. and removed docs:ready Triggers the docs generator workflow. labels Jul 7, 2026

github-actions Bot and others added 2 commits July 7, 2026 18:22

Generate dbt docs via GitHub Actions

4e3f6a2

Remove xero_sources

68f6b7f

Merge branch 'feature/new-journal-cash-models' of https://github.com/…

d486bc9

…fivetran/dbt_xero into feature/new-journal-cash-models

fivetran-catfritz approved these changes Jul 7, 2026

View reviewed changes

fivetran-avinash added docs:ready Triggers the docs generator workflow. and removed docs:ready Triggers the docs generator workflow. labels Jul 8, 2026

Generate dbt docs via GitHub Actions

8772849

fivetran-avinash merged commit ef8819e into main Jul 8, 2026
9 checks passed

Navigation Menu

Feature/new journal cash models - #78

Feature/new journal cash models#78
fivetran-avinash merged 22 commits into
mainfrom
feature/new-journal-cash-models

fivetran-avinash commented Jun 30, 2026 •

edited

Loading

Uh oh!

fivetran-catfritz left a comment

Uh oh!

fivetran-catfritz Jul 6, 2026

Uh oh!

fivetran-avinash Jul 7, 2026

Uh oh!

fivetran-catfritz Jul 7, 2026

Uh oh!

fivetran-avinash Jul 7, 2026

Uh oh!

fivetran-catfritz Jul 7, 2026

Uh oh!

fivetran-avinash Jul 7, 2026

Uh oh!

fivetran-catfritz Jul 7, 2026

Uh oh!

fivetran-avinash Jul 7, 2026

Uh oh!

fivetran-catfritz Jul 7, 2026

Uh oh!

fivetran-avinash Jul 7, 2026

Uh oh!

fivetran-avinash commented Jul 7, 2026 •

edited

Loading

Uh oh!

fivetran-catfritz left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

fivetran-avinash commented Jun 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Overview

Submission Checklist

Changelog

Uh oh!

fivetran-catfritz left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fivetran-avinash commented Jul 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fivetran-catfritz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

fivetran-avinash commented Jun 30, 2026 •

edited

Loading

fivetran-avinash commented Jul 7, 2026 •

edited

Loading