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

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

@@ -16,7 +16,7 @@
                    FROM sys_code_values_v sc
                    WHERE sc.code = 'CON500_CONTRACT_STATUS'
                      AND sc.code_value = cc.contract_status) contract_status_desc,
-                  --t2.account_name,
+                  t2.account_name,
                   cc.billing_method,
                   (SELECT b.description
                    FROM hls_billing_method b
@@ -115,7 +115,7 @@
        or
        (cc.contract_status = 'INCEPT' and
        trunc(t2.due_date) >= trunc(nvl(cc.CCR_LEASE_DATE, t2.due_date)) and
-       t2.inv_billing_object_code <> 'D00000009' and hbm.bp_class = 'NP' and
+       t2.inv_billing_object_code <> 'D00010001' and hbm.bp_class = 'NP' and
        hbm.taxpayer_type = 'SMALL_SCALE_TAXPAYER' and
        hbm.invoice_method = 'NO_BILLING' and
        ((to_number(to_char(sysdate, 'MM')) in (3, 6, 9, 12) and
@@ -164,7 +164,7 @@
            and (hbm.bp_class = 'ORG' or
                (hbm.taxpayer_type = 'SMALL_SCALE_TAXPAYER' and
                hbm.bp_class = 'NP' and
-               t2.inv_billing_object_code = 'D00000009')))
+               t2.inv_billing_object_code = 'D00010001')))
            ORDER BY cc.contract_id, t2.due_date
 
 

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

@@ -520,7 +520,7 @@
                                 <a:column name="due_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney"/>
                                 <a:column name="principal" align="right" prompt="本金" renderer="Leaf.formatMoney"/>
                                 <a:column name="interest" align="right" prompt="利息" renderer="Leaf.formatMoney"/>
-<!--                                <a:column name="account_name" prompt="收款户名"/>-->
+                                <a:column name="account_name" prompt="收款户名" align="center"/>
                                 <a:column name="received_amount" align="right" prompt="已收金额"
                                           renderer="Leaf.formatMoney"/>
                                 <a:column name="received_principal" align="right" prompt="已收本金"

src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview

@@ -201,6 +201,8 @@
 
                 }
                 if (record.get('bp_class') && record.get('bp_class') == 'NP') {
+                    record.set('taxpayer_type', 'SMALL_SCALE_TAXPAYER');
+                    record.set('taxpayer_type_n', '小规模纳税人');
                     // 自然人才有配偶
                     if (record.get('marital_status') && (record.get('marital_status') == '30' || record.get('marital_status') == '40')) {
                         document.getElementById('${/parameter/@layout_code}_F_SPOUSE_1_component_id').style.display = 'block';