Merge branch 'feature/FEE_REMIT' into develop

src/main/webapp/WEB-INF/classes/cont/CON3100N/business_write_detail_report.lwm

@@ -37,7 +37,7 @@
        t.write_off_amount received_amount
   FROM business_write_detail t
   #WHERE_CLAUSE#
-  order by extra_name,contract_number,times,transaction_date,write_off_date
+  order by extra_name, bp_code_tenant, contract_id,times,transaction_date,write_off_date
             ]]></bm:query-sql>
         </bm:operation>
         <bm:operation name="execute">

src/main/webapp/WEB-INF/classes/hls/HLS801/con_unearned_finance_income.lwm

@@ -59,7 +59,7 @@
         <bm:query-field  field="finance_income_recognized" queryExpression="t1.finance_income_recognized=${@finance_income_recognized}"/>
     </bm:query-fields>
     <bm:data-filters>
-        <bm:data-filter enforceOperations="query" expression="t1.internal_period_num = ${@internal_period_num} and exists (select 1 from con_contract t where t.contract_id=t1.contract_id and t.contract_status = &apos;INCEPT&apos; and t.data_class = &apos;NORMAL&apos;) and exists (select 1 from con_contract_cashflow c where c.cashflow_id = t1.cashflow_id and c.interest is not null)"/>
+        <bm:data-filter enforceOperations="query" expression="t1.internal_period_num = ${@internal_period_num} and exists (Select 1 From con_contract c Where t1.contract_id = c.contract_id And c.data_class = &apos;NORMAL&apos; And (c.contract_status = &apos;INCEPT&apos; Or c.contract_status = &apos;TERMINATE&apos; Or (c.contract_status = &apos;PENDING&apos; And Exists (Select 1 From con_contract_et_hd e Where e.contract_id = c.contract_id And e.document_type = &apos;ET&apos; And e.available_flag = &apos;Y&apos; And e.status = &apos;NEW&apos;)) Or c.contract_status = &apos;ETING&apos; Or (c.contract_status = &apos;PENDING&apos; And Exists (Select 1 From con_contract_change_req cc Where cc.contract_id = c.contract_id And cc.document_type = &apos;PAYCARD&apos;  And cc.req_status In (&apos;NEW&apos;))))) and exists (select 1 from con_contract_cashflow c where c.cashflow_id = t1.cashflow_id and c.interest is not null)"/>
         <bm:data-filter enforceOperations="query" expression="to_char(t1.calc_end_date,&apos;yyyy-mm-dd&apos;) = ${@calc_end_date} "/>
         <bm:data-filter enforceOperations="query" expression="t1.cashflow_id in (select cw.cashflow_id from con_contract_cashflow cw where cw.cf_direction not in ('NONCASH'))"/>
 <!--        <bm:data-filter enforceOperations="query" expression="t1.contract_id in (select contract_id from con_contract t where nvl(t.fraud_flag,'N') !='Y')"/>-->

src/main/webapp/WEB-INF/classes/hls/HLS801/csh_current_period_query.lwm

@@ -37,7 +37,7 @@
 				  And t.returned_flag not in ('RETURN', 'FULL')
 				  And nvl(t.reversed_flag, 'N') = 'N') t1
 		  Where to_char(t1.transaction_date, 'yyyymm') <= to_char(sysdate, 'yyyymm')
-		  And   to_char(t1.transaction_date, 'yyyymm') > '201906'
+		  And   to_char(t1.transaction_date, 'yyyymm') > '202001'
 		 Group By to_char(t1.transaction_date, 'yyyy-mm'), t1.ref_v04
 		 Order By to_char(t1.transaction_date, 'yyyy-mm') desc
             ]]></bm:query-sql>

src/main/webapp/WEB-INF/classes/rpt/RPT5090/atm_update.lwm

@@ -60,7 +60,6 @@
                (CASE
                  WHEN to_char(SYSDATE, 'dd') <= 20 AND
                       to_char(t.calendar_date, 'yyyymmdd') =
-                 --     to_char(SYSDATE, 'yyyymm') || decode(to_char(t.calendar_date, 'd'), 1, 18, 7, 19, 20)
                  to_char(Sysdate, 'yyyymm') ||
                       decode(to_char(to_date(to_char(Sysdate, 'yyyymm') || 20,
                                              'yyyymmdd'),
@@ -89,8 +88,6 @@
                       AND nvl(c.payment_deduction, 'NO_DEDUCTION') <>
                           'NO_DEDUCTION'),0)
                  WHEN to_char(SYSDATE, 'dd') > 20 AND
-                     -- to_char(add_months(t.calendar_date, -1), 'yyyymmdd') =
-                     -- to_char(SYSDATE, 'yyyymm') || 20
                      to_char(t.calendar_date, 'yyyymmdd') =
                       decode(to_char(to_date((to_char(add_months(Sysdate, 1),
                                                       'yyyymm') || 20),

src/main/webapp/modules/hls/HLS801/hls_monthly_statement.lview

@@ -106,8 +106,6 @@
             $('unearned_finance_income_ds').setQueryParameter('calc_end_date', record.get('calc_end_date'));
             $('unearned_finance_income_ds').query();
             nextStep();
-            alert(record.get('calc_end_date'));
-
             /* year = period_name.substring(0, 4);
              month = period_name.substring(5, 7);
              var query_ds = $('unearned_finance_income_query_ds');