CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: Accounting Migrate Opening Balances view

Browse Source
This commit is contained in:
Jose Alberto Hernandez
2024-05-26 19:12:58 -06:00
committed by Jose Alberto Hernandez
parent 3cc27c5206
commit 545a998426
20 changed files with 132 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/products/charges/create-charge/create-charge.component.html
+4 -9
View File
@@ -191,15 +191,10 @@
</div>
</div>
<mat-form-field *ngIf="chargeForm.controls.chargeAppliesTo.value === 3" fxFlex="48%">
<mat-label>{{"labels.inputs.Income from Charge" | translate}} </mat-label>
<mat-select formControlName="incomeAccountId">
<mat-option *ngFor="let incomeOrLiabilityAccount of incomeAndLiabilityAccountData"
[value]="incomeOrLiabilityAccount.id">
{{ incomeOrLiabilityAccount.name }}
</mat-option>
</mat-select>
</mat-form-field>
<mifosx-gl-account-selector fxFlex="48%" *ngIf="chargeForm.controls.chargeAppliesTo.value === 3"
[inputFormControl]="chargeForm.controls.incomeAccountId"
[glAccountList]="incomeAndLiabilityAccountData" [inputLabel]="'Income from Charge'">
</mifosx-gl-account-selector>
<mat-form-field fxFlex="48%">
<mat-label>{{"labels.inputs.Tax Group" | translate}}</mat-label>
src/app/products/charges/edit-charge/edit-charge.component.html
+4 -12
View File
@@ -105,18 +105,10 @@
<input matInput autofocus formControlName="maxCap">
</mat-form-field>
<mat-form-field fxFlex="48%" *ngIf="showGLAccount">
<mat-label>{{"labels.inputs.Income from charge" | translate}}</mat-label>
<mat-select required formControlName="incomeAccountId">
<mat-option *ngFor="let income of chargeData.incomeOrLiabilityAccountOptions.incomeAccountOptions"
[value]="income.id">
{{ income.name }}
</mat-option>
</mat-select>
<mat-error *ngIf="chargeForm.controls.incomeAccountId.hasError('required')">
{{"labels.inputs.Income from charge" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
</mat-error>
</mat-form-field>
<mifosx-gl-account-selector fxFlex="48%" *ngIf="showGLAccount"
[inputFormControl]="chargeForm.controls.incomeAccountId"
[glAccountList]="chargeData.incomeOrLiabilityAccountOptions.incomeAccountOptions" [required]="true" [inputLabel]="'Income from Charge'">
</mifosx-gl-account-selector>
<mat-form-field fxFlex="48%">
<mat-label>{{"labels.inputs.Tax Group" | translate}}</mat-label>
src/app/products/charges/view-charge/view-charge.component.html
+3 -7
View File
@@ -122,13 +122,9 @@
{{ chargeData.feeInterval }}
</div>
<div fxFlex="50%" class="mat-body-strong" *ngIf="chargeData.incomeOrLiabilityAccount">
{{"labels.heading.Income" | translate}} {{"labels.inputs.From" | translate}} {{"labels.heading.Charges" | translate}}
</div>
<div fxFlex="50%" *ngIf="chargeData.incomeOrLiabilityAccount">
{{ chargeData.incomeOrLiabilityAccount.name + ' (' + chargeData.incomeOrLiabilityAccount.glCode + ')' }}
</div>
<mifosx-gl-account-display fxFlex="100%" [accountTitle]="'Income From Charges'" *ngIf="chargeData.incomeOrLiabilityAccount"
[glAccount]="chargeData.incomeOrLiabilityAccount" [withTitle]="'50%'">
</mifosx-gl-account-display>
<div fxFlex="50%" class="mat-body-strong" *ngIf="chargeData.taxGroup">
{{"labels.inputs.Tax Group" | translate}}