Corrections to reports

Author: reshmabidikar

src/main/resources/extracts/finance/test_accounts.sql

@@ -1,14 +1,14 @@
 # Invoice Aging Report
 
-Displays customer invoice balances by aging buckets in both original currency and USD, along with invoice and account details.
+This report lists all customer invoice aging with remaining balances, breaking them into standard aging buckets and converting amounts to USD for easy comparison.
 
 The snapshot view is: `v_report_invoice_aging`
 
 ## Prerequisites
 
-Run stored proc
+This report requires the `analytics_currency_conversion` table to be populated. See [insertMonthlyCurrencyConversionRates.ddl](../utils/insertMonthlyCurrencyConversionRates.ddl)
 
-## Report Configuration
+## Report Creation
 
 ```
 curl -v \

src/main/resources/reports/invoice_aging/README.md

@@ -48,14 +48,14 @@ SELECT
     a.invoice_original_amount_charged AS "Total Balance Due",
 
     -- Balance due in USD
-    CASE WHEN a.invoice_creation_date > b.d_0_30 THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE 0 END AS "Balance due 0-30 Days USD",
-    CASE WHEN a.invoice_creation_date BETWEEN b.d_30_60 AND b.d_0_30 THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE 0 END AS "Balance due 30-60 Days USD",
-    CASE WHEN a.invoice_creation_date BETWEEN b.d_60_90 AND b.d_30_60 THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE 0 END AS "Balance due 60-90 Days USD",
-    CASE WHEN a.invoice_creation_date BETWEEN b.d_90_120 AND b.d_60_90 THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE 0 END AS "Balance due 90-120 Days USD",
-    CASE WHEN a.invoice_creation_date BETWEEN b.d_120_150 AND b.d_90_120 THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE 0 END AS "Balance due 120-150 Days USD",
-    CASE WHEN a.invoice_creation_date < b.d_120_150 THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE 0 END AS "Balance due 150+ Days USD",
+    CASE WHEN a.invoice_creation_date > b.d_0_30 THEN CASE WHEN a.currency != 'USD' THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE a.invoice_original_amount_charged END ELSE 0 END AS "Balance due 0-30 Days USD",
+    CASE WHEN a.invoice_creation_date BETWEEN b.d_30_60 AND b.d_0_30 THEN CASE WHEN a.currency != 'USD' THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE a.invoice_original_amount_charged END ELSE 0 END AS "Balance due 30-60 Days USD",
+    CASE WHEN a.invoice_creation_date BETWEEN b.d_60_90 AND b.d_30_60 THEN CASE WHEN a.currency != 'USD' THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE a.invoice_original_amount_charged END ELSE 0 END AS "Balance due 60-90 Days USD",
+    CASE WHEN a.invoice_creation_date BETWEEN b.d_90_120 AND b.d_60_90 THEN CASE WHEN a.currency != 'USD' THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE a.invoice_original_amount_charged END ELSE 0 END AS "Balance due 90-120 Days USD",
+    CASE WHEN a.invoice_creation_date BETWEEN b.d_120_150 AND b.d_90_120 THEN CASE WHEN a.currency != 'USD' THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE a.invoice_original_amount_charged END ELSE 0 END AS "Balance due 120-150 Days USD",
+    CASE WHEN a.invoice_creation_date < b.d_120_150 THEN CASE WHEN a.currency != 'USD' THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE a.invoice_original_amount_charged END ELSE 0 END AS "Balance due 150+ Days USD",
 
-    cc.reference_rate * a.invoice_original_amount_charged AS "Total Balance Due USD",
+    CASE WHEN a.currency != 'USD' THEN cc.reference_rate * a.invoice_original_amount_charged ELSE a.invoice_original_amount_charged END AS "Total Balance Due USD" ,
 
     a.invoice_number AS "Invoice Number",
     a.bundle_external_key AS "Bundle External Key",
@@ -65,11 +65,11 @@ SELECT
     a.invoice_date AS "Invoice Date",
     a.invoice_original_amount_charged AS "Invoice Amount",
     a.invoice_balance AS "Invoice Balance",
-    ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) AS "Invoice Amount USD",
-    ROUND(cc.reference_rate * a.invoice_balance, 4) AS "Invoice Balance USD",
+    case when a.currency != 'USD' then ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) else a.invoice_original_amount_charged end AS "Invoice Amount USD",
+    case when a.currency != 'USD' then ROUND(cc.reference_rate * a.invoice_balance, 4) else a.invoice_balance end AS "Invoice Balance USD",
     a.tenant_record_id
 FROM invoice_data a
-JOIN analytics_currency_conversion cc
+LEFT OUTER JOIN analytics_currency_conversion cc
     ON a.created_date >= cc.start_date
    AND a.created_date <= cc.end_date
    AND cc.currency = a.currency

src/main/resources/reports/invoice_aging/v_report_invoice_aging.ddl

@@ -0,0 +1,31 @@
+# Invoice Aging No Payments Report
+
+This report lists all customer invoices with no payments recorded, categorizing outstanding amounts into standard aging buckets and converting balances into USD for comparison.
+
+The snapshot view is: `v_report_invoice_aging_no_payment`
+
+## Prerequisites
+
+This report requires the `analytics_currency_conversion` table to be populated. See [insertMonthlyCurrencyConversionRates.ddl](../utils/insertMonthlyCurrencyConversionRates.ddl)
+
+## Report Creation
+
+```
+curl -v \
+     -X POST \
+     -u admin:password \
+     -H "X-Killbill-ApiKey:bob" \
+     -H "X-Killbill-ApiSecret:lazar" \
+     -H 'Content-Type: application/json' \
+     -d '{"reportName": "report_invoice_aging_no_payment",
+          "reportType": "TABLE",
+          "reportPrettyName": "Invoice Aging No Payments Report",
+          "sourceTableName": "report_invoice_aging_no_payment",
+          "refreshProcedureName": "refresh_report_invoice_aging_no_payment",
+          "refreshFrequency": "DAILY"}' \
+     "http://127.0.0.1:8080/plugins/killbill-analytics/reports"
+```
+
+## Report UI:
+
+![invoice-aging-no-payment.png](invoice-aging-no-payment.png)

src/main/resources/reports/invoice_aging_no_payment/README.md

@@ -0,0 +1,19 @@
+create table report_invoice_aging_no_payment as select * from v_report_invoice_aging_no_payment limit 0;
+
+drop procedure if exists refresh_report_invoice_aging_no_payment;
+DELIMITER //
+CREATE PROCEDURE refresh_report_invoice_aging_no_payment()
+BEGIN
+
+DECLARE EXIT HANDLER FOR SQLEXCEPTION ROLLBACK;
+DECLARE EXIT HANDLER FOR SQLWARNING ROLLBACK;
+
+SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+START TRANSACTION;
+  delete from report_invoice_aging_no_payment;
+  insert into report_invoice_aging_no_payment select * from v_report_invoice_aging_no_payment;
+COMMIT;
+
+END;
+//
+DELIMITER ;

src/main/resources/reports/invoice_aging_no_payment/invoice-aging-no-payment.png

@@ -1,3 +1,4 @@
+CREATE OR REPLACE VIEW v_report_invoice_aging_no_payment AS
 WITH date_buckets AS (
     SELECT
         CURRENT_DATE AS today,
@@ -49,14 +50,14 @@ SELECT
     a.invoice_original_amount_charged AS "Total Balance Due",
 
     -- Balance due in USD
-    CASE WHEN a.invoice_creation_date > b.d_0_30 THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE 0 END AS "Balance due 0-30 Days USD",
-    CASE WHEN a.invoice_creation_date BETWEEN b.d_30_60 AND b.d_0_30 THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE 0 END AS "Balance due 30-60 Days USD",
-    CASE WHEN a.invoice_creation_date BETWEEN b.d_60_90 AND b.d_30_60 THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE 0 END AS "Balance due 60-90 Days USD",
-    CASE WHEN a.invoice_creation_date BETWEEN b.d_90_120 AND b.d_60_90 THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE 0 END AS "Balance due 90-120 Days USD",
-    CASE WHEN a.invoice_creation_date BETWEEN b.d_120_150 AND b.d_90_120 THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE 0 END AS "Balance due 120-150 Days USD",
-    CASE WHEN a.invoice_creation_date < b.d_120_150 THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE 0 END AS "Balance due 150+ Days USD",
+    CASE WHEN a.invoice_creation_date > b.d_0_30 THEN CASE WHEN a.currency != 'USD' THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE a.invoice_original_amount_charged END ELSE 0 END AS "Balance due 0-30 Days USD",
+    CASE WHEN a.invoice_creation_date BETWEEN b.d_30_60 AND b.d_0_30 THEN CASE WHEN a.currency != 'USD' THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE a.invoice_original_amount_charged END ELSE 0 END AS "Balance due 30-60 Days USD",
+    CASE WHEN a.invoice_creation_date BETWEEN b.d_60_90 AND b.d_30_60 THEN CASE WHEN a.currency != 'USD' THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE a.invoice_original_amount_charged END ELSE 0 END AS "Balance due 60-90 Days USD",
+    CASE WHEN a.invoice_creation_date BETWEEN b.d_90_120 AND b.d_60_90 THEN CASE WHEN a.currency != 'USD' THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE a.invoice_original_amount_charged END ELSE 0 END AS "Balance due 90-120 Days USD",
+    CASE WHEN a.invoice_creation_date BETWEEN b.d_120_150 AND b.d_90_120 THEN CASE WHEN a.currency != 'USD' THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE a.invoice_original_amount_charged END ELSE 0 END AS "Balance due 120-150 Days USD",
+    CASE WHEN a.invoice_creation_date < b.d_120_150 THEN CASE WHEN a.currency != 'USD' THEN ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) ELSE a.invoice_original_amount_charged END ELSE 0 END AS "Balance due 150+ Days USD",
 
-    cc.reference_rate * a.invoice_original_amount_charged AS "Total Balance Due USD",
+    CASE WHEN a.currency != 'USD' THEN cc.reference_rate * a.invoice_original_amount_charged ELSE a.invoice_original_amount_charged END AS "Total Balance Due USD" ,
 
     a.invoice_number AS "Invoice Number",
     a.bundle_external_key AS "Bundle External Key",
@@ -66,11 +67,11 @@ SELECT
     a.invoice_date AS "Invoice Date",
     a.invoice_original_amount_charged AS "Invoice Amount",
     a.invoice_balance AS "Invoice Balance",
-    ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) AS "Invoice Amount USD",
-    ROUND(cc.reference_rate * a.invoice_balance, 4) AS "Invoice Balance USD",
+    case when a.currency != 'USD' then ROUND(cc.reference_rate * a.invoice_original_amount_charged, 4) else a.invoice_original_amount_charged end AS "Invoice Amount USD",
+    case when a.currency != 'USD' then ROUND(cc.reference_rate * a.invoice_balance, 4) else a.invoice_balance end AS "Invoice Balance USD",
     a.tenant_record_id
 FROM invoice_data a
-JOIN analytics_currency_conversion cc
+LEFT OUTER JOIN analytics_currency_conversion cc
     ON a.created_date >= cc.start_date
    AND a.created_date <= cc.end_date
    AND cc.currency = a.currency

src/main/resources/reports/invoice_aging_no_payment/report_invoice_aging_no_payment.ddl

@@ -15,17 +15,17 @@ select
 , ic.invoice_original_amount_charged as "Invoice Amount"
 , ic.invoice_balance as "Invoice Balance"
 , ic.amount as "Invoice Credit Amount"
-, round(cc.reference_rate * ic.invoice_original_amount_charged,4) as "Invoice Amount USD"
-, round(cc.reference_rate * ic.invoice_balance,4) as "Invoice Balance USD"
-, round(cc.reference_rate * ic.amount,4) as "Invoice Credit Amount USD"
+, case when ic.currency != 'USD' THEN round(cc.reference_rate * ic.invoice_original_amount_charged,4) else invoice_original_amount_charged end as "Invoice Amount USD"
+, case when ic.currency != 'USD' THEN round(cc.reference_rate * ic.invoice_balance,4) else invoice_balance end as "Invoice Balance USD"
+, case when ic.currency != 'USD' THEN round(cc.reference_rate * ic.amount,4) else amount end as "Invoice Credit Amount USD"
 , ic.tenant_record_id
 from
   analytics_invoice_credits ic
-  join analytics_currency_conversion cc on ic.created_date >= cc.start_date and ic.created_date <= cc.end_date and cc.currency =ic.currency
+  left outer join analytics_currency_conversion cc on ic.created_date >= cc.start_date and ic.created_date <= cc.end_date and cc.currency =ic.currency
 where 1=1
   and ic.created_date >= cast(date_format(date_sub(sysdate(), interval '1' month), '%Y-%m-01') as date)
   and ic.created_date < cast(date_format(sysdate(), '%Y-%m-01') as date)
   and ic.report_group != 'test'
 order by
   invoice_number
-, ic.invoice_item_record_id; -- just for well defined ordering
+, ic.invoice_item_record_id; -- just for well defined ordering

src/main/resources/reports/invoice_aging_no_payment/v_report_invoice_aging_no_payment.ddl

@@ -2,15 +2,13 @@
 
 Report of all invoice item adjustments from the previous month, showing amounts in both original currency and USD equivalents.
 
-TODO: confirm above desc with ChatGPT
-
 The snapshot view is: `v_report_invoice_item_adjustments_monthly`
 
 ## Prerequisites
 
 This report requires the `analytics_currency_conversion` table to be populated. See [insertMonthlyCurrencyConversionRates.ddl](../utils/insertMonthlyCurrencyConversionRates.ddl)
 
-## Report Configuration
+## Report Creation
 
 ```
 curl -v \