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

atms-web/src/main/webapp/app/vat/preview/vat-preview-trial-balance/vat-preview-trial-balance.ctrl.js

@@ -331,9 +331,9 @@
                  { name: $translate.instant('Alternate1Description'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment9Name}}</span></div>' },
                  { name: $translate.instant('Alternate2Description'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment10Name}}</span></div>' },
                  { name: $translate.instant('BegBal'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.begBalBeq}}</span></div>' },
-                 { name: $translate.instant('DebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.endBalBeq}}</span></div>' },
-                 { name: $translate.instant('CreditAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodDrBeq}}</span></div>' },
-                 { name: $translate.instant('EndingBalance'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodCrBeq}}</span></div>' },
+                 { name: $translate.instant('DebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodDrBeq}}</span></div>' },
+                 { name: $translate.instant('CreditAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodCrBeq}}</span></div>' },
+                 { name: $translate.instant('EndingBalance'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.endBalBeq}}</span></div>' },
                  { name: $translate.instant('SeasonDebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.qtdDrBeq}}</span></div>' },
                  { name: $translate.instant('SeasonCreditsAmount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.qtdCrBeq}}</span></div>' }
                 ]