Revert " TEST เอาจาก STD ไปทดสอบของ DHAS"

This reverts commit 62c55bbf.

TEMPLATE/TA/TAR_VACATION_BKK.xml

@@ -73,10 +73,6 @@
 	<parameter name="GROUPBY" isForPrompting="false" class="java.lang.String">
 		<parameterDescription><![CDATA[component]]></parameterDescription>
 	</parameter>
-	<parameter name="CONDITION" isForPrompting="false" class="java.lang.String">
-		<parameterDescription><![CDATA[component]]></parameterDescription>
-		<defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
-	</parameter>
 
 	<field name="tleave_summary__employeeid" class="java.lang.String">
 		<fieldDescription><![CDATA[Field returned by tleave_summary__employeeid]]></fieldDescription>
@@ -878,11 +874,7 @@
 					<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
 						<font fontName="Cordia New" pdfFontName="CORDIA.TTF" size="24" isBold="true" isItalic="false" isUnderline="false" isPdfEmbedded ="true" pdfEncoding ="Identity-H" isStrikeThrough="false" />
 					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{CONDITION}.indexOf("branch = ") > -1 ?
-$P{LANG}.equalsIgnoreCase("tha")?
-$F{mbranch__tdesc}:$F{mbranch__edesc}
-:
-$P{COMPANY}]]></textFieldExpression>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$P{COMPANY}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement

XML/DBXML/TA/TAR_VACATION_BKK.xml

@@ -6,7 +6,6 @@
 		<FIELD>dateid</FIELD>
 		<FIELD>lv_type</FIELD>
 		<FIELD>companyid</FIELD>
-		<FIELD>branch</FIELD>
 		<ORDER>
 			<FIELD>employeeid</FIELD>
 			<FIELD>dateid</FIELD>