Merge pull request #31 from fivetran/bugfix/balance-sheet-dupes

Bugfix/balance sheet dupes
fivetran · Jun 17, 2022 · b7554b5 · b7554b5
2 parents f6e1f27 + ecaad12
commit b7554b5
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# dbt_xero v0.4.2
+## Bug Fix
+- Fixes duplicate values in `net_amount` field in `xero__balance_sheet_report` when leveraging logic to union multiple Xero connectors
+## Contributors
+- [@danieltaft](https://github.com/danieltaft)[#30](https://github.com/fivetran/dbt_xero/pull/30)
+
 # dbt_xero v0.4.1
 ## Features
 - Adds the `xero__using_bank_transaction` variable to disable the associated models on instances of Xero that don't include the `bank_transaction` source table. ([#27](https://github.com/fivetran/dbt_xero/pull/27))

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'xero'
-version: '0.4.1'
+version: '0.4.2'
 config-version: 2
 require-dbt-version: [">=1.0.0", "<2.0.0"]
 

diff --git a/docs/catalog.json b/docs/catalog.json
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/manifest.json b/docs/manifest.json
diff --git a/docs/run_results.json b/docs/run_results.json
diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'xero_integration_tests'
-version: '0.4.1'
+version: '0.4.2'
 profile: 'integration_tests'
 config-version: 2
 

diff --git a/models/xero__balance_sheet_report.sql b/models/xero__balance_sheet_report.sql
@@ -20,7 +20,8 @@ with calendar as (
             when cast(extract(year from current_date) || '-' || financial_year_end_month || '-' || financial_year_end_day as date) >= current_date
             then cast(extract(year from current_date) || '-' || financial_year_end_month || '-' || financial_year_end_day as date)
             else cast(extract(year from {{ dbt_utils.dateadd('year', -1, 'current_date') }}) || '-' || financial_year_end_month || '-' || financial_year_end_day as date)
-        end as current_year_end_date
+        end as current_year_end_date,
+		source_relation
     from organization
 
 ), joined as (
@@ -54,6 +55,7 @@ with calendar as (
     inner join ledger
         on calendar.date_month >= cast({{ dbt_utils.date_trunc('month', 'ledger.journal_date') }} as date)
     cross join year_end
+	where year_end.source_relation = ledger.source_relation
     {{ dbt_utils.group_by(7) }}
 
 )