Tag: v7.0.2

Fix: Attendance Type and Account Type objects were borking as their convenience methods were not returning anything
Fix: Employee Benefits and Incentive post voucher did not reload the page
Fix: For all vouchers, to prevent double data loading on save / update either reload data or navigate, don't reload data and then navigate so that the data appears once and then disappears

overlord/src/app/payment/payment.component.ts

@@ -17,7 +17,7 @@ import {ToasterService} from '../core/toaster.service';
 import {debounceTime, distinctUntilChanged, map, startWith, switchMap} from 'rxjs/operators';
 import {PaymentDialogComponent} from './payment-dialog.component';
 import {ImageDialogComponent} from '../shared/image-dialog/image-dialog.component';
-import {Hotkey, HotkeysService} from "angular2-hotkeys";
+import {Hotkey, HotkeysService} from 'angular2-hotkeys';
 
 @Component({
   selector: 'app-payment',
@@ -229,12 +229,16 @@ export class PaymentComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   save() {
-    this.ser.saveOrUpdate(this.getVoucher())
+    const voucher: Voucher = this.getVoucher();
+    this.ser.saveOrUpdate(voucher)
       .subscribe(
         (result) => {
-          this.loadVoucher(result);
           this.toaster.show('Success', '');
+          if (voucher.id === result.id) {
+            this.loadVoucher(result);
+          } else {
           this.router.navigate(['/payment', result.id]);
+          }
         },
         (error) => {
           this.toaster.show('Danger', error);