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

# Conflicts:
#	src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview

src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_cf_v_new.lwm

@@ -145,7 +145,7 @@
         <bm:field name="lease_channel"/>
     </bm:fields>
     <bm:query-fields>
-
+        <bm:query-field name="billing_object_name" queryExpression="t2.billing_object_name = ${@billing_object_name}"/>
         <bm:query-field name="cf_item" queryExpression="t2.cf_item = ${@cf_item}"/>
         <bm:query-field name="due_date_from" queryExpression="t2.due_date &gt;= to_date(${@due_date_from},&apos;yyyy-mm-dd&apos;)"/>
         <bm:query-field name="due_date_to" queryExpression="t2.due_date &lt;= to_date(${@due_date_to},&apos;yyyy-mm-dd&apos;)"/>

src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_create.lwm

@@ -31,6 +31,8 @@
         <bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/>
         <bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE"/>
         <bm:field name="exchange_rate_type_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE_DESC" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
+        <bm:field name="billing_object_name" databaseType="VARCHAR2" datatype="java.lang.String"/>
+
     </bm:fields>
     <bm:operations>
         <bm:operation name="query">
@@ -42,6 +44,10 @@
 				          from sys_code_values_v c
 				         where c.code = 'ACR510_BILL_DETAIL_METHOD'
 				           and c.code_value = t.billing_object) as billing_object_desc,
+				         (select m.bp_name
+          from hls_bp_master_s_v m
+         where m.bp_id = con.bp_id_tenant) billing_object_name,
+
 				       t.due_amount,
 				       t.billing_amount,
 				       t.cf_billing_amount,

src/main/webapp/modules/acr/ACR510/acr_invoice_create_invoice.lview

@@ -118,6 +118,8 @@
                     <a:field name="invoice_kind"/>
                     <a:field name="invoice_kind_desc" displayField="code_value_name" options="invoiceKindDs" required="true" returnField="invoice_kind" valueField="code_value"/>
                     <a:field name="billing_object"/>
+                    <a:field name="billing_object_name" prompt="开票对象名称"/>
+
                 </a:fields>
                 <a:events>
                     <a:event name="load" handler="onLoad_selectedDs"/>
@@ -145,6 +147,8 @@
                                 <a:column name="cf_item_desc"/>
                                 <a:column name="product_name" editor="selectedDs_grid_editor_tf" width="150"/>
                                 <a:column name="invoice_kind_desc" editor="selectedDs_grid_editor_comb"/>
+                                <a:column name="billing_object_name" width="150"/>
+
                                 <a:column name="currency_desc" align="center"/>
                                 <a:column name="due_amount" align="right" renderer="Leaf.formatMoney"/>
                                 <a:column name="received_amount" align="right" renderer="Leaf.formatMoney"/>

src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview

@@ -189,10 +189,10 @@
                     <a:field name="project_name_to" readOnly="true"/>
                     <a:field name="contract_number"/>
                    <!-- <a:field name="invoice_title"/>-->
-                    <a:field name="invoice_title" lovGridHeight="300" lovHeight="450" lovLabelWidth="100" lovService="basic.hls_bp_master_v_for_tenant_lov" lovWidth="600" title="开票对象">
+                    <a:field name="billing_object_name" lovGridHeight="300" lovHeight="450" lovLabelWidth="100" lovService="basic.hls_bp_master_v_for_lov" lovWidth="600" title="承租人">
                         <a:mapping>
-<!--                            <a:map from="bp_code" to="invoice_title"/>-->
-                            <a:map from="bp_name" to="invoice_title"/>
+                            <a:map from="bp_code" to="billing_object_name"/>
+                            <a:map from="bp_name" to="billing_object_name"/>
                         </a:mapping>
                     </a:field>
                     <a:field name="bp_code_tenant_from" lovGridHeight="300" lovHeight="450" lovLabelWidth="100" lovService="basic.hls_bp_master_v_for_lov" lovWidth="600" title="ACR510.FIELD.BP_CODE_TENANT_FROM">
@@ -297,7 +297,7 @@
             </a:screenTopToolbar>-
             <a:queryForm id="condition_queryForm" bindTarget="allConditionDs" createSearchButton="false" resultTarget="contractDs">
                 <a:formToolBar labelWidth="100">
-                    <a:lov name="invoice_title" bindTarget="allConditionDs" prompt="开票对象"/>
+                    <a:lov name="billing_object_name" bindTarget="allConditionDs" prompt="承租人"/>
 
 <!--
                     <a:comboBox name="bill_object_bp_class_desc" bindTarget="allConditionDs" prompt="客户类型"/>
@@ -343,9 +343,9 @@
                                 <!--<a:column name="invoice_type_desc" prompt="发票类型"/>-->
                                 <!--<a:column name="object_taxpayer_type_desc" prompt="纳税人类型"/>-->
                                 <a:column name="contract_number" lock="true" prompt="合同编号" width="150"/>
-                                <a:column name="times" align="right" lock="true" prompt="期数" width="40"/>
-                                <a:column name="invoice_title" prompt="开票对象名称"/>
+                                <a:column name="billing_object_name" prompt="开票对象名称"/>
                                 <a:column name="bp_id_agent_level1" prompt="代理店"/>
+                                <a:column name="times" align="right" lock="true" prompt="期数" width="40"/>
                                 <a:column name="cf_item_desc" lock="true" prompt="应收项目"/>
                                 <a:column name="due_date" prompt="应收日" renderer="Leaf.formatDate"/>
                                 <a:column name="due_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney"/>
@@ -357,8 +357,8 @@
                                 <!--  <a:column name="overdue_status" align="center" prompt="是否逾期"/>
                                 <a:column name="overdue_max_days" align="right" prompt="逾期天数"/> -->
                                 <a:column name="billing_amount" align="right" prompt="已开票金额" renderer="Leaf.formatMoney"/>
-                                <a:column name="billing_principal" align="right" prompt="已开票本金" renderer="Leaf.formatMoney"/>
-                                <a:column name="billing_interest" align="right" prompt="已开票利息" renderer="Leaf.formatMoney"/>
+                             <!--   <a:column name="billing_principal" align="right" prompt="已开票本金" renderer="Leaf.formatMoney"/>
+                                <a:column name="billing_interest" align="right" prompt="已开票利息" renderer="Leaf.formatMoney"/>-->
                                 <a:column name="last_received_date" prompt="最后收款日" renderer="Leaf.formatDate"/>
 <!--
                                 <a:column name="termination_date" prompt="正常结清日" renderer="Leaf.formatDate"/>
@@ -378,10 +378,10 @@
                                 <a:column name="contract_status_desc" prompt="合同状态" width="80"/>
                                 <a:column name="billing_method_desc" prompt="开票规则" width="80"/>
                                 <a:column name="billing_object_name" autoAdjust="false" editor="contractDs_grid_editor_lov" prompt="开票对象名称" renderer="render_contractDs_grid" showTitle="true" width="200"/>
-                                <a:column name="invoice_title" autoAdjust="false"  prompt="发票抬头" showTitle="true" width="200"/>
+                                <a:column name="invoice_title" autoAdjust="false" editor="contractDs_grid_editor_tf" prompt="发票抬头" showTitle="true" width="200"/>
                                 <a:column name="object_tax_registry_num" prompt="纳税人识别号" width="150"/>
-                                <a:column name="invoice_bp_address_phone_num" autoAdjust="false"  prompt="开票地址电话" showTitle="true" width="200"/>
-                                <a:column name="invoice_bp_bank_account" autoAdjust="false"  prompt="开户行及账号" showTitle="true" width="150"/>
+                                <a:column name="invoice_bp_address_phone_num" autoAdjust="false" editor="contractDs_grid_editor_tf" prompt="开票地址电话" showTitle="true" width="200"/>
+                                <a:column name="invoice_bp_bank_account" autoAdjust="false" editor="contractDs_grid_editor_tf" prompt="开户行及账号" showTitle="true" width="150"/>
                                 <a:column name="description" autoAdjust="false" editor="contractDs_grid_editor_tf" prompt="备注" showTitle="true" width="200"/>
                             </a:columns>
                             <a:editors>