[fix]销项发票创建

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

@@ -5,6 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
+
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
     <bm:operations>
         <bm:operation name="query">

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

@@ -5,6 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
+
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
     <bm:fields>
         <bm:field name="contract_id"/>

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

@@ -145,6 +145,7 @@
         <bm:field name="lease_channel"/>
     </bm:fields>
     <bm:query-fields>
+
         <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

@@ -88,6 +88,7 @@
 				 order by con.contract_id,cf.times,t.cf_item
 			]]></bm:query-sql>
         </bm:operation>
+
         <bm:operation name="update">
             <bm:update-sql><![CDATA[
 				begin

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

 <?xml version="1.0" encoding="UTF-8"?>
+
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
     <bm:operations>
         <bm:operation name="query">

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

@@ -5,6 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
+
 <ns1:model xmlns:ns1="http://www.leaf-framework.org/schema/bm" alias="t1" extend="hls.HLS005.hls_cashflow_item_v" extendMode="reference">
     <ns1:fields>
         <ns1:field name="cf_item" forDisplay="false" forQuery="false"/>

src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_bp_master_list.lwm

@@ -5,6 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
+
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
     <bm:fields>
         <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER.BP_ID"/>

src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_hd_batch.lwm

@@ -6,6 +6,7 @@
         <bm:field name="creation_by" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CREATION_BY" prompt="ACR_INVOICE_HD_BATCH.CREATION_BY"/>
         <bm:field name="last_updated_date" databaseType="DATE" datatype="java.util.Date" physicalName="LAST_UPDATED_DATE" prompt="ACR_INVOICE_HD_BATCH.LAST_UPDATED_DATE"/>
     </bm:fields>
+
     <bm:features>
         <f:standard-who/>
     </bm:features>

src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_sys_user_lov.lwm

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:bm="http://www.aurora-framework.org/schema/bm">
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[

src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_update_query.bm

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:bm="http://www.aurora-framework.org/schema/bm">
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[

src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_update_query.lwm

@@ -5,6 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
+
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
     <bm:operations>
         <bm:operation name="query">

src/main/webapp/WEB-INF/classes/acr/ACR514/acr_invoice_reverse.lwm

@@ -5,6 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
+
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
     <bm:operations>
         <bm:operation name="query">

src/main/webapp/modules/acr/ACR310/acr_invoice_query.lview

@@ -33,7 +33,8 @@
             window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
                 $('ACR310_RESULT_acr_invoice_hd_layout_grid_id')._export('xls', '应收发票查询');
             };
-            
+
+
             
             
             window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {

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

@@ -91,6 +91,7 @@
                     <a:field name="invoice_date" defaultValue="${/model/default_value_record/record/@today}" required="true"/>
                 </a:fields>
             </a:dataSet>
+
             <a:dataSet id="selectedDs" autoQuery="true" bindName="line_info" bindTarget="headDs" fetchAll="true" model="acr.ACR510.acr_invoice_create" selectable="true">
                 <a:fields>
                     <a:field name="billing_amount" required="true"/>

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

@@ -88,6 +88,7 @@
             });
         }
 
+
         function invoiceHd_confirm()
         {
             Leaf.Masker.mask(Ext.getBody());

src/main/webapp/modules/acr/ACR512/acr_invoice_update_detail.lview

@@ -77,6 +77,7 @@
                 Leaf.request({
                     url: $('acr512_invoice_ln_update_1_link').getUrl(),
                     para: {
+
                         invoice_hd_id: invoice_hd_id,
                         merge_flag: $(acr_invoice_hd_ds_id).getCurrentRecord().get('merge_flag')
                     },

src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview

@@ -247,6 +247,7 @@
 <!--
                 <a:toolbarButton click="acr512_invoice_submit" text="HLS.SUBMIT"/>
 -->
+
             </a:screenTopToolbar>
             <a:form marginWidth="200" padding="0" title="应收发票维护">
                 <a:hBox labelSeparator=" ">

src/main/webapp/modules/acr/ACR513/acr_invoice_confirm.lview

@@ -302,6 +302,7 @@
             <a:grid id="acr513_invoice_grid_id" bindTarget="acr513_invoice_result_ds" marginHeight="225"
                     marginWidth="30" navBar="true">
                 <a:columns>
+
                     <a:column name="document_number" lock="true" prompt="HLS.DOCUMENT_NUMBER"
                               renderer="acr513_document_number_render" width="120"/>
                     <a:column name="invoice_bp_name" autoAdjust="false" prompt="HLS.CUSTOMER_NAME" showTitle="true"

src/main/webapp/modules/cont/CON3200/con_re_print_entrance.lview

@@ -18,11 +18,13 @@
             function open_contract_win(ds_id, record_id) {
                 var record = $(ds_id).findById(record_id);
                 var param = record.data;
-                if(record.get('contract_status')=='NEW' || record.get('contract_status')=='INCEPT_RETURN'||record.get('sign_contract_status')=='SIGNING' || record.get('sign_contract_status') =='SIGN'){
+                debugger;
+                if((record.get('contract_status')=='NEW' || record.get('contract_status')=='INCEPT_RETURN') && (record.get('sign_contract_status')=='SIGNING' || record.get('sign_contract_status') =='SIGN')){
                     param['function_code'] = 'CON3200N';
                     param['function_usage'] = 'MODIFY';
                 }
                 else{
+                    debugger;
                     param['function_code'] = 'CON3200Q';
                     param['function_usage'] = 'QUERY';
                 }