Merge remote-tracking branch 'origin/master'

frame/ATTP.FR6

@@ -12,16 +12,16 @@ Version 50 TradeDesign®
                         Datafield PAYUIL T 2 1 0 1 0 {<embedded>} {Uil Payment} 1
                         Datafield shktyp T 12 1 0 1 0 {} {static text (收汇款对象)} 1
                         Datafield SYSNO T 21 1 0 1 0 {} {清算编号} 1
-                        Datafield TRNTYP T 1 1 0 1 0 {<embedded>} {汇款性'} 1
+                        Datafield TRNTYP T 1 1 0 1 0 {<embedded>} {汇款性�'�} 1
                         Datafield SWFTYP T 6 1 0 1 0 {<embedded>} {报文类型} 1
                         Datafield OPNDAT D 12 0 7 1 0 {} {起息日期}
                         Datafield BUSTYP T 2 1 2 1 0 {<embedded>} {业务种类} 1
-                        Datafield ACCTYP T 2 1 2 1 0 {<embedded>} {汇款人'户性'} 1
+                        Datafield ACCTYP T 2 1 2 1 0 {<embedded>} {汇款人�'�户性�'�} 1
                         Datafield COMMET B 35 6 1 1 0 {} {附言} 4
                         Datafield RESBCH T 11 1 0 1 0 {} {接收行BIC} 1
                         Datafield RESBCHNAM T 42 1 0 1 0 {} {接收行名称} 1
                         Datafield opndatlab T 8 1 5 1 0 {} {日期标签} 1
-                        Datafield FEETYP T 3 1 0 1 0 {<embedded>} {'用类型} 1
+                        Datafield FEETYP T 3 1 0 1 0 {<embedded>} {�'�用类型} 1
                         Datafield SNDLAB T 10 1 5 1 0 {} {SND Rol  Lable} 1
                         Datafield ORCNAM T 65 1 0 1 0 {} {汇款人名称} 1
                         Datafield PYENAM T 65 1 0 1 0 {} {收款人名称} 1
@@ -35,9 +35,9 @@ Version 50 TradeDesign®
                         Datafield DFDFLG T 1 1 0 1 0 {} {同业代付} 1
                         Datafield SNDBCH T 11 1 0 1 0 {} {发报行BIC} 1
                         Datafield SNDBCHNAM T 42 1 0 1 0 {} {发报行名称} 1
-                        Datafield ACCMOD T 4 1 0 1 0 {} {'户类型} 1
-                        Datafield COMMETLAB T 12 1 5 1 0 {} {自'区备注label} 1
-                        Datafield COMSYSTBL T 1 1 0 1 0 {COMTBL} {自'区备注} 24
+                        Datafield ACCMOD T 4 1 0 1 0 {} {�'�户类型} 1
+                        Datafield COMMETLAB T 12 1 5 1 0 {} {自�'�区备注label} 1
+                        Datafield COMSYSTBL T 1 1 0 1 0 {COMTBL} {自�'�区备注} 24
                         Datafield SERPTY C 12 1 6 1 0 {} {查询客户号}
                         Datafield COUNTRY T 3 1 0 1 0 {} {付款人常驻国家/地区编码} 1
                         Datafield SELBUT1 C 3 1 6 1 0 {} {?}
@@ -620,7 +620,7 @@ Version 50 TradeDesign®
 20120828172614 YL       SourceLine function checkmarks( in strtxt text ) : boolean method
 20150416175200 CGL      SourceLine 
 20150416175210 CGL      SourceLine #$marks = "'R0000029
-20150416175214 CGL      SourceLine $marks = "'`~!@#$%^&*-_=+[]{}\;':<>?/,."
+20150416175214 CGL      SourceLine $marks = "'`~!@#$%^&*-_=+[]{}\\;':<>?/,."
 20120731101323 YL       SourceLine $CnMarks = ""
 20120730175143 YL       SourceLine $n = Len( $marks )
 20120730175201 YL       SourceLine for $i = 1 to $n

frame/FILTSK.FR2

@@ -157,7 +157,7 @@ Version 50 TradeDesign®
                         SourceLine # returns false if no such entry exists
                         SourceLine 
                         SourceLine \Filtsk\nxtidx = \Filtsk\nxtidx + 1
-                        SourceLine IF \Filtsk\nxtidx <= GridCount ( \FILtsk\FILshw ) then
+                        SourceLine if \Filtsk\nxtidx <= GridCount ( \FILtsk\FILshw ) then
                         SourceLine     \filename = \FILtsk\FILshw( \Filtsk\nxtidx )\filename
                         SourceLine     \SRCFLG   = \FILtsk\FILshw( \Filtsk\nxtidx )\SRCFLG
                         SourceLine   return true

frame/LTTOPN.TR6

@@ -120,7 +120,7 @@ Version 50 TradeDesign®
 20080114145352 WCX      SourceLine 
 20080114145352 WCX      SourceLine if not IsEmpty( \LTDGRP\BLK\FEETXT ) then
 20080114145352 WCX      SourceLine   print using detailline, 'LG000548', \LTDGRP\BLK\FEETXT
-20080114145352 WCX      SourceLine endif :
+20080114145352 WCX      SourceLine endif
 20080114145352 WCX      SourceLine if not IsEmpty( \LTDGRP\BLK\PREPER ) then
 20080114145352 WCX      SourceLine   print using detailline, 'LG000549', \LTDGRP\BLK\PREPER
 20080114145352 WCX      SourceLine endif

frame/ptyp.fr8

@@ -78,7 +78,7 @@ Version 50 TradeDesign®
 20030311       AB       SourceLine 
 20030826       MS       SourceLine $col1 = 'LI000618'
 20030826       MS       SourceLine $col3 = 'LI000619'
-20030311       AB       SourceLine if not IsEmpty( PTYGRP\ADRMAA\POB ) or not IsEmpty( PTYGRP\ADRMAA\POBZIP ) not IsEmpty( PTYGRP\ADRMAA\POBTXT ) then
+20030311       AB       SourceLine if not IsEmpty( PTYGRP\ADRMAA\POB ) or not IsEmpty( PTYGRP\ADRMAA\POBZIP ) or not IsEmpty( PTYGRP\ADRMAA\POBTXT ) then
 20030311       AB       SourceLine   $col2 = PTYGRP\ADRMAA\POB
 20030311       AB       SourceLine   $col4 = PTYGRP\ADRMAA\POBZIP + " " + PTYGRP\ADRMAA\POBTXT
 20030311       AB       SourceLine else
@@ -390,7 +390,7 @@ Version 50 TradeDesign®
 20030310       AB       SourceLine     endif
 20030310       AB       SourceLine   next $idx
 20030310       AB       SourceLine else
-20060117       BC       SourceLine   if ErrorCode = tdOdbcNotFound then
+20060117       BC       SourceLine   if ErrorCode == tdOdbcNotFound then
 20060117       BC       SourceLine     SetErrorCode( 0, "" )
 20060117       BC       SourceLine     print using lineempty, 'LI000560'
 20060117       BC       SourceLine   else