diff --git a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractPayment.xml b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractPayment.xml index 960d1a95e..162c2a791 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractPayment.xml +++ b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractPayment.xml @@ -38,7 +38,7 @@ SELECT lul.customername, di.total, di.usedlines, - relines, + di.relines, vlfp.plan_money, IFNULL(lfi.allfact_money, 0) AS afact_money, vlfp.allfact_money, diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp index e5a740764..7b7ea5305 100644 --- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp +++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp @@ -89,7 +89,9 @@ var FbSdk = getItemValue(0,0,"FbSdk"); if(FbSdk=='Y'){ showItem(0,"branch_code"); + showItemRequired(0,"branch_code"); }else if(FbSdk=='N'){ + hideItemRequired(0,"branch_code"); hideItem(0,"branch_code"); } } diff --git a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml index 89f121afe..14701ab64 100644 --- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml @@ -169,7 +169,7 @@ - +