9115 แก้ไขข้อความและเอา company

BranchID ภาษาไทย รหัสสาขา
เพิ่มแถบ  companyid

XML/DBXML/COMPANY/CI_01_14.xml

@@ -325,6 +325,14 @@
 			<FIELD>LEVELID</FIELD>
 		</ORDER>
 	</TABLE>
-
+	
+	<TABLE name="MCOMPANY" status="center" central="false" out="inquiry">
+		<FIELD>COMPANYID</FIELD>
+		<FIELD>TNAME</FIELD>
+		<FIELD>ENAME</FIELD>
+		<ORDER>
+			<FIELD>COMPANYID</FIELD>
+		</ORDER>
+	</TABLE>
 
 </DBXML>

XML/DBXML/MJOBCODEHELP.xml

@@ -86,4 +86,13 @@
 			<FIELD>positionid</FIELD>
 		</ORDER>
 	</TABLE>
+
+	<TABLE name="mcompany" status="center" central="false" out="inquiry">
+		<FIELD>companyid</FIELD>
+		<FIELD>tname</FIELD>
+		<FIELD>ename</FIELD>
+		<ORDER>
+			<FIELD>companyid</FIELD>
+		</ORDER>
+	</TABLE>
 </DBXML>

XML/PROTABLEXML/MCOMPANY.xml

@@ -1052,5 +1052,9 @@ MCOMPANY>
 			<PARENT>MCOMPANY.COMPANYID</PARENT>
 			<CHILD>MEMPL_SCHOLARSHIP1.COMPANYID</CHILD>
 		</MEMPL_SCHOLARSHIP1>
+		<MJOBCODE>
+			<PARENT>MCOMPANY.COMPANYID</PARENT>
+			<CHILD>MJOBCODE.COMPANYID</CHILD>
+		</MJOBCODE>
 	</RELATION>
 </MCOMPANY>

XML/PROTABLEXML/MJOBCODE.xml

@@ -274,13 +274,13 @@ HELP>CS016HELP</HELP
 		<BRANCHID lang="A" encrypt="false" log="false" type="String">
 			<RELATION>MBRANCH</RELATION>
 			<WIDTH>15</WIDTH>
-			<DESC_ENG>Company Name</DESC_ENG>
-			<DESC_THAI>ชื่อบริษัท</DESC_THAI>
+			<DESC_ENG>Branch Name</DESC_ENG>
+			<DESC_THAI>รหัสสาขา</DESC_THAI>
 			<COMPONENT type="text">
 				<MAXSIZE>10</MAXSIZE>
 				<SIZE>10</SIZE>
-				<ALT_THAI>ชื่อบริษัท</ALT_THAI>
-				<ALT_ENG>Company Name</ALT_ENG>
+				<ALT_THAI>รหัสสาขา</ALT_THAI>
+				<ALT_ENG>Branch Name</ALT_ENG>
 			</COMPONENT>
 			<APPNAME name="TRAINING">
 				<DESC_ENG>Branch ID</DESC_ENG>

hrAppWeb.war/COMPANY/CI_01_14_GPF.jsp

@@ -119,6 +119,9 @@ function goHelp(helpName,inputName){
 		else if(inputName=="__edubranch" )
 		 	helpReturn="__edubranch:majorid,MMAJOR@EDESC";
 
+		else if(inputName=="__companyid" )
+		 	helpReturn="__companyid:companyid,MCOMPANY@ENAME";
+
 		else if(inputName=="__branchid" )
 		 	helpReturn="__branchid:branchid,MBRANCH@EDESC";
 
@@ -262,6 +265,12 @@ function goHelp(helpName,inputName){
                       <input name="MBRANCH@EDESC" type="text" disabled="true" size="30" value="<%=screen.getDataLabel("MBRANCH","TDESC")%>">
                 </font></td>
               </tr>
+              <tr>
+                <td  class="columnlabel"><%=screen.getLabel("COMPANYID")%>&nbsp;</td>
+                <td><font class="normal"> <%=screen.getInput("COMPANYID")%>
+                      <input name="MCOMPANY@ENAME" type="text" disabled="true" size="30" value="<%=screen.getDataLabel("MCOMPANY","TNAME")%>">
+                </font></td>
+              </tr>
               <!-- <tr>
                 <td  class="columnlabel"><%//=screen.getLabel("BRANCH_TITLE")%>&nbsp;</td>
                 <td><font class="normal"> <%//=screen.getInput("BRANCH_TITLE")%>