Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_header_wfl.lwm

src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_reverse_wfl.lwm

@@ -46,7 +46,7 @@
                      t1.journal_type,
                      (select t.post_gl_status
                         from hls_journal_header t
-                       where t.journal_num = t1.journal_num) post_gl_status
+                       where t.journal_header_imp_id = t1.journal_header_id) post_gl_status
                 FROM hls_journal_header_imp t1
                  #WHERE_CLAUSE#
                  order by t1.journal_header_id desc