Clone เมนูใหม่ ทะเบียนสาขาบริษัท PRU009_BRANCH

9f24b952 · Thitichaipun Wutthisak · e6d4ebec · 9f24b952 · 9f24b952 · 9f24b952
Commit 9f24b952 authored Dec 04, 2020 by Thitichaipun Wutthisak
Showing with 244 additions and 17 deletions

PRU009.xml XML/DBXML/COMPANY/PRU009.xml +18 -0

MBRANCHHELP.xml XML/DBXML/MBRANCHHELP.xml +4 -0

MBRANCH.xml XML/PROTABLEXML/MBRANCH.xml +216 -15

MCOM_TYPE.xml XML/PROTABLEXML/MCOM_TYPE.xml +6 -2

No files found.
--- a/XML/DBXML/COMPANY/PRU009.xml
+++ b/XML/DBXML/COMPANY/PRU009.xml
@@ -44,6 +44,10 @@
 		<FIELD>brand_tdesc</FIELD>
 		<FIELD>brand_edesc</FIELD>
 		<FIELD>logo</FIELD>
+		<FIELD>iscompany</FIELD>
+		<FIELD>isbranch</FIELD>
+		<FIELD>headcompany</FIELD>
+		<FIELD>branch_tax</FIELD>
 		<ORDER>
 			<FIELD>branchid</FIELD>
 		</ORDER>
@@ -90,6 +94,20 @@
 			<FIELD>branch_no</FIELD>
 		</ORDER>
 	</TABLE>
+	<TABLE name="mcom_type" status="center" central="false" out="inquiry">
+		<FIELD>codeid</FIELD>
+		<FIELD>tdesc</FIELD>
+		<FIELD>edesc</FIELD>
+		<FIELD>edit_by</FIELD>
+		<FIELD>edit_date</FIELD>
+		<FIELD>edit_time</FIELD>
+		<FIELD>approve</FIELD>
+		<FIELD>verified</FIELD>
+		<!--FIELD>companyid</FIELD-->
+		<ORDER>
+			<FIELD>codeid</FIELD>
+		</ORDER>
+	</TABLE>
 	<TABLE name="mcompany" status="center" central="false" out="inquiry">
 		<FIELD>companyid</FIELD>
 		<FIELD>tname</FIELD>

--- a/XML/DBXML/MBRANCHHELP.xml
+++ b/XML/DBXML/MBRANCHHELP.xml
@@ -39,6 +39,10 @@
 		<FIELD>approve</FIELD>
 		<FIELD>verified</FIELD>
 		<FIELD>companyid</FIELD>
+		<FIELD>iscompany</FIELD>
+		<FIELD>isbranch</FIELD>
+		<FIELD>headcompany</FIELD>
+		<FIELD>branch_tax</FIELD>
 		<FIELD>runno</FIELD>
 		<ORDER>
 			<FIELD>branchid</FIELD>

--- a/XML/PROTABLEXML/MBRANCH.xml
+++ b/XML/PROTABLEXML/MBRANCH.xml
@@ -4,13 +4,13 @@
 		<BRANCHID lang="A" encrypt="false" log="false" type="String">
 			<KEY>1</KEY>
 			<WIDTH>5</WIDTH>
-			<DESC_ENG>Company ID</DESC_ENG>
-			<DESC_THAI>รหัสบริษัท</DESC_THAI>
+			<DESC_ENG>Branch ID</DESC_ENG>
+			<DESC_THAI>รหัสสาขา</DESC_THAI>
 			<COMPONENT type="text">
 				<MAXSIZE>5</MAXSIZE>
 				<SIZE>5</SIZE>
-				<ALT_THAI>รหัสบริษัท</ALT_THAI>
-				<ALT_ENG>Company ID</ALT_ENG>
+				<ALT_THAI>รหัสสาขา</ALT_THAI>
+				<ALT_ENG>Branch ID</ALT_ENG>
 			</COMPONENT>
 			<REQUIRE>true</REQUIRE>
 		</BRANCHID>
@@ -29,11 +29,11 @@
 			</COMPONENT>
 		</COMPANYID>
 		<SOC_BRANCHID lang="A" encrypt="false" log="false" type="String">
-			<WIDTH>5</WIDTH>
+			<WIDTH>10</WIDTH>
 			<DESC_ENG>BranchID of Soc. Sec.</DESC_ENG>
 			<DESC_THAI>สาขาของประกันสังคม</DESC_THAI>
 			<COMPONENT type="text">
-				<MAXSIZE>5</MAXSIZE>
+				<MAXSIZE>10</MAXSIZE>
 				<SIZE>5</SIZE>
 				<ALT_THAI>สาขาของประกันสังคม</ALT_THAI>
 				<ALT_ENG>BranchID of Soc. Sec.</ALT_ENG>
@@ -70,6 +70,18 @@
 				</COMPONENT>
 			</APPNAME>
 		</TAX_BRANCHID>
+		<BRANCH_TAX lang="A" encrypt="false" log="false" type="String">
+			<WIDTH>5</WIDTH>
+			<DESC_ENG>Branch Tax</DESC_ENG>
+			<DESC_THAI>เลขที่สาขาผู้เสียภาษีเงินได้</DESC_THAI>
+			<COMPONENT type="text">
+				<MAXSIZE>5</MAXSIZE>
+				<SIZE>5</SIZE>
+				<ALT_ENG>Branch Tax</ALT_ENG>
+				<ALT_THAI>เลขที่สาขาผู้เสียภาษีเงินได้</ALT_THAI>
+			</COMPONENT>
+			<REQUIRE>true</REQUIRE>
+		</BRANCH_TAX>
 		<TDESC lang="T" encrypt="false" log="true" type="String">
 			<WIDTH>100</WIDTH>
 			<REFER_LANG>EDESC</REFER_LANG>
@@ -131,12 +143,12 @@
 		</FAX>
 		<WEBSITE lang="A" encrypt="false" log="false" type="String">
 			<WIDTH>100</WIDTH>
-			<DESC_ENG>Web Site</DESC_ENG>
+			<DESC_ENG>Website</DESC_ENG>
 			<DESC_THAI>ชื่อเว็บไซต์</DESC_THAI>
 			<COMPONENT type="text">
 				<MAXSIZE>100</MAXSIZE>
 				<SIZE>70</SIZE>
-				<ALT_ENG>Web Site</ALT_ENG>
+				<ALT_ENG>Website</ALT_ENG>
 				<ALT_THAI>ชื่อเว็บไซต์</ALT_THAI>
 				<ONKEYPRESS>chkNotThaiChaOnly();</ONKEYPRESS>
 				<ONBLUR>checkWeb(this);</ONBLUR>
@@ -178,12 +190,12 @@
 		</SOC_SIGN_POS>
 		<TAX_SIGN_NAME lang="A" encrypt="false" log="false" type="String">
 			<WIDTH>100</WIDTH>
-			<DESC_ENG>Phor Ngor Dor Authorized Signature</DESC_ENG>
+			<DESC_ENG>PND. Authorized Signature</DESC_ENG>
 			<DESC_THAI>ผู้มีอำนาจลงนามใน ภงด.</DESC_THAI>
 			<COMPONENT type="text">
 				<MAXSIZE>100</MAXSIZE>
 				<SIZE>70</SIZE>
-				<ALT_ENG>Phor Ngor Dor Authorized Signature</ALT_ENG>
+				<ALT_ENG>PND. Authorized Signature</ALT_ENG>
 				<ALT_THAI>ผู้มีอำนาจลงนามใน ภงด.</ALT_THAI>
 			</COMPONENT>
 			<APPNAME name="PERSONAL">
@@ -211,15 +223,15 @@
 		<BRANCH_NO lang="A" encrypt="false" log="true" type="String">
 			<WIDTH>10</WIDTH>
 			<RELATION>MBRANCH_SOC_TAX</RELATION>
-			<DESC_ENG>Branch Number</DESC_ENG>
-			<DESC_THAI>ลำดับที่สาขา</DESC_THAI>
+			<DESC_ENG>Social Branch</DESC_ENG>
+			<DESC_THAI>สาขาประกันสังคม</DESC_THAI>
 			<COMPONENT type="text">
 				<MAXSIZE>10</MAXSIZE>
 				<SIZE>6</SIZE>
-				<ALT_ENG>Branch Number</ALT_ENG>
-				<ALT_THAI>ลำดับที่สาขา</ALT_THAI>
+				<ALT_ENG>Social Branch</ALT_ENG>
+				<ALT_THAI>สาขาประกันสังคม</ALT_THAI>
 			</COMPONENT>
-			<REQUIRE>true</REQUIRE>
+			<!-- <REQUIRE>true</REQUIRE> -->
 			<APPNAME name="PAYROLL,PERSONAL,TA,WELFARE">
 				<DESC_ENG>Branch Number</DESC_ENG>
 				<DESC_THAI>ลำดับที่สาขา</DESC_THAI>
@@ -468,6 +480,19 @@
 				<ALT_THAI>ตำบล/แขวง (อังกฤษ)</ALT_THAI>
 			</COMPONENT>
 		</ESUBDISTRICT>
+		<AMPHUR lang="A" encrypt="false" log="false" type="String">
+			<WIDTH>100</WIDTH>
+			<RELATION>CSCZIPCODE</RELATION>
+			<DESC_ENG>Amphur (Thai)</DESC_ENG>
+			<DESC_THAI>อำเภอ (ไทย)</DESC_THAI>
+			<COMPONENT type="text">
+				<MAXSIZE>100</MAXSIZE>
+				<SIZE>70</SIZE>
+				<ALT_ENG>Amphur (Thai)</ALT_ENG>
+				<ALT_THAI>อำเภอ (ไทย)</ALT_THAI>
+			</COMPONENT>
+			<REQUIRE>true</REQUIRE>
+		</AMPHUR>
 		<ZIPCODE lang="A" encrypt="false" log="false" type="String">
 			<WIDTH>5</WIDTH>
 			<RELATION>MZIPCODE</RELATION>
@@ -495,6 +520,19 @@
 				<ALT_THAI>รหัสอำเภอ</ALT_THAI>
 			</COMPONENT>
 		</DISTRICTID>
+		<PROVINCE lang="A" encrypt="false" verify="false" log="false" type="String">
+			<WIDTH>5</WIDTH>
+			<DESC_ENG>Province ID</DESC_ENG>
+			<DESC_THAI>รหัสจังหวัด</DESC_THAI>
+			<RELATION>CSCZIPCODE</RELATION>
+			<COMPONENT type="text">
+				<MAXSIZE>5</MAXSIZE>
+				<SIZE>5</SIZE>
+				<ALT_THAI>รหัสจังหวัด</ALT_THAI>
+				<ALT_ENG>Province ID</ALT_ENG>
+				<REQUIRE>true</REQUIRE>
+			</COMPONENT>
+		</PROVINCE>
 		<BRAND_TDESC lang="T" encrypt="false" log="true" type="String">
 			<WIDTH>100</WIDTH>
 			<REFER_LANG>BRAND_EDESC</REFER_LANG>
@@ -530,6 +568,77 @@
 				<ALT_THAI>เครื่องหมายทางการค้า</ALT_THAI>
 			</COMPONENT>
 		</LOGO>
+		<COM_TYPE lang="A" encrypt="false" log="false" type="String">
+			<WIDTH>3</WIDTH>
+			<RELATION>MCOM_TYPE</RELATION>
+			<DESC_ENG>Business Type</DESC_ENG>
+			<DESC_THAI>ประเภทบริษัท</DESC_THAI>
+			<COMPONENT type="text">
+				<MAXSIZE>3</MAXSIZE>
+				<SIZE>3</SIZE>
+				<ALT_ENG>Business Type</ALT_ENG>
+				<ALT_THAI>ประเภทบริษัท</ALT_THAI>
+			</COMPONENT>
+			<REQUIRE>TRUE</REQUIRE>
+		</COM_TYPE>
+		<ISCOMPANY lang="A" encrypt="false" log="false" type="String">
+			<WIDTH>1</WIDTH>
+			<DESC_ENG>ISCOMPANY</DESC_ENG>
+			<DESC_THAI>ISCOMPANY</DESC_THAI>
+			<COMPONENT type="hidden">
+				<MAXSIZE>1</MAXSIZE>
+				<SIZE>1</SIZE>
+				<ALT_ENG>ISCOMPANY</ALT_ENG>
+				<ALT_THAI>ISCOMPANY</ALT_THAI>
+			</COMPONENT>
+		</ISCOMPANY>
+		<ISBRANCH lang="A" encrypt="false" log="false" type="String">
+			<WIDTH>1</WIDTH>
+			<DESC_ENG>ISBRANCH</DESC_ENG>
+			<DESC_THAI>ISBRANCH</DESC_THAI>
+			<COMPONENT type="hidden">
+				<MAXSIZE>1</MAXSIZE>
+				<SIZE>1</SIZE>
+				<ALT_ENG>ISBRANCH</ALT_ENG>
+				<ALT_THAI>ISBRANCH</ALT_THAI>
+			</COMPONENT>
+		</ISBRANCH>
+		<HEADCOMPANY lang="A" encrypt="false" log="false" type="String">
+			<WIDTH>5</WIDTH>
+			<RELATION>V1MBRANCH</RELATION>
+			<DESC_ENG>Company ID</DESC_ENG>
+			<DESC_THAI>รหัสบริษัท</DESC_THAI>
+			<COMPONENT type="text">
+				<MAXSIZE>5</MAXSIZE>
+				<SIZE>5</SIZE>
+				<ALT_THAI>รหัสบริษัท</ALT_THAI>
+				<ALT_ENG>Company ID</ALT_ENG>
+			</COMPONENT>
+		</HEADCOMPANY>
+		<TSUBDISTRICT lang="T" encrypt="false" log="true" type="String">
+			<WIDTH>50</WIDTH>
+			<REFER_LANG>ESUBDISTRICT</REFER_LANG>
+			<DESC_ENG>Sub-District (Thai)</DESC_ENG>
+			<DESC_THAI>ตำบล/แขวง (ไทย)</DESC_THAI>
+			<COMPONENT type="text">
+				<MAXSIZE>50</MAXSIZE>
+				<SIZE>50</SIZE>
+				<ALT_ENG>Sub-District (Thai)</ALT_ENG>
+				<ALT_THAI>ตำบล/แขวง (ไทย)</ALT_THAI>
+			</COMPONENT>
+		</TSUBDISTRICT>
+		<ESUBDISTRICT lang="E" encrypt="false" log="true" type="String">
+			<WIDTH>50</WIDTH>
+			<REFER_LANG>TSUBDISTRICT</REFER_LANG>
+			<DESC_ENG>Sub-District (Eng.)</DESC_ENG>
+			<DESC_THAI>ตำบล/แขวง (อังกฤษ)</DESC_THAI>
+			<COMPONENT type="text">
+				<MAXSIZE>50</MAXSIZE>
+				<SIZE>50</SIZE>
+				<ALT_ENG>Sub-District (Eng.)</ALT_ENG>
+				<ALT_THAI>ตำบล/แขวง (อังกฤษ)</ALT_THAI>
+			</COMPONENT>
+		</ESUBDISTRICT>
 	</FIELD>
 	<RELATION>
 		<MEMPLOYEE>
@@ -632,6 +741,18 @@ MCOMPANY dependlevel="true">
 			<CHILD>SIMMEMPLOYEE_TAX91KOR.BRANCH</CHILD>
 			<CHILD>SIMMEMPLOYEE_TAX91KOR.COMPANYID</CHILD>
 		</SIMMEMPLOYEE_TAX91KOR>
+		<V1CSCZIPCODE rtablename="CSCZIPCODE" dependlevel="false">
+			<PARENT>MBRANCH.ZIPCODE</PARENT>
+			<PARENT>MBRANCH.AMPHUR</PARENT>
+			<CHILD>V1CSCZIPCODE.ZIPCODE</CHILD>
+			<CHILD>V1CSCZIPCODE.TAMPHUR</CHILD>
+		</V1CSCZIPCODE>
+		<V2CSCZIPCODE rtablename="CSCZIPCODE" dependlevel="false">
+			<PARENT>MBRANCH.ZIPCODE</PARENT>
+			<PARENT>MBRANCH.AMPHUR</PARENT>
+			<CHILD>V2CSCZIPCODE.ZIPCODE</CHILD>
+			<CHILD>V2CSCZIPCODE.TAMPHUR</CHILD>
+		</V2CSCZIPCODE>
 		<TTIME_CURRENT1>
 			<PARENT>MBRANCH.BRANCHID</PARENT>
 			<PARENT>MBRANCH.COMPANYID</PARENT>
@@ -717,6 +838,12 @@ MCOMPANY dependlevel="true">
 			<CHILD>TOT_M_DATE0.BRANCH</CHILD>
 			<CHILD>TOT_M_DATE0.COMPANYID</CHILD>
 		</TOT_M_DATE0>
+		<TOT_M_DATE1>
+			<PARENT>MBRANCH.BRANCHID</PARENT>
+			<PARENT>MBRANCH.COMPANYID</PARENT>
+			<CHILD>TOT_M_DATE1.BRANCH</CHILD>
+			<CHILD>TOT_M_DATE1.COMPANYID</CHILD>
+		</TOT_M_DATE1>
 		<TOT1>
 			<PARENT>MBRANCH.BRANCHID</PARENT>
 			<PARENT>MBRANCH.COMPANYID</PARENT>
@@ -864,11 +991,85 @@ MCOMPANY dependlevel="true">
 			<CHILD>TLEAVE_SUMMARY.BRANCH</CHILD>
 			<CHILD>TLEAVE_SUMMARY.COMPANYID</CHILD>
 		</TLEAVE_SUMMARY>
+		<!--  Edit 17/01/2560 By Uniga by App p'fon -->
+		<MGROUP_BRANCH_RH>
+			<PARENT>MBRANCH.BRANCHID</PARENT>
+			<PARENT>MBRANCH.COMPANYID</PARENT>
+			<CHILD>MGROUP_BRANCH_RH.BRANCHID</CHILD>
+			<CHILD>MGROUP_BRANCH_RH.COMPANYID</CHILD>
+		</MGROUP_BRANCH_RH>
+		<MCORPORATE_YEAR_RH>
+			<PARENT>MBRANCH.BRANCHID</PARENT>
+			<PARENT>MBRANCH.COMPANYID</PARENT>
+			<CHILD>MCORPORATE_YEAR_RH.BRANCHID</CHILD>
+			<CHILD>MCORPORATE_YEAR_RH.COMPANYID</CHILD>
+		</MCORPORATE_YEAR_RH>
+		<MBU1_YEAR_RH>
+			<PARENT>MBRANCH.BRANCHID</PARENT>
+			<PARENT>MBRANCH.COMPANYID</PARENT>
+			<CHILD>MBU1_YEAR_RH.BRANCHID</CHILD>
+			<CHILD>MBU1_YEAR_RH.COMPANYID</CHILD>
+		</MBU1_YEAR_RH>
+		<MBU2_YEAR_RH>
+			<PARENT>MBRANCH.BRANCHID</PARENT>
+			<PARENT>MBRANCH.COMPANYID</PARENT>
+			<CHILD>MBU2_YEAR_RH.BRANCHID</CHILD>
+			<CHILD>MBU2_YEAR_RH.COMPANYID</CHILD>
+		</MBU2_YEAR_RH>
+		<MBU3_YEAR_RH>
+			<PARENT>MBRANCH.BRANCHID</PARENT>
+			<PARENT>MBRANCH.COMPANYID</PARENT>
+			<CHILD>MBU3_YEAR_RH.BRANCHID</CHILD>
+			<CHILD>MBU3_YEAR_RH.COMPANYID</CHILD>
+		</MBU3_YEAR_RH>
+		<!--   End Edit  -->
+		<HTRAINING>
+			<PARENT>MBRANCH.BRANCHID</PARENT>
+			<PARENT>MBRANCH.COMPANYID</PARENT>
+			<CHILD>HTRAINING.BRANCHID</CHILD>
+			<CHILD>HTRAINING.COMPANYID</CHILD>
+		</HTRAINING>
+		<TPVF_TRAN>
+			<PARENT>MBRANCH.BRANCHID</PARENT>
+			<PARENT>MBRANCH.COMPANYID</PARENT>
+			<CHILD>TPVF_TRAN.BRANCH</CHILD>
+			<CHILD>TPVF_TRAN.COMPANYID</CHILD>
+		</TPVF_TRAN>
+		<MBRANCH mode="-1">
+			<PARENT>V1MBRANCH.BRANCHID</PARENT>
+			<PARENT>V1MBRANCH.COMPANYID</PARENT>
+			<CHILD>MBRANCH.HEADCOMPANY</CHILD>
+			<CHILD>MBRANCH.COMPANYID</CHILD>
+		</MBRANCH>
+		<MCOM_PROFILE>
+			<PARENT>MBRANCH.BRANCHID</PARENT>
+			<PARENT>MBRANCH.COMPANYID</PARENT>
+			<CHILD>MCOM_PROFILE.BRANCHID</CHILD>
+			<CHILD>MCOM_PROFILE.COMPANYID</CHILD>
+		</MCOM_PROFILE>
+
+		<!--   add by Jumbo_Master by app p'fon  -->
+		<ACCOUNT_MAP_SAP>
+			<PARENT>MBRANCH.BRANCHID</PARENT>
+			<CHILD>ACCOUNT_MAP_SAP.BRANCHID</CHILD>
+		</ACCOUNT_MAP_SAP>
+
+		<TLEGAL_ALLOW>
+			<PARENT>MBRANCH.BRANCHID</PARENT>
+			<CHILD>TLEGAL_ALLOW.BRANCH</CHILD>
+		</TLEGAL_ALLOW>
+
 		<TPVF_TRAN>
 			<PARENT>MBRANCH.BRANCHID</PARENT>
 			<PARENT>MBRANCH.COMPANYID</PARENT>
 			<CHILD>TPVF_TRAN.BRANCH</CHILD>
 			<CHILD>TPVF_TRAN.COMPANYID</CHILD>
 		</TPVF_TRAN>
+		<MEMPL_TAXY deletelevel="1">
+			<PARENT>MBRANCH.BRANCHID</PARENT>
+			<PARENT>MBRANCH.COMPANYID</PARENT>
+			<CHILD>MEMPL_TAXY.BRANCH</CHILD>
+			<CHILD>MEMPL_TAXY.COMPANYID</CHILD>
+		</MEMPL_TAXY>
 	</RELATION>
 </MBRANCH>
--- a/XML/PROTABLEXML/MCOM_TYPE.xml
+++ b/XML/PROTABLEXML/MCOM_TYPE.xml
@@ -15,7 +15,7 @@
 		</CODEID>
 		<TDESC lang="T" encrypt="false" log="true" type="String">
 			<WIDTH>100</WIDTH>
-			<REFER_LANG>EDESC</REFER_LANG>
+			<REFER_LANG>TDESC</REFER_LANG>
 			<DESC_ENG>Desc. (Thai)</DESC_ENG>
 			<DESC_THAI>รายละเอียด (ไทย)</DESC_THAI>
 			<COMPONENT type="text">
@@ -28,7 +28,7 @@
 		</TDESC>
 		<EDESC lang="E" encrypt="false" log="true" type="String">
 			<WIDTH>100</WIDTH>
-			<REFER_LANG>TDESC</REFER_LANG>
+			<REFER_LANG>EDESC</REFER_LANG>
 			<DESC_ENG>Desc. (Eng)</DESC_ENG>
 			<DESC_THAI>รายละเอียด (อังกฤษ)</DESC_THAI>
 			<COMPONENT type="text">
@@ -56,5 +56,9 @@
 			<PARENT>MCOM_TYPE.CODEID</PARENT>
 			<CHILD>MCOMPANY.COM_TYPE</CHILD>
 		</MCOMPANY>
+		<MBRANCH>
+			<PARENT>MCOM_TYPE.CODEID</PARENT>
+			<CHILD>MBRANCH.COM_TYPE</CHILD>
+		</MBRANCH>
 	</RELATION>
 </MCOM_TYPE>