Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

xml/event/tricker.ev

@@ -60,7 +60,6 @@ If SystemDateMonthInt = 10 Then
 	EndIf
 EndIf
 
-DEBUGVAR PepweenEnable
 
 If SystemDateMonthInt = 11 Then
 	Var PepweenEnable = 0
@@ -68,7 +67,6 @@ EndIf
 
 
 
-
 If BoxID = 173149 Then
 	Var PepweenEnable = 1
 	Var MilkChoiceVeganEnable = 1

xml/page_remove_cup.xml

@@ -14,8 +14,7 @@
 	READ_FILE "/mnt/sdcard/coffeevending/country/short" StrCountryShort
 	DEBUGVAR StrCountryShort
 	If StrCountryShort = "MYS" Then
-		Var CountryName = "Malaysia"
-		Var show_eng = "true"
+		Open "ROOT/taobin_project/inter/mys/xml/page_remove_cup.lxml"
 	EndIf
 
 	If StrCountryShort = "AUS" Then
@@ -165,4 +164,4 @@
 </Text>
 
 
-</Page>
+</Page>