form 91/98 report, min max value update in AML rule and whihc rule apply day, week, month and some more updates
This commit is contained in:
@@ -122,11 +122,52 @@
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- GL mapping toolbar -->
|
||||
<div class="oss-gl-bar" [class.on]="glMapMode">
|
||||
<div class="oss-gl-bar-l">
|
||||
<fa-icon icon="project-diagram"></fa-icon>
|
||||
<span>
|
||||
<strong>General Ledger mapping</strong>
|
||||
@if (glMappedCount) {
|
||||
<span class="oss-gl-count">{{ glMappedCount }} line(s) mapped</span>
|
||||
} @else {
|
||||
<span class="muted"> — pin GL accounts to a line and its figure comes from the ledger</span>
|
||||
}
|
||||
</span>
|
||||
</div>
|
||||
<div class="oss-gl-bar-r">
|
||||
@if (glMapMode) {
|
||||
@if (canSelectGlBranch) {
|
||||
<select class="oss-gl-inp" [(ngModel)]="glBranchCode">
|
||||
<option value="">All branches</option>
|
||||
@for (b of glBranches; track b.code) {
|
||||
<option [value]="b.code">{{ b.name }}</option>
|
||||
}
|
||||
</select>
|
||||
} @else {
|
||||
<span class="oss-gl-scope" title="Your login is restricted to this branch">
|
||||
<fa-icon icon="university"></fa-icon> {{ glScopeName }}
|
||||
</span>
|
||||
}
|
||||
@if (glMappedCount) {
|
||||
<button class="oss-btn oss-btn-clear" (click)="clearAllGlMappings()">Clear all</button>
|
||||
}
|
||||
}
|
||||
<button class="oss-btn" [class.oss-btn-xls]="!glMapMode" (click)="toggleGlMapMode()">
|
||||
<fa-icon [icon]="glMapMode ? 'times' : 'plus'"></fa-icon>
|
||||
{{ glMapMode ? 'Done' : 'Add / Remove GLs' }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="oss-tbl-wrap">
|
||||
<table class="oss-tbl">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Particulars</th>
|
||||
@if (glMapMode) {
|
||||
<th class="oss-gl-col">Mapped GL accounts</th>
|
||||
}
|
||||
<th class="ta-r">Rs in Thousand</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -134,8 +175,44 @@
|
||||
@for (line of earnings; track $index) {
|
||||
<tr [class.total-row]="line.total">
|
||||
<td [class]="'lvl-' + line.level">{{ line.label }}</td>
|
||||
<td class="ta-r mono" [class.derived]="line.total">
|
||||
{{ line.value === null ? '' : (line.value | number: line.count ? '1.0-0' : '1.2-2') }}
|
||||
@if (glMapMode) {
|
||||
<td>
|
||||
<div class="oss-gl-cell">
|
||||
@for (code of glCodesFor(line.label); track code) {
|
||||
<span class="oss-gl-chip">
|
||||
<span class="mono">{{ code }}</span>
|
||||
<button
|
||||
class="oss-gl-chip-x"
|
||||
(click)="removeGlFromLine(line.label, code)"
|
||||
[attr.aria-label]="'Remove ' + code"
|
||||
>
|
||||
<fa-icon icon="times"></fa-icon>
|
||||
</button>
|
||||
</span>
|
||||
}
|
||||
<button class="oss-gl-add" (click)="openGlPicker(line.label, line.value)">
|
||||
<fa-icon icon="plus"></fa-icon>
|
||||
{{ glCodesFor(line.label).length ? 'Edit' : 'Add GL' }}
|
||||
</button>
|
||||
@if (glDiffers(line.label, line.value)) {
|
||||
<span class="oss-gl-warn" title="Ledger figure differs from the value filed on the return">
|
||||
<fa-icon icon="exclamation-triangle"></fa-icon> differs from filed
|
||||
</span>
|
||||
}
|
||||
</div>
|
||||
</td>
|
||||
}
|
||||
<td
|
||||
class="ta-r mono"
|
||||
[class.derived]="line.total"
|
||||
[class.gl-sourced]="isGlMapped(line.label)"
|
||||
[class.gl-diff]="glDiffers(line.label, line.value)"
|
||||
>
|
||||
{{
|
||||
effectiveValue(line.label, line.value) === null
|
||||
? ''
|
||||
: (effectiveValue(line.label, line.value) | number: (line.count ? '1.0-0' : '1.2-2'))
|
||||
}}
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
@@ -186,9 +263,10 @@
|
||||
<div class="oss-balance" [class.oss-balance--bad]="!otherExpensesTally">
|
||||
<fa-icon [icon]="otherExpensesTally ? 'check-circle' : 'exclamation-triangle'"></fa-icon>
|
||||
<span>
|
||||
Detail total <strong>₹{{ otherExpensesTotal | number: '1.2-2' }}</strong> vs Earnings line 12 ix)
|
||||
Others
|
||||
<strong>₹{{ otherExpensesLineValue === null ? '—' : (otherExpensesLineValue | number: '1.2-2') }}</strong>
|
||||
Detail total <strong>₹{{ otherExpensesTotal | number: '1.2-2' }}</strong> vs Earnings line 12 ix) Others
|
||||
<strong
|
||||
>₹{{ otherExpensesLineValue === null ? '—' : (otherExpensesLineValue | number: '1.2-2') }}</strong
|
||||
>
|
||||
— {{ otherExpensesTally ? 'tallies' : 'MISMATCH — resolve before filing' }}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user