Merge remote-tracking branch 'origin/remote_uat' into remote_uat

# Conflicts:
#	src/main/webapp/modules/acp/ACP522/ap_invoice_import.lview

src/main/webapp/WEB-INF/classes/cont/CON560/con_contract_finish_for_query.lwm

@@ -37,7 +37,7 @@
         <!--<bm:field name="bp_vender" expression="(select bp_name from hls_bp_master where bp_id=t1.bp_id_vender and enabled_flag=&apos;Y&apos;)" forInsert="false" forUpdate="false"/>-->
         <bm:field name="lease_organization_desc" expression="(select description from hls_lease_organization where lease_organization = t1.lease_organization)" forInsert="false" forUpdate="false"/>
         <!--<bm:field name="owner_user_id_n" expression="(select description from sys_user where user_id = t1.created_by)" forInsert="false" forUpdate="false"/>-->
-        <bm:field name="is_terminate" expression="(CASE WHEN ((select sum(ccc.due_amount) from con_contract_cashflow ccc where ccc.contract_id = t1.contract_id AND ccc.cf_status&lt;&gt;&apos;BLOCK&apos; and ccc.cf_item not in('0','40','911')) - (select sum(ccc.received_amount) from con_contract_cashflow ccc where ccc.contract_id = t1.contract_id AND ccc.cf_status&lt;&gt;&apos;BLOCK&apos; and ccc.cf_item not in('0','40','911') )) = 0 THEN &apos;是&apos; ELSE &apos;否&apos; END)" forInsert="false" forUpdate="false"/>
+        <bm:field name="is_terminate" expression="(CASE WHEN ((select sum(ccc.due_amount) from con_contract_cashflow ccc where ccc.contract_id = t1.contract_id AND ccc.cf_status&lt;&gt;&apos;BLOCK&apos; and ccc.cf_item&lt;&gt;0 and ccc.cf_item&lt;&gt;40) - (select sum(ccc.received_amount) from con_contract_cashflow ccc where ccc.contract_id = t1.contract_id AND ccc.cf_status&lt;&gt;&apos;BLOCK&apos; and ccc.cf_item&lt;&gt;0 and ccc.cf_item&lt;&gt;40 )) = 0 THEN &apos;是&apos; ELSE &apos;否&apos; END)" forInsert="false" forUpdate="false"/>
         <bm:field name="amount_total" expression="(select sum(ccc.due_amount) from con_contract_cashflow ccc where ccc.contract_id=t1.contract_id and ccc.cf_status&lt;&gt;&apos;BLOCK&apos; and ccc.cf_item=1)" forInsert="false" forUpdate="false"/>
         <bm:field name="amount_principal" expression="(select sum(nvl(ccc.principal,0)) from con_contract_cashflow ccc where ccc.contract_id=t1.contract_id and ccc.cf_status&lt;&gt;&apos;BLOCK&apos;)" forInsert="false" forUpdate="false"/>
         <bm:field name="amount_interest" expression="(select sum(nvl(ccc.interest,0)) from con_contract_cashflow ccc where ccc.contract_id=t1.contract_id and ccc.cf_status&lt;&gt;&apos;BLOCK&apos; and cf_item=1)" forInsert="false" forUpdate="false"/>

src/main/webapp/WEB-INF/server-script/layoutconfig/ap_invoice_import_mat_mat_query_queryfields.js

+var add_datafilters=[
+    {
+        name:'asset_number',
+        expression:"(t1.asset_number=${/parameter/@asset_number})"
+    }
+    {
+        name:'contract_number',
+        expression:"(t1.contract_number=${/parameter/@contract_number})"
+    }
+    {
+        name:'bp_name',
+        expression:"(t1.bp_name=${/parameter/@bp_name})"
+    }
+    {
+        name:'asset_number',
+        expression:"(t1.agent_name  =${/parameter/@agent_name  })"
+    }
+];
+
+add_datafilter();
\ No newline at end of file

src/main/webapp/modules/acp/ACP522/ap_invoice_detail.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
+    <a:view>
+        <script><![CDATA[
+        ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
+    </a:view>
+</a:screen>

src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview

@@ -553,7 +553,6 @@
 
         function parameter_function(record, name) {
             var field = record.getField(name),
-                ds = $('hls_fin_calculator_hd_ds'),
                 input_mode = record.get('input_mode');
             set_field_input_mode(record, field, name, input_mode);
             special_editor_function(ds, record, name);
@@ -564,6 +563,13 @@
                     }
                 });
             }
+            var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
+            if('${/parameter/@division}'== '70'){
+                if (record.get('column_code') == 'H97') {
+                    console.log(name);
+                    set_field_input_mode(record, field, name, 'READONLY');
+                }
+            }
             if (record.get('validation_type') == 'NUMBERFIELD') {
                 if (record.get('allow_decimal') == 'TRUE') {
                     field.setPropertity('allowdecimals', true);
@@ -1889,7 +1895,7 @@
                  headRecord.isNew = false;
                  headRecord.dirty = true;
                  create_record_column(all_records, headRecord);
-            
+
                  function hls_fin_cal_save_hd_submitsuccess_new(ds, res) {
                      if (typeof (nextStep) == 'function') {
                          nextStep(source_procedure);
@@ -1900,12 +1906,12 @@
                              unlock_calc_current_window();
                              $('ln_formula_ds').un('load', on_ln_formula_load);
                          }
-            
+
                          $('ln_formula_ds').on('load', on_ln_formula_load);
                          $('ln_formula_ds').query();
                      }
                  }
-            
+
                 $('hls_fin_cal_save_hd_ds').on('submitsuccess', hls_fin_cal_save_hd_submitsuccess_new);
                  Leaf.SideBar.enable = false;
                 $('hls_fin_cal_save_hd_ds').submit();