Issue #24224:normalize margin calculations

[xtuple] / foundation-database / public / tables / metasql / invoices-detail.mql

diff --git a/foundation-database/public/tables/metasql/invoices-detail.mql b/foundation-database/public/tables/metasql/invoices-detail.mql
index 67ee698..20b3648 100644 (file)
--- a/foundation-database/public/tables/metasql/invoices-detail.mql
+++ b/foundation-database/public/tables/metasql/invoices-detail.mql
@@ -29,11 +29,16 @@ SELECT invchead_id, cust_id,
          invchead_invcnumber AS docnumber,
          findCustomerForm(cust_id, 'I') AS reportname,
        <? endif ?>
+       CASE WHEN (calcInvoiceAmt(invchead_id,'S') != 0.0)
+              THEN calcInvoiceAmt(invchead_id,'M')
+            ELSE 0.0
+       END AS margin,
        CASE WHEN (calcInvoiceAmt(invchead_id,'S') != 0.0)
               THEN (calcInvoiceAmt(invchead_id,'M') / calcInvoiceAmt(invchead_id,'S'))
             ELSE 1.0
        END AS marginpercent,
        'percent' AS marginpercent_xtnumericrole,
+       'curr' AS margin_xtnumericrole,
        'curr' AS extprice_xtnumericrole,
        'curr' AS balance_xtnumericrole,
        CASE WHEN (aropen_id IS NULL) THEN 'Unposted' END AS balance_qtdisplayrole