[fix]销项发票修改

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

@@ -4,7 +4,7 @@
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
 
-      SELECT * FROM(  select t1.spv_company_id,
+      SELECT * FROM( SELECT * FROM( select t1.spv_company_id,
        NULL journal_header_id,
        NULL journal_line_id,
        t1.company_id,
@@ -108,7 +108,8 @@
        received_amount>0) OR  (decode(t2.cf_item,
                 '250',
                 t1.inv_object_taxpayer_type,
-                t1.object_taxpayer_type)= 'SMALL_SCALE_TAXPAYER') )
+                t1.object_taxpayer_type)= 'SMALL_SCALE_TAXPAYER'))
+                ORDER BY t1.contract_id,t2.due_date )
   UNION ALL
     select t1.spv_company_id,
        t2.journal_header_id,
@@ -162,10 +163,10 @@
        --NULL account_name,
        NULL principal,
        NULL interest,
-       NULL received_amount,
+       t2.amount_dr received_amount,
        NULL received_principal,
        NULL received_interest,
-       t2.amount_dr billing_amount,
+       0 billing_amount,
        NULL billing_principal,
        NULL billing_interest,
        NULL vat_due_amount,

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

@@ -40,7 +40,7 @@ begin
 					 ACR_INVOICE_PKG.split_penalty_cashflow(p_contract_id			=> ${@contract_id},
 					                                p_journal_header_id             => ${@journal_header_id},
 					                                p_journal_line_id               => ${@journal_line_id},
-					                                p_billing_amount                =>${@billing_amount},
+					                                p_billing_amount                =>${@received_amount},
 													p_session_id					=> ${/session/@session_id},
 													p_bp_id         				=> ${@billing_object_id},
 						                            p_bp_name       				=> ${@billing_object_name},

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

@@ -129,7 +129,7 @@
                 Leaf.Masker.unmask(Ext.getBody());
                 return;
             }
-            debugger
+
             var datas = ds.getJsonData(true);
             //判断是不是罚息
             var first_cf_item=datas[0].cf_item;
@@ -446,7 +446,7 @@
                                 <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="last_received_date" prompt="最后核销日" renderer="Leaf.formatDate"/>
+                                <a:column name="last_received_date" prompt="最后收款日" renderer="Leaf.formatDate"/>
 <!--
                                 <a:column name="termination_date" prompt="正常结清日" renderer="Leaf.formatDate"/>
 -->