Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

# Conflicts:
#	atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js

atms-web/src/main/webapp/Scripts/module-part2.js

@@ -847,7 +847,7 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
                                 appTranslation.load([appTranslation.cit]);
                             }
                         ],
-                        template: '<cit-preview-account-voucher></cit-preview-account-voucher>'
+                        template: '<cit-preview-salary-advance-list></cit-preview-salary-advance-list>'
                     }
                 },
                 resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),