Issue #22495:emphasize credit memos

diff --git a/foundation-database/public/tables/metasql/apOpenItems-detail.mql b/foundation-database/public/tables/metasql/apOpenItems-detail.mql
index 77c43bc..bc95bce 100644 (file)
--- a/foundation-database/public/tables/metasql/apOpenItems-detail.mql
+++ b/foundation-database/public/tables/metasql/apOpenItems-detail.mql
@@ -1,6 +1,6 @@
 -- Group: apOpenItems
 -- Name:  detail
--- Notes: 
+-- Notes:
 -- Copyright (c) 1999-2014 by OpenMFG LLC, d/b/a xTuple.
 -- See www.xtuple.com/CPAL for the full text of the software license.
 
@@ -10,41 +10,42 @@ SELECT apopen_id, apopen_ponumber, apopen_docnumber,
                          WHEN (apopen_doctype='V') THEN <? value("voucher") ?>
                          ELSE <? value("other") ?>
                     END AS f_doctype,
+                    CASE WHEN (apopen_doctype='C') THEN 'emphasis' END AS f_doctype_qtforegroundrole,
                     vend_number, vend_name,
                     apopen_invcnumber AS invoicenumber,
-                    apopen_docdate, apopen_duedate, apopen_amount, apopen_status, 
+                    apopen_docdate, apopen_duedate, apopen_amount, apopen_status,
 <? if exists("isReport") ?>
-                    formatDate(apopen_docdate) AS f_docdate, 
-                    formatDate(apopen_duedate) AS f_duedate, 
+                    formatDate(apopen_docdate) AS f_docdate,
+                    formatDate(apopen_duedate) AS f_duedate,
                     formatMoney(apopen_amount) AS f_amount,
                     formatMoney(apopen_paid - COALESCE(SUM(apapply_target_paid),0)) AS f_paid,
-                    formatMoney((apopen_amount - apopen_paid + COALESCE(SUM(apapply_target_paid),0)) * 
-                    CASE WHEN apopen_doctype IN ('D', 'V') THEN 1 ELSE -1 
+                    formatMoney((apopen_amount - apopen_paid + COALESCE(SUM(apapply_target_paid),0)) *
+                    CASE WHEN apopen_doctype IN ('D', 'V') THEN 1 ELSE -1
                     END) AS f_balance,
-                    formatMoney((apopen_amount - apopen_paid + COALESCE(SUM(apapply_target_paid),0)) 
-                    / apopen_curr_rate * (CASE WHEN apopen_doctype IN ('D', 'V') THEN 1 ELSE -1 
+                    formatMoney((apopen_amount - apopen_paid + COALESCE(SUM(apapply_target_paid),0))
+                    / apopen_curr_rate * (CASE WHEN apopen_doctype IN ('D', 'V') THEN 1 ELSE -1
                          END)) AS f_base_balance,
 <? endif ?>
                     apopen_paid - COALESCE(SUM(apapply_target_paid),0) AS paid,
-                    (apopen_amount - apopen_paid + COALESCE(SUM(apapply_target_paid),0)) * 
-                    CASE WHEN apopen_doctype IN ('D', 'V') THEN 1 ELSE -1 
+                    (apopen_amount - apopen_paid + COALESCE(SUM(apapply_target_paid),0)) *
+                    CASE WHEN apopen_doctype IN ('D', 'V') THEN 1 ELSE -1
                     END AS balance,
                     currConcat(apopen_curr_id) AS currAbbr,
-                    (apopen_amount - apopen_paid + COALESCE(SUM(apapply_target_paid),0)) 
-                    / apopen_curr_rate * (CASE WHEN apopen_doctype IN ('D', 'V') THEN 1 ELSE -1 
+                    (apopen_amount - apopen_paid + COALESCE(SUM(apapply_target_paid),0))
+                    / apopen_curr_rate * (CASE WHEN apopen_doctype IN ('D', 'V') THEN 1 ELSE -1
                          END) AS base_balance,
                     'curr' AS apopen_amount_xtnumericrole,
                     'curr' AS paid_xtnumericrole,
                     'curr' AS balance_xtnumericrole,
                     'curr' AS base_balance_xtnumericrole,
-                    0 AS base_balance_xttotalrole 
-             FROM apopen 
+                    0 AS base_balance_xttotalrole
+             FROM apopen
                JOIN vendinfo ON (vend_id=apopen_vend_id)
                JOIN vendtype ON (vendtype_id=vend_vendtype_id)
-               LEFT OUTER JOIN apapply ON (((apopen_id=apapply_target_apopen_id) 
-                                       OR (apopen_id=apapply_source_apopen_id)) 
-                                       AND (apapply_postdate > <? value("asofDate") ?>)) 
-              WHERE ( (COALESCE(apopen_closedate,date <? value("asofDate") ?> + integer '1')><? value("asofDate") ?>) 
+               LEFT OUTER JOIN apapply ON (((apopen_id=apapply_target_apopen_id)
+                                       OR (apopen_id=apapply_source_apopen_id))
+                                       AND (apapply_postdate > <? value("asofDate") ?>))
+              WHERE ( (COALESCE(apopen_closedate,date <? value("asofDate") ?> + integer '1')><? value("asofDate") ?>)
                 AND   (CASE WHEN (<? value("useDocDate") ?>) THEN apopen_docdate ELSE apopen_distdate END<=<? value("asofDate") ?>)
 <? if exists("vend_id") ?>
                 AND   (apopen_vend_id=<? value("vend_id") ?>)
@@ -55,8 +56,8 @@ SELECT apopen_id, apopen_ponumber, apopen_docnumber,
 <? if exists("vendtype_pattern") ?>
                 AND   (vendtype_code~<? value("vendtype_pattern") ?>)
 <? endif ?>
-                AND   (apopen_duedate BETWEEN <? value("startDate") ?> AND <? value("endDate") ?>) ) 
-              GROUP BY apopen_id, apopen_ponumber, apopen_docnumber,apopen_doctype, apopen_invcnumber, apopen_docdate, 
+                AND   (apopen_duedate BETWEEN <? value("startDate") ?> AND <? value("endDate") ?>) )
+              GROUP BY apopen_id, apopen_ponumber, apopen_docnumber,apopen_doctype, apopen_invcnumber, apopen_docdate,
                 apopen_duedate, apopen_docdate, apopen_amount, apopen_paid, apopen_curr_id, apopen_curr_rate,
                 apopen.apopen_status, vend_number, vend_name
-              ORDER BY apopen_docdate;
+              ORDER BY apopen_docdate;
\ No newline at end of file

diff --git a/foundation-database/public/tables/metasql/apOpenItems-selectedpayments.mql b/foundation-database/public/tables/metasql/apOpenItems-selectedpayments.mql
index f31552f..01e632f 100644 (file)
--- a/foundation-database/public/tables/metasql/apOpenItems-selectedpayments.mql
+++ b/foundation-database/public/tables/metasql/apOpenItems-selectedpayments.mql
@@ -1,6 +1,6 @@
 -- Group: apOpenItems
 -- Name:  selectedpayments
--- Notes: 
+-- Notes:
 -- Copyright (c) 1999-2014 by OpenMFG LLC, d/b/a xTuple.
 -- See www.xtuple.com/CPAL for the full text of the software license.
 
@@ -9,6 +9,7 @@ SELECT *,
             WHEN (apopen_doctype='D') THEN <? value("debitmemo") ?>
             WHEN (apopen_doctype='C') THEN <? value("creditmemo") ?>
        END AS doctype,
+       CASE WHEN (apopen_doctype='C') THEN 'emphasis' END AS doctype_qtforegroundrole,
        'curr' AS apselect_amount_xtnumericrole,
        'curr' AS apselect_amount_base_xtnumericrole,
        'curr' AS apselect_running_base_xtnumericrole,
@@ -27,7 +28,7 @@ SELECT apopen_id, apselect_id,
 FROM apopen, apselect, vendinfo, bankaccnt
 WHERE ( (apopen_vend_id=vend_id)
   AND   (apselect_apopen_id=apopen_id)
-  AND   (apselect_bankaccnt_id=bankaccnt_id) 
+  AND   (apselect_bankaccnt_id=bankaccnt_id)
   AND   (apopen_doctype IN ('V', 'D'))
 <? if exists("bankaccntid") ?>
   AND   (bankaccnt_id=<? value("bankaccntid") ?>)
@@ -55,7 +56,7 @@ SELECT apopen_id, apselect_id,
 FROM apopen, apselect, vendinfo, bankaccnt
 WHERE ( (apopen_vend_id=vend_id)
   AND   (apselect_apopen_id=apopen_id)
-  AND   (apselect_bankaccnt_id=bankaccnt_id) 
+  AND   (apselect_bankaccnt_id=bankaccnt_id)
   AND   (apopen_doctype='C')
 <? if exists("bankaccntid") ?>
   AND   (bankaccnt_id=<? value("bankaccntid") ?>)
@@ -71,4 +72,4 @@ WHERE ( (apopen_vend_id=vend_id)
 <? endif ?>
  )
 ORDER BY f_bank, f_vendor, apopen_docnumber
-) AS data;
+) AS data;
\ No newline at end of file

diff --git a/foundation-database/public/tables/metasql/apOpenItems-selectpayments.mql b/foundation-database/public/tables/metasql/apOpenItems-selectpayments.mql
index 11d091c..de92dbb 100644 (file)
--- a/foundation-database/public/tables/metasql/apOpenItems-selectpayments.mql
+++ b/foundation-database/public/tables/metasql/apOpenItems-selectpayments.mql
@@ -1,6 +1,6 @@
 -- Group: apOpenItems
 -- Name:  selectpayments
--- Notes: 
+-- Notes:
 -- Copyright (c) 1999-2014 by OpenMFG LLC, d/b/a xTuple.
 -- See www.xtuple.com/CPAL for the full text of the software license.
 
@@ -9,10 +9,11 @@ SELECT *,
             WHEN (apopen_doctype='D') THEN <? value("debitMemo") ?>
             WHEN (apopen_doctype='C') THEN <? value("creditMemo") ?>
        END AS doctype,
+       CASE WHEN (apopen_doctype='C') THEN 'emphasis' END AS doctype_qtforegroundrole,
        CASE WHEN (apopen_duedate < CURRENT_DATE) THEN 'error'
             WHEN(apopen_duedate > CURRENT_DATE) THEN 'emphasis'
             WHEN(CURRENT_DATE <= determineDiscountDate(apopen_terms_id, apopen_docdate)) THEN 'altemphasis'
-       END AS apopen_duedate_qtforegroundrole, 
+       END AS apopen_duedate_qtforegroundrole,
        CASE WHEN (apopen_status = 'H') THEN 'error' END AS qtforegroundrole,
        'curr' AS amount_xtnumericrole,
        'curr' AS selected_xtnumericrole,
@@ -104,4 +105,4 @@ WHERE ( (apopen_open)
 <? endif ?>
 )
 ORDER BY apopen_duedate, amount DESC) AS data
-WHERE (amount != 0);
+WHERE (amount != 0);
\ No newline at end of file