Merge branch 'refs/heads/contract_change_youhua' into develop

src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview

@@ -92,7 +92,7 @@
                             var secondary_lease = res.result.secondary_lease;
                             var payment_deduction = res.result.payment_deduction;
                             var price_list = res.result.price_list;
-                            if((price_list=='HL_PRICR_E'||price_list=='HL_PRICR_TEST'||price_list=='HL_PRICR_NTEST'||price_list=='HL_PRICR_EN') && secondary_lease=='NO'){
+                          /*  if((price_list=='HL_PRICR_E'||price_list=='HL_PRICR_TEST'||price_list=='HL_PRICR_NTEST'||price_list=='HL_PRICR_EN') && secondary_lease=='NO'){
                                 var  count=0;
                                 var  denominator=0;
                                 var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
@@ -103,13 +103,13 @@
                                         denominator=denominator+temp_head_records[i].get('column_value')||0
                                     }
                                 }
-
                                 if((count/denominator)<0.15){
+
                                     Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于15%');
                                     unlock_calc_current_window('${l:HLS.CALCULATING}');
                                     return false;
                                 }
-                            }
+                            }*/
                             if(price_list=='HL_PRICR_E' ||price_list=='HL_PRICR_TEST'||price_list=='HL_PRICR_NTEST'||price_list=='HL_PRICR_EN'){
                                 if(payment_deduction!='TRADE_IN'){
                                     var record = $('hls_fin_calculator_hd_ds').getAll();