Merge branch 'feature-merge' into 'develop'

Feature merge

See merge request !1

333.txt

+sdfsd123
\ No newline at end of file

frame/AAMMOD.FR2

@@ -35,6 +35,7 @@ Version 50 TradeDesign®
 20030829       RI       SourceLine     ADDAMTFLG.set ( "X" )
 20030829       RI       SourceLine   endif
 20030829       RI       SourceLine endif
+                        sdfsd12124
                         Rule -1
 20030901       RI       SourceLine function InternalGetOldMaxaam : numeric
 20030901       RI       SourceLine #! Get Old amount of MAXAAM

frame/AAMMOD.FR5

@@ -17,8 +17,7 @@ Version 50 TradeDesign®
 20070202       MV       SourceLine     SysWarningSet( SYSWRNTypeWarning, "", "Addamtchk" )
 20070202       MV       SourceLine   endif
 20070202       MV       SourceLine endif
-sdfsdf
-
+sdfsdf45576575
 
                         FramePanel AAMDRWP PF000003 200 50 0 0 0 0 0 0 0 0
                         PComment These two transactions are showing the additional amounts on the right side of the panel, i.e. Label and amount in seperate lines

frame/AAMP.FR2

@@ -9,6 +9,7 @@ Version 50 TradeDesign®
                         Datafield PANSTA T 1 1 0 0 0 {} {Panel status} 1
                         DFComment The panel status of the panel using AAMP is to be linked.
                         Rule -1
+                        sdf
 20030829       RI       SourceLine default AAMP
 20030829       RI       SourceLine if IsEmpty( AAMMOD\ADDAMTFLG ) then
 20030829       RI       SourceLine   Invisible( AAMP )