From 1fe935928abe08a4c01d8811e2a2ff50d06e5559 Mon Sep 17 00:00:00 2001 From: fivetran-joemarkiewicz Date: Mon, 1 Feb 2021 14:33:29 -0600 Subject: [PATCH] source version update and formatting cleanup --- dbt_project.yml | 2 +- .../int_quickbooks__credit_memo_double_entry.sql | 1 - .../int_quickbooks__invoice_double_entry.sql | 2 +- .../transaction_lines/int_quickbooks__invoice_transactions.sql | 2 +- packages.yml | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dbt_project.yml b/dbt_project.yml index a0781eb0..1f0ce083 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -1,7 +1,7 @@ config-version: 2 name: 'quickbooks' -version: '0.1.0' +version: '0.1.1' require-dbt-version: [">=0.18.0", "<0.20.0"] diff --git a/models/double_entry_transactions/int_quickbooks__credit_memo_double_entry.sql b/models/double_entry_transactions/int_quickbooks__credit_memo_double_entry.sql index 6c73f533..1822e461 100644 --- a/models/double_entry_transactions/int_quickbooks__credit_memo_double_entry.sql +++ b/models/double_entry_transactions/int_quickbooks__credit_memo_double_entry.sql @@ -67,7 +67,6 @@ final as ( transaction_id, transaction_date, amount * -1 as amount, - --amount as amount, df_accounts.account_id, 'debit' as transaction_type, 'credit_memo' as transaction_source diff --git a/models/double_entry_transactions/int_quickbooks__invoice_double_entry.sql b/models/double_entry_transactions/int_quickbooks__invoice_double_entry.sql index 22dac138..57d9e3d0 100644 --- a/models/double_entry_transactions/int_quickbooks__invoice_double_entry.sql +++ b/models/double_entry_transactions/int_quickbooks__invoice_double_entry.sql @@ -112,7 +112,7 @@ invoice_join as ( where coalesce(invoice_lines.account_id, invoice_lines.sales_item_account_id, invoice_lines.sales_item_item_id, invoice_lines.item_id, bundle_income_accounts.account_id) is not null {% else %} - where coalesce(invoice_lines.account_id, invoice_lines.sales_item_account_id, invoice_lines.sales_item_item_id, invoice_lines.item_id) is not null + where coalesce(invoice_lines.account_id, invoice_lines.sales_item_account_id, invoice_lines.sales_item_item_id, invoice_lines.item_id) is not null {% endif %} ), diff --git a/models/transaction_lines/int_quickbooks__invoice_transactions.sql b/models/transaction_lines/int_quickbooks__invoice_transactions.sql index b73f2210..ee38c783 100644 --- a/models/transaction_lines/int_quickbooks__invoice_transactions.sql +++ b/models/transaction_lines/int_quickbooks__invoice_transactions.sql @@ -27,7 +27,7 @@ final as ( coalesce(invoice_lines.quantity, invoice_lines.sales_item_quantity) as item_quantity, invoice_lines.sales_item_unit_price as item_unit_price, case when invoice_lines.item_id is null - then coalesce(items.income_account_id, items.asset_account_id, items.expense_account_id) + then coalesce(items.income_account_id, items.expense_account_id, items.asset_account_id) else invoice_lines.account_id end as account_id, coalesce(invoice_lines.discount_class_id, invoice_lines.sales_item_class_id) as class_id, diff --git a/packages.yml b/packages.yml index 82c075ab..840c0ed2 100644 --- a/packages.yml +++ b/packages.yml @@ -1,3 +1,3 @@ packages: - package: fivetran/quickbooks_source - version: 0.1.0 \ No newline at end of file + version: 0.1.1 \ No newline at end of file