metasql/registrar.invoices.sql
authorEdward <edward@roojs.com>
Tue, 10 Feb 2015 07:49:45 +0000 (15:49 +0800)
committerEdward <edward@roojs.com>
Tue, 10 Feb 2015 07:49:45 +0000 (15:49 +0800)
metasql/registrar.invoices.sql

index 1d9524d..daf4c9d 100644 (file)
@@ -60,24 +60,13 @@ FROM
                 CASE WHEN LENGTH(admin_cntct_addr.addr_state) > 0 THEN E'\n' || admin_cntct_addr.addr_state END,
                 CASE WHEN LENGTH(admin_cntct_addr.addr_country) > 0 THEN E'\n' || admin_cntct_addr.addr_country END
             ) AS contacts,
+            
             COALESCE(currtocurr(
                 aropen.aropen_curr_id,
                 custinfo.cust_curr_id,
-                aropen.aropen_amount,
-                aropen.aropen_distdate
-            ), 0) AS aropen_amount,
-            COALESCE(currtocurr(
-                aropen.aropen_curr_id,
-                custinfo.cust_curr_id,
-                aropen.aropen_paid,
+                (aropen.aropen_amount - aropen.aropen_paid),
                 aropen.aropen_distdate
-            ), 0) AS aropen_paid,
---             COALESCE(currtocurr(
---                 aropen.aropen_curr_id,
---                 custinfo.cust_curr_id,
---                 (aropen.aropen_amount - aropen.aropen_paid),
---                 aropen.aropen_distdate
---             ), 0) AS amount,
+            ), 0) AS amount,
             (SELECT invcitem_custpn FROM invcitem WHERE invcitem_invchead_id = invchead_id LIMIT 1) AS domain, 
             (
                 SELECT