diff --git a/bui/etc/cap/OBUICAP1/2040801_CTL.XML b/bui/etc/cap/OBUICAP1/2040801_CTL.XML
index 52ab0af..88af059 100644
--- a/bui/etc/cap/OBUICAP1/2040801_CTL.XML
+++ b/bui/etc/cap/OBUICAP1/2040801_CTL.XML
@@ -73,6 +73,30 @@
MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|CORG_DSK_NO|CORG_DSK_NO|BEG_DT|BEG_DT|END_DT|END_DT|
+
+
+ SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC FROM CAPTXNJNL J
+ left join CAPCUSINF M on J.MERC_ID=M.CUSTOMER_ID
+ left join CAPDSKINF B on J.DSK_NAM=B.DSK_NAM
+ where
+ ('%s' IS NULL OR J.MERC_ID LIKE '%s%')
+ AND ('%s' IS NULL OR J.MERC_ORD_NO LIKE '%s%')
+ AND ('%s' IS NULL OR J.DSK_NAM LIKE '%s%')
+ AND ('%s' IS NULL OR J.JRN_NO LIKE '%s%')
+ AND ( J.TXN_STS = 'R')
+ AND ('%s' IS NULL OR J.CRD_NO LIKE '%s%')
+ AND ('%s' IS NULL OR J.CORG_NO LIKE '%s%')
+ AND ('%s' IS NULL OR J.TXN_MOD = '%s')
+ AND ('%s' IS NULL OR J.ORD_TYP = '%s')
+ AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
+ AND ('%s' IS NULL OR J.TXN_CNL = '%s')
+ AND ('%s' IS NULL OR J.CORG_DSK_NO = '%s')
+ AND (J.ORD_DT >='%s' OR '%s' IS NULL)
+ AND (J.ORD_DT <='%s' OR '%s' IS NULL) order by J.TXN_TM desc
+
+ MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|CORG_DSK_NO|CORG_DSK_NO|BEG_DT|BEG_DT|END_DT|END_DT|
+
+
SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC FROM CAPTXNJNL J
@@ -98,7 +122,7 @@
-
+
SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC FROM CAPTXNJNL J
left join CAPCUSINF M on J.MERC_ID=M.CUSTOMER_ID
@@ -108,7 +132,7 @@
AND ('%s' IS NULL OR J.MERC_ORD_NO LIKE '%s%')
AND ('%s' IS NULL OR J.DSK_NAM LIKE '%s%')
AND ('%s' IS NULL OR J.JRN_NO LIKE '%s%')
- AND ( J.TXN_STS = 'P' OR J.TXN_STS = 'T')
+ AND ( J.TXN_STS = 'P')
AND ('%s' IS NULL OR J.CRD_NO LIKE '%s%')
AND ('%s' IS NULL OR J.CORG_NO LIKE '%s%')
AND ('%s' IS NULL OR J.TXN_MOD = '%s')
@@ -132,8 +156,11 @@
QRY_SQL=QRY_CAPTXNJNL_F
-
- QRY_SQL=QRY_CAPTXNJNL_PT
+
+ QRY_SQL=QRY_CAPTXNJNL_R
+
+
+ QRY_SQL=QRY_CAPTXNJNL_P
QRY_SQL=QRY_CAPTXNJNL_A
diff --git a/bui/etc/cap/OBUICAP1/2040883_CTL.XML b/bui/etc/cap/OBUICAP1/2040883_CTL.XML
new file mode 100644
index 0000000..e316e31
--- /dev/null
+++ b/bui/etc/cap/OBUICAP1/2040883_CTL.XML
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+ SELECT 'Y' YN from CMMTUFIT WHERE FIT_CTT=?
+
+ FIT_CTT|
+
+
+
+
+ FIT_TRK=2
+ FIT_OFS=2
+ CRD_OFS=2
+ CRD_TRK=2
+ EXP_DT_FLG=22
+ INT_MOD=1
+ TM_SMP=GETDATETIME()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/bui/etc/cap/OBUICAP1/2040884_CTL.XML b/bui/etc/cap/OBUICAP1/2040884_CTL.XML
new file mode 100644
index 0000000..3675f44
--- /dev/null
+++ b/bui/etc/cap/OBUICAP1/2040884_CTL.XML
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+ FIT_CTT=?
+
+ O_FIT_CTT|
+
+
+
+
+ SELECT 'Y' YN from CMMTUFIT WHERE FIT_CTT=?
+
+ O_FIT_CTT|
+
+
+
+
+ SELECT 'Y' YN from CMMTUFIT WHERE FIT_CTT=?
+
+ FIT_CTT|
+
+
+
+ FIT_TRK=2
+ FIT_OFS=2
+ CRD_OFS=2
+ CRD_TRK=2
+ EXP_DT_FLG=22
+ INT_MOD=1
+ TM_SMP=GETDATETIME()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/bui/etc/cap/OBUICAP1_CTL.XML b/bui/etc/cap/OBUICAP1_CTL.XML
index 916e1b7..99d58f8 100644
--- a/bui/etc/cap/OBUICAP1_CTL.XML
+++ b/bui/etc/cap/OBUICAP1_CTL.XML
@@ -143,5 +143,7 @@
+
+
diff --git a/cap/etc/OCAPRPT2/RPT_D_010_d.raq b/cap/etc/OCAPRPT2/RPT_D_010_d.raq
index c488a3c..1352255 100644
Binary files a/cap/etc/OCAPRPT2/RPT_D_010_d.raq and b/cap/etc/OCAPRPT2/RPT_D_010_d.raq differ
diff --git a/cap/etc/OCAPRPT2/RPT_D_010_m.raq b/cap/etc/OCAPRPT2/RPT_D_010_m.raq
index dd142d6..38f3fe5 100644
Binary files a/cap/etc/OCAPRPT2/RPT_D_010_m.raq and b/cap/etc/OCAPRPT2/RPT_D_010_m.raq differ
diff --git a/cap/etc/OCAPRPT2_CTL.XML b/cap/etc/OCAPRPT2_CTL.XML
index d95a8e9..16d3f42 100644
--- a/cap/etc/OCAPRPT2_CTL.XML
+++ b/cap/etc/OCAPRPT2_CTL.XML
@@ -35,7 +35,6 @@
-