Merge branch 'feature/bugs' into develop

src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_con_contract_cashflow.lwm

@@ -38,6 +38,7 @@
 <!--        <bm:query-field name="due_date_from" queryExpression="t.due_date between to_date(${@due_date_from},'yyyy-mm-dd') and nvl(to_date(${@due_date_to},'yyyy-mm-dd'),t.due_date)"/>-->
 <!--        <bm:query-field name="due_date_to" queryExpression="t.due_date between nvl(to_date(${@due_date_from},'yyyy-mm-dd'),t.due_date) and to_date(${@due_date_to},'yyyy-mm-dd')"/>-->
         <bm:query-field name="cf_item" queryExpression="t.cf_item = ${@cf_item}"/>
+        <bm:query-field name="deposit_flag" queryExpression="((nvl(${@deposit_flag},'N') = 'Y' and cf_item in (1,9,250)) or (nvl(${@deposit_flag},'N') = 'N'))"/>
         <bm:query-field name="due_date_from"
                         queryExpression="due_date &gt;= to_date(${@due_date_from},&apos;yyyy-mm-dd&apos;)"/>
         <bm:query-field name="due_date_to"

src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview

@@ -692,7 +692,7 @@
                     <a:field name="trx_interface_id" defaultValue="${/parameter/@transaction_id}"/>
                     <a:field name="contract_number" prompt="合同编号" autoComplete="true" lovAutoQuery="true"
                              lovHeight="850" required="true"
-                             lovUrl="${/request/@context_path}/modules/csh/CSH531N/csh_write_off_ref_contract.lview?bp_id=${/model/csh_transaction_path/record/@bp_id}"
+                             lovUrl="${/request/@context_path}/modules/csh/CSH531N/csh_write_off_ref_contract.lview?bp_id=${/model/csh_transaction_path/record/@bp_id}&amp;deposit_flag=${/parameter/@deposit_flag}"
                              lovWidth="1350" title="合同号选择">
                         <a:mapping>
                             <a:map from="contract_number" to="contract_number"/>

src/main/webapp/modules/csh/CSH531N/csh_write_off_ref_contract.lview

@@ -100,7 +100,7 @@
             <a:dataSet id="csh_write_off_lov_ds" fetchAll="true" bindTarget="csh_lov_con_contract_ds"
                        bindName="csh_con_cf" selectable="true" selectionModel="multiple"
                        model="csh.CSH531N.csh_con_contract_cashflow" queryDataSet="csh_query_cf_ds"
-                       queryUrl="${/request/@context_path}/autocrud/csh.CSH531N.csh_con_contract_cashflow/query">
+                       queryUrl="${/request/@context_path}/autocrud/csh.CSH531N.csh_con_contract_cashflow/query?deposit_flag=${/parameter/@deposit_flag}">
                 <a:fields>
                     <a:field name="contract_id"/>
                     <a:field name="cashflow_id"/>