【fix】修改销项发票功能

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

@@ -3,7 +3,7 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-            select * from (select t1.spv_company_id,
+         select * from (select t1.spv_company_id,
        t1.company_id,
        t1.project_id,
        t1.project_number,
@@ -21,8 +21,11 @@
        decode(t2.cf_item,'250',t1.inv_billing_object_id,t1.billing_object_id) billing_object_id,
        decode(t2.cf_item,'250',t1.inv_billing_object_code,t1.billing_object_code) billing_object_code,
        decode(t2.cf_item,'250',t1.inv_billing_object_name,t1.billing_object_name) billing_object_name,
-       decode(t2.cf_item,'250',t1.inv_object_taxpayer_type,t1.object_taxpayer_type) object_taxpayer_type,
+       --modify by shen 纳税人类型取承租人，如果是自然人就默认为小规模
+       --
+      decode(t2.cf_item,'250',t1.inv_object_taxpayer_type,t1.object_taxpayer_type) object_taxpayer_type,
        decode(t2.cf_item,'250',t1.inv_object_taxpayer_type_desc,t1.object_taxpayer_type_desc) object_taxpayer_type_desc,
+      -- t1.object_taxpayer_type_desc,
        decode(t2.cf_item,'250',t1.inv_object_tax_registry_num,t1.object_tax_registry_num) object_tax_registry_num,
        decode(t2.cf_item,'250',t1.inv_bill_object_bp_class,t1.bill_object_bp_class) bill_object_bp_class,
        decode(t2.cf_item,'250',t1.inv_bill_object_bp_class_desc,t1.bill_object_bp_class_desc) bill_object_bp_class_desc,

src/main/webapp/WEB-INF/classes/prj/PRJ501N/prj_project_bp.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: weiwuzhen  
+    $Date: 2016-5-5 下午3:45:05  
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+            select *
+                from prj_project_bp_lv p
+                where p.project_id=${@project_id}
+ ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

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

@@ -387,7 +387,7 @@
                                 <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="object_tax_registry_num" prompt="纳税人识别号" width="150"/>
-                                <a:column name="inv_object_taxpayer_type_desc" prompt="纳税人类型" width="150"/>
+                                <a:column name="object_taxpayer_type_desc" 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="description" autoAdjust="false"  prompt="备注" showTitle="true" width="200"/>

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview

@@ -632,16 +632,18 @@ function prj501n_contract_number_renderer(id, name, query_only){
 
         Leaf.onReady(function(){
             var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'T_HISTORY_INGO', 'hls_bp_master');
-       var  url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=${/parameter/@bp_id}';
+            var  url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=${/parameter/@bp_id}';
             $(bp_ds_id).setQueryUrl(url);
             $(bp_ds_id).query();
             var quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
             $(quotation_ds_id).query();
+           // var billing_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_INVOICE_INFO', 'prj_project_bp');
             var billing_ds_id=get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'prj_project_bp');
-           // console.log('${/parameter/@project_id}');
-            $(billing_ds_id).setQueryParameter("project_id",'${/parameter/@project_id}');
+            var billing_url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_bp/query?project_id=${/parameter/@project_id}';
+            $(billing_ds_id).setQueryUrl(billing_url);
             $(billing_ds_id).query();
-           // console.log($(billing_ds_id));
+
+
         })
         //序号自增  add by lijingjing
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_add'] = function(ds, record, config_records, bp_seq) {

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview

@@ -511,8 +511,8 @@ function prj501n_contract_number_renderer(id, name, query_only){
             $(bp_ds_id).query();
             //ADD BY SHEN
             var billing_ds_id=get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'prj_project_bp');
-            // console.log('${/parameter/@project_id}');
-            $(billing_ds_id).setQueryParameter("project_id",'${/parameter/@project_id}');
+            var billing_url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_bp/query?project_id=${/parameter/@project_id}';
+            $(billing_ds_id).setQueryUrl(billing_url);
             $(billing_ds_id).query();
         })
         //序号自增  add by lijingjing