Skip to content

L
leaf-hlcm
Commit 0de585ea authored by stone's avatar stone
Browse files
Options

Merge branch 'feature/ifrs9_report' into develop

parents 361d9362 e1ff23fc
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 33 deletions
src/main/webapp/modules/acr/ACR512/acr_invoice_update_detail.lview
View file @ 0de585ea
......@@ -111,12 +111,11 @@
window['${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
var acr_invoice_hd_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'acr_invoice_hd');
var ds_batch_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'acr_invoice_batch_ln');
$(acr_invoice_hd_ds_id).getAt(0).set('merge_flag', 'Y');
$(acr_invoice_hd_ds_id).getAt(0).set('merge_flag_n', '合并');
if(!$(acr_invoice_hd_ds_id).getAt(0).get('merge_flag')){
var acr_invoice_rec = $(acr_invoice_hd_ds_id).getAt(0);
var invoice_hd_id = $(acr_invoice_hd_ds_id).getCurrentRecord().get('invoice_hd_id');
$(acr_invoice_hd_ds_id).getAt(0).set('merge_flag', 'N');
$(acr_invoice_hd_ds_id).getAt(0).set('merge_flag_n', '不合并');
// if (acr_invoice_rec.get('merge_flag') == 'Y') {
Leaf.request({
url: $('acr512_invoice_ln_update_1_link').getUrl(),
......@@ -132,6 +131,8 @@
},
scope: this
});
}
};
window['${/parameter/@layout_code}_open_bp_detail_window'] = function(id, name) {
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
......
src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview
View file @ 0de585ea
......@@ -351,7 +351,7 @@
<div><![CDATA[${l:HLS.ACCOUNT_DATE_TO}]]></div>
-->
<a:datePicker name="accounting_date_t" bindTarget="acr512_invoice_query_ds" prompt="记账日期到" width="135"/>
<a:lov name="created_by_name" bindTarget="acr512_invoice_query_ds" prompt="ACR.CREATED_BY_NAME" width="135"/>
<a:lov name="created_by_name" bindTarget="acr512_invoice_query_ds" prompt="创建人" width="135"/>
<a:textField name="invoice_title" bindTarget="acr512_invoice_query_ds" prompt="ACR.INVOICE_TITLE" width="135"/>
</a:hBox>
......@@ -388,7 +388,7 @@
<a:column name="invoice_title" autoAdjust="false" prompt="ACR.INVOICE_TITLE" showTitle="true" width="150"/>
<!-- <a:column name="total_amount" align="right" prompt="ACR.TOTAL_AMOUNT" renderer="Aurora.formatMoney" width="100"/> -->
<!-- <a:column name="currency" prompt="HLS.CURRENCY" width="80"/> -->
<a:column name="created_by_name" autoAdjust="false" prompt="ACR.CREATED_BY_NAME" showTitle="true" width="150"/>
<a:column name="created_by_name" autoAdjust="false" prompt="创建人" showTitle="true" width="150"/>
<a:column name="invoice_status_desc" prompt="ACR.INVOICE_STATUS" width="100"/>
<a:column name="accounting_date" prompt="HLS.ACCOUNT_DATE" width="100"/>
<!-- <a:column name="compare_date_flag" prompt="比较日期" width="100"/> -->
......
src/main/webapp/modules/acr/ACR513/acr_invoice_confirm.lview
View file @ 0de585ea
......@@ -356,7 +356,7 @@
<!-- <a:textField name="invoice_title" bindTarget="acr513_invoice_query_ds" prompt="ACR.INVOICE_TITLE"
width="135"/>-->
<a:comboBox name="billing_way_desc" bindTarget="acr513_invoice_query_ds" prompt="开票方式" width="135"/>
<a:lov name="created_by_name" bindTarget="acr513_invoice_query_ds" prompt="ACR.CREATED_BY_NAME"
<a:lov name="created_by_name" bindTarget="acr513_invoice_query_ds" prompt="创建人"
width="135"/>
<!-- <a:datePicker name="accounting_date_f" bindTarget="acr513_invoice_query_ds"
......@@ -400,7 +400,7 @@
width="150"/>
<!-- <a:column name="total_amount" align="right" prompt="ACR.TOTAL_AMOUNT" renderer="Leaf.formatMoney" width="100"/> -->
<!-- <a:column name="currency" prompt="HLS.CURRENCY" width="80"/> -->
<a:column name="created_by_name" autoAdjust="false" prompt="ACR.CREATED_BY_NAME" showTitle="true"
<a:column name="created_by_name" autoAdjust="false" prompt="创建人" showTitle="true"
width="150"/>
<a:column name="invoice_status_desc" prompt="ACR.INVOICE_STATUS" width="100"/>
<!-- <a:column name="accounting_date" prompt="HLS.ACCOUNT_DATE" width="100"/>-->
......
src/main/webapp/modules/acr/ACR514/acr_invoice_reverse.lview
View file @ 0de585ea
......@@ -308,7 +308,7 @@
<a:lov name="contract_number_t" bindTarget="acr514_invoice_query_ds" prompt="合同编号到" width="135"/>
-->
<a:comboBox name="invoice_kind_desc" bindTarget="acr514_invoice_query_ds" prompt="ACR.INVOICE_KIND" width="135"/>
<a:lov name="created_by_name" bindTarget="acr514_invoice_query_ds" prompt="ACR.CREATED_BY_NAME" width="135"/>
<a:lov name="created_by_name" bindTarget="acr514_invoice_query_ds" prompt="创建人" width="135"/>
<a:datePicker name="invoice_date_f" bindTarget="acr514_invoice_query_ds" prompt="ACR.INVOICE_DATE_FROM" width="135"/>
<a:datePicker name="invoice_date_t" bindTarget="acr514_invoice_query_ds" prompt="发票日期到" width="135"/>
</a:hBox>
......@@ -318,7 +318,7 @@
<!--<div><![CDATA[${l:HLS.CUSTOMER_NUMBER_TO}]]></div>-->
<!-- <a:lov name="invoice_bp_code_t" bindTarget="acr514_invoice_query_ds" prompt="客户编号到" width="135"/>-->
<a:textField name="invoice_title" bindTarget="acr514_invoice_query_ds" prompt="ACR.INVOICE_TITLE" width="135"/>
<a:lov name="confirmed_by_name" bindTarget="acr514_invoice_query_ds" prompt="ACR.CHECKER" width="135"/>
<a:lov name="confirmed_by_name" bindTarget="acr514_invoice_query_ds" prompt="确认人" width="135"/>
<a:datePicker name="accounting_date_f" bindTarget="acr514_invoice_query_ds" prompt="HLS.ACCOUNT_DATE_FROM" width="135"/>
<a:datePicker name="accounting_date_t" bindTarget="acr514_invoice_query_ds" prompt="记账日期到" width="135"/>
</a:hBox>
......@@ -347,8 +347,8 @@
<a:column name="invoice_title" autoAdjust="false" prompt="ACR.INVOICE_TITLE" showTitle="true" width="150"/>
<a:column name="total_amount" align="right" prompt="ACR.TOTAL_AMOUNT" renderer="Leaf.formatMoney" width="90"/>
<!-- <a:column name="currency" prompt="HLS.CURRENCY" width="80"/> -->
<a:column name="created_by_name" autoAdjust="false" prompt="ACR.CREATED_BY_NAME" showTitle="true" width="150"/>
<a:column name="confirmed_by_name" align="center" autoAdjust="false" prompt="ACR.CHECKER" showTitle="true" width="150"/>
<a:column name="created_by_name" autoAdjust="false" prompt="创建人" showTitle="true" width="150"/>
<a:column name="confirmed_by_name" align="center" autoAdjust="false" prompt="确认人" showTitle="true" width="150"/>
<a:column name="invoice_status_desc" prompt="ACR.INVOICE_STATUS" width="100"/>
<a:column name="vat_interface_status_desc" prompt="ACR.VAT_INTERFACE_STATUS_NAME" width="100"/>
<a:column name="accounting_date" prompt="HLS.ACCOUNT_DATE" width="100"/>
......
src/main/webapp/modules/acr/ACR515/acr_invoice_vat.lview
View file @ 0de585ea
......@@ -422,7 +422,7 @@
<div>到</div>
<a:lov name="contract_number_t" bindTarget="acr515_invoiceVatParaDs" prompt="" width="150"/>
<a:textField name="invoice_title" bindTarget="acr515_invoiceVatParaDs" width="150"/>
<a:lov name="confirmed_by_name" bindTarget="acr515_invoiceVatParaDs" width="150"/>
<a:lov name="confirmed_by_name" bindTarget="acr515_invoiceVatParaDs" width="150" prompt="确认人"/>
</a:hBox>
<a:hBox labelSeparator=" " labelWidth="100">
<a:datePicker name="invoice_date_f" bindTarget="acr515_invoiceVatParaDs" prompt="ACR.INVOICE_DATE_FROM" width="150"/>
......@@ -446,7 +446,7 @@
<div><![CDATA[${l:ACR.TOTAL_AMOUNT_TO}]]></div>
<a:numberField name="total_amount_t" allowFormat="true" bindTarget="acr515_invoiceVatParaDs" prompt="" width="150"/>
<a:comboBox name="invoice_kind_desc" bindTarget="acr515_invoiceVatParaDs" width="150"/>
<a:lov name="created_by_name" bindTarget="acr515_invoiceVatParaDs" width="150"/>
<a:lov name="created_by_name" bindTarget="acr515_invoiceVatParaDs" width="150" prompt="创建人"/>
</a:hBox>
<a:hBox labelWidth="100">
......@@ -473,8 +473,8 @@
<a:column name="dif_tax_amount" align="right" footerRenderer="summaryRenderer" renderer="Leaf.formatMoney" width="100"/>
<a:column name="net_amount" align="right" footerRenderer="summaryRenderer" renderer="Leaf.formatMoney" width="100"/>
<a:column name="currency" width="80"/>
<a:column name="created_by_name" autoAdjust="false" showTitle="true" width="150"/>
<a:column name="confirmed_by_name" autoAdjust="false" showTitle="true" width="150"/>
<a:column name="created_by_name" autoAdjust="false" showTitle="true" width="150" prompt="创建人"/>
<a:column name="confirmed_by_name" autoAdjust="false" showTitle="true" width="150" prompt="确认人"/>
<a:column name="invoice_status_desc" width="100"/>
<a:column name="vat_interface_status_desc" width="100"/>
<a:column name="accounting_date" renderer="Leaf.formatDate" width="100"/>
......
src/main/webapp/modules/acr/ACR516/acr_invoice_claim_application.lview
View file @ 0de585ea
......@@ -145,7 +145,7 @@
<a:column name="tax_amount" align="right" renderer="Leaf.formatMoney" prompt="税额" width="100"/>
<a:column name="net_amount" align="right" renderer="Leaf.formatMoney" prompt="不含税金额" width="100"/>
<a:column name="currency" prompt="币种" width="80"/>
<a:column name="created_by_name" autoAdjust="false" showTitle="true" prompt="开票人" width="150"/>
<a:column name="created_by_name" autoAdjust="false" showTitle="true" prompt="创建人" width="150"/>
<a:column name="invoice_status_desc" prompt="发票状态" width="100"/>
<a:column name="vat_interface_status_desc" prompt="金税状态" width="100"/>
<a:column name="accounting_date" renderer="Leaf.formatDate" prompt="期间序号" width="100"/>
......
src/main/webapp/modules/acr/ACR517/acr_invoice_claim_confirm.lview
View file @ 0de585ea
......@@ -206,7 +206,7 @@
<a:column name="tax_amount" align="right" renderer="Leaf.formatMoney" prompt="税额" width="100"/>
<a:column name="net_amount" align="right" renderer="Leaf.formatMoney" prompt="不含税金额" width="100"/>
<a:column name="currency" prompt="币种" width="80"/>
<a:column name="created_by_name" autoAdjust="false" showTitle="true" prompt="开票人" width="150"/>
<a:column name="created_by_name" autoAdjust="false" showTitle="true" prompt="创建人" width="150"/>
<a:column name="invoice_status_desc" prompt="发票状态" width="100"/>
<a:column name="vat_interface_status_desc" prompt="金税状态" width="100"/>
<a:column name="accounting_date" renderer="Leaf.formatDate" prompt="期间序号" width="100"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment