diff --git a/models/intermediate/xero/int_xero__contacts.sql b/models/intermediate/xero/int_xero__contacts.sql index e43e5f9..74b5370 100644 --- a/models/intermediate/xero/int_xero__contacts.sql +++ b/models/intermediate/xero/int_xero__contacts.sql @@ -2,9 +2,8 @@ with stg_xero__contacts as (select * from {{ ref("stg_xero__contacts") }}) select id_contact, account_number, - case - when account_number ~ '^[0-9]{10,11}$' then account_number else null - end as id_deal, + case when account_number ~ '^[0-9]{10,11}$' then account_number else null end::text + as id_deal, contact_name, is_customer, is_supplier, diff --git a/models/reporting/xero/xero__denom_invoicing_mart.sql b/models/reporting/xero/xero__denom_invoicing_mart.sql index 38dfe95..a42ae22 100644 --- a/models/reporting/xero/xero__denom_invoicing_mart.sql +++ b/models/reporting/xero/xero__denom_invoicing_mart.sql @@ -11,6 +11,8 @@ select li.unit_amount, li.line_amount_local_curr, li.line_amount_in_gbp, + li.line_amount_wo_taxes_local_curr, + li.line_amount_wo_taxes_in_gbp, li.tax_amount_local_curr, li.tax_amount_in_gbp, li.tax_type, diff --git a/models/reporting/xero/xero__invoice_line_items.sql b/models/reporting/xero/xero__invoice_line_items.sql index 710acdd..d6f713f 100644 --- a/models/reporting/xero/xero__invoice_line_items.sql +++ b/models/reporting/xero/xero__invoice_line_items.sql @@ -12,6 +12,8 @@ select unit_amount as unit_amount, line_amount_local_curr as line_amount_local_curr, line_amount_in_gbp as line_amount_in_gbp, + line_amount_wo_taxes_local_curr, + line_amount_wo_taxes_in_gbp, tax_amount_local_curr as tax_amount_local_curr, tax_amount_in_gbp as tax_amount_in_gbp, tax_type as tax_type,