Merge branch 'refs/heads/feature/ap_invoice_import' into develop

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: feng
+    $Date: 2013-9-11 下午15:13:20
+    $Revision: 1.0
+    $Purpose:
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql>
+                <![CDATA[
+                select v.code_value, v.code_value_name
+                from sys_code_values_v v
+                where v.code = 'CON500_CONTRACT_STATUS'
+                and v.code_value in ('ETING', 'INCEPT', 'TERMINATING')
+                ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/modules/cont/CON560/con_contract_finish_maintain.lview

@@ -123,7 +123,7 @@
         <a:dataSets>
             <a:dataSet id="receivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_received_amount"/>
             <a:dataSet id="unreceivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_unreceived_amount"/>
-            <a:dataSet id="con560_contract_status_ds" lookupCode="CON500_CONTRACT_STATUS"/>
+            <a:dataSet id="con560_contract_status_ds" autoQuery="true" model="cont.CON560.con_contract_status"/>
             <a:dataSet id="con560_lease_organization_name_ds" loadData="true"
                        model="basic.hls_lease_organization_for_lov"/>
             <a:dataSet id="con560_contract_query_ds" autoCreate="true">

src/main/webapp/modules/cont/CON560/con_contract_finish_maintain_wfl.lview

@@ -123,7 +123,7 @@
         <a:dataSets>
             <a:dataSet id="receivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_received_amount"/>
             <a:dataSet id="unreceivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_unreceived_amount"/>
-            <a:dataSet id="con560_contract_status_ds" lookupCode="CON500_CONTRACT_STATUS"/>
+            <a:dataSet id="con560_contract_status_ds" autoQuery="true" model="cont.CON560.con_contract_status"/>
             <a:dataSet id="con560_lease_organization_name_ds" loadData="true"
                        model="basic.hls_lease_organization_for_lov"/>
             <a:dataSet id="con560_contract_query_ds" autoCreate="true">