taxtank-core 0.30.92 → 0.30.94
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/models/report/sole/sole-business/sole-business-loss-report.mjs +2 -2
- package/esm2020/lib/services/http/property/property-sale/property-sale.service.mjs +1 -1
- package/esm2020/lib/validators/transactions-meta-fields.validator.mjs +3 -3
- package/fesm2015/taxtank-core.mjs +3 -3
- package/fesm2015/taxtank-core.mjs.map +1 -1
- package/fesm2020/taxtank-core.mjs +3 -3
- package/fesm2020/taxtank-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -11,7 +11,7 @@ export class SoleBusinessLossReport extends AbstractModel {
|
|
|
11
11
|
const claimAmount = new TransactionCollection(transactions.toArray(), depreciations.toArray())
|
|
12
12
|
.getBusinessClaimAmount(new TransactionAllocationCollection(allocations), loss.business.id);
|
|
13
13
|
this.netIncome = claimAmount;
|
|
14
|
-
this.closeBalance = loss.offsetRule ? 0 : claimAmount - this.openBalance;
|
|
14
|
+
this.closeBalance = loss.offsetRule ? 0 : Math.min(0, claimAmount - this.openBalance);
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29sZS1idXNpbmVzcy1sb3NzLXJlcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9tb2RlbHMvcmVwb3J0L3NvbGUvc29sZS1idXNpbmVzcy9zb2xlLWJ1c2luZXNzLWxvc3MtcmVwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBeUIsK0JBQStCLEVBQUUscUJBQXFCLEVBQUMsTUFBTSx5QkFBeUIsQ0FBQztBQUN2SCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHdEQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLHNCQUF1QixTQUFRLGFBQWE7SUFhdkQsWUFBWSxJQUFzQixFQUFFLFlBQW1DLEVBQUUsYUFBcUMsRUFBRSxXQUFvQztRQUNsSixLQUFLLEVBQUUsQ0FBQztRQUNSLElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQztRQUNwQyxNQUFNLFdBQVcsR0FBRyxJQUFJLHFCQUFxQixDQUFDLFlBQVksQ0FBQyxPQUFPLEVBQUUsRUFBRSxhQUFhLENBQUMsT0FBTyxFQUFFLENBQUM7YUFDM0Ysc0JBQXNCLENBQUMsSUFBSSwrQkFBK0IsQ0FBQyxXQUFXLENBQUMsRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQzlGLElBQUksQ0FBQyxTQUFTLEdBQUcsV0FBVyxDQUFDO1FBRTdCLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxXQUFXLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ3hGLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFNvbGVCdXNpbmVzc0xvc3MgfSBmcm9tICcuLi8uLi8uLi9zb2xlJztcbmltcG9ydCB7RGVwcmVjaWF0aW9uQ29sbGVjdGlvbiwgVHJhbnNhY3Rpb25BbGxvY2F0aW9uQ29sbGVjdGlvbiwgVHJhbnNhY3Rpb25Db2xsZWN0aW9ufSBmcm9tICcuLi8uLi8uLi8uLi9jb2xsZWN0aW9ucyc7XG5pbXBvcnQgeyBBYnN0cmFjdE1vZGVsIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvTW9kZWxzJztcbmltcG9ydCB7VHJhbnNhY3Rpb25BbGxvY2F0aW9ufSBmcm9tICcuLi8uLi8uLi90cmFuc2FjdGlvbic7XG5cbi8qKlxuICogQ2xhc3Mgd2l0aCBidXNpbmVzcyBsb3NzIGRldGFpbHNcbiAqIGh0dHBzOi8vdGF4dGFuay5hdGxhc3NpYW4ubmV0L3dpa2kvc3BhY2VzL1RBWFRBTksvcGFnZXMvNDY0MTM1NzkzMC9SdWxlcyt3aGVuK2ErYnVzaW5lc3MrbWFrZXMrYStsb3NzK1RheCtTdW1tYXJ5XG4gKi9cbmV4cG9ydCBjbGFzcyBTb2xlQnVzaW5lc3NMb3NzUmVwb3J0IGV4dGVuZHMgQWJzdHJhY3RNb2RlbCB7XG4gIC8qKlxuICAgKiBCdXNpbmVzcyBwcmlvciB5ZWFyIGxvc3Nlc1xuICAgKi9cbiAgb3BlbkJhbGFuY2U6IG51bWJlcjtcblxuICAvKipcbiAgICogTmV0IGluY29tZSByZWR1Y2VkIGJ5IHRoZSBvcGVuaW5nIGJhbGFuY2UgYW1vdW50LCB0aGF0IHdpbGwgYmUgY2FycmllZCBvdmVyIHRvIHRoZSBuZXh0IHllYXIsIGlmIGl0IGlzIHBvc2l0aXZlXG4gICAqL1xuICBjbG9zZUJhbGFuY2U6IG51bWJlcjtcblxuICBuZXRJbmNvbWU6IG51bWJlcjtcblxuICBjb25zdHJ1Y3Rvcihsb3NzOiBTb2xlQnVzaW5lc3NMb3NzLCB0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbiwgZGVwcmVjaWF0aW9uczogRGVwcmVjaWF0aW9uQ29sbGVjdGlvbiwgYWxsb2NhdGlvbnM6IFRyYW5zYWN0aW9uQWxsb2NhdGlvbltdKSB7XG4gICAgc3VwZXIoKTtcbiAgICB0aGlzLm9wZW5CYWxhbmNlID0gbG9zcy5vcGVuQmFsYW5jZTtcbiAgICBjb25zdCBjbGFpbUFtb3VudCA9IG5ldyBUcmFuc2FjdGlvbkNvbGxlY3Rpb24odHJhbnNhY3Rpb25zLnRvQXJyYXkoKSwgZGVwcmVjaWF0aW9ucy50b0FycmF5KCkpXG4gICAgICAuZ2V0QnVzaW5lc3NDbGFpbUFtb3VudChuZXcgVHJhbnNhY3Rpb25BbGxvY2F0aW9uQ29sbGVjdGlvbihhbGxvY2F0aW9ucyksIGxvc3MuYnVzaW5lc3MuaWQpO1xuICAgIHRoaXMubmV0SW5jb21lID0gY2xhaW1BbW91bnQ7XG5cbiAgICB0aGlzLmNsb3NlQmFsYW5jZSA9IGxvc3Mub2Zmc2V0UnVsZSA/IDAgOiBNYXRoLm1pbigwLCBjbGFpbUFtb3VudCAtIHRoaXMub3BlbkJhbGFuY2UpO1xuICB9XG59XG4iXX0=
|
|
@@ -20,4 +20,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
|
|
|
20
20
|
providedIn: 'root'
|
|
21
21
|
}]
|
|
22
22
|
}] });
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcGVydHktc2FsZS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL3NlcnZpY2VzL2h0dHAvcHJvcGVydHkvcHJvcGVydHktc2FsZS9wcm9wZXJ0eS1zYWxlLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUzQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEQsT0FBTyxFQUFjLFdBQVcsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUNyRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQzs7QUFLakUsTUFBTSxPQUFPLG1CQUFvQixTQUFRLFdBQW1FO0lBSDVHOztRQUlFLGVBQVUsR0FBd0IsWUFBWSxDQUFDO1FBQy9DLG9CQUFlLEdBQWtDLHNCQUFzQixDQUFDO1FBQ3hFLGdCQUFXLEdBQUcsa0JBQWtCLENBQUM7UUFDakMsb0JBQWUsR0FBaUIsQ0FBQyxXQUFXLEVBQUUsVUFBVSxFQUFFLGFBQWEsQ0FBQyxDQUFDO0tBQzFFOztnSEFMWSxtQkFBbUI7b0hBQW5CLG1CQUFtQixjQUZsQixNQUFNOzJGQUVQLG1CQUFtQjtrQkFIL0IsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBQcm9wZXJ0eVNhbGUgYXMgUHJvcGVydHlTYWxlQmFzZSB9IGZyb20gJy4uLy4uLy4uLy4uL2RiL01vZGVscyc7XG5pbXBvcnQgeyBQcm9wZXJ0eVNhbGUgfSBmcm9tICcuLi8uLi8uLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgUmVzdE1ldGhvZCwgUmVzdFNlcnZpY2UgfSBmcm9tICcuLi8uLi9yZXN0JztcbmltcG9ydCB7IFByb3BlcnR5U2FsZUNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi8uLi8uLi9jb2xsZWN0aW9ucyc7XG5cbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnXG59KVxuZXhwb3J0IGNsYXNzIFByb3BlcnR5U2FsZVNlcnZpY2UgZXh0ZW5kcyBSZXN0U2VydmljZTxQcm9wZXJ0eVNhbGVCYXNlLCBQcm9wZXJ0eVNhbGUsIFByb3BlcnR5U2FsZUNvbGxlY3Rpb24+IHtcbiAgbW9kZWxDbGFzczogdHlwZW9mIFByb3BlcnR5U2FsZSA9IFByb3BlcnR5U2FsZTtcbiAgY29sbGVjdGlvbkNsYXNzOiB0eXBlb2YgUHJvcGVydHlTYWxlQ29sbGVjdGlvbiA9IFByb3BlcnR5U2FsZUNvbGxlY3Rpb247XG4gIGVuZHBvaW50VXJpID0gJ3Byb3BlcnRpZXMvc2FsZXMnO1xuICBkaXNhYmxlZE1ldGhvZHM6IFJlc3RNZXRob2RbXSA9IFsncG9zdEJhdGNoJywgJ3B1dEJhdGNoJywgJ2RlbGV0ZUJhdGNoJ107XG59XG4iXX0=
|
|
@@ -23,11 +23,11 @@ function checkDividends(metaFields, formGroup) {
|
|
|
23
23
|
const amount = Math.abs(formGroup.get('amount').value);
|
|
24
24
|
const frankedAndUnfrankedControls = formGroup.get('metaFields').controls
|
|
25
25
|
.filter((control) => frankedAndUnfrankedIds.includes(control.get('chartAccountsMetaField').value.id));
|
|
26
|
-
// no need to validate when one or both fields are empty
|
|
26
|
+
// no need to validate when one or both fields are empty
|
|
27
27
|
if (frankedAndUnfrankedControls.find((group) => group.get('value').value === null)) {
|
|
28
28
|
return null;
|
|
29
29
|
}
|
|
30
30
|
const frankedAndUnfrankedAmount = frankedAndUnfrankedControls.reduce((sum, group) => sum + (+group.get('value').value), 0);
|
|
31
|
-
return amount === frankedAndUnfrankedAmount ? null : { wrongAmountsSum: 'The total Franked and Unfranked amounts must
|
|
31
|
+
return amount === frankedAndUnfrankedAmount ? null : { wrongAmountsSum: 'The total Franked and Unfranked amounts must equal the Total Payment received.' };
|
|
32
32
|
}
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb25zLW1ldGEtZmllbGRzLnZhbGlkYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi92YWxpZGF0b3JzL3RyYW5zYWN0aW9ucy1tZXRhLWZpZWxkcy52YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLDhCQUE4QixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBSTdEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLCtCQUErQjtJQUM3QyxPQUFPLENBQUMsU0FBMkMsRUFBMkIsRUFBRTtRQUM5RSxNQUFNLGFBQWEsR0FBa0IsU0FBUyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQyxLQUFLLENBQUM7UUFFMUUsSUFBSSxDQUFDLGFBQWEsRUFBRTtZQUNsQixPQUFPLElBQUksQ0FBQztTQUNiO1FBRUQsTUFBTSxVQUFVLEdBQTZCLGFBQWEsQ0FBQyxVQUFVLENBQUM7UUFFdEUsSUFBSSxhQUFhLENBQUMsV0FBVyxFQUFFLEVBQUU7WUFDL0IsT0FBTyxjQUFjLENBQUMsVUFBVSxFQUFFLFNBQVMsQ0FBQyxDQUFDO1NBQzlDO1FBRUQsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDLENBQUE7QUFDSCxDQUFDO0FBRUQ7O0dBRUc7QUFDSCxTQUFTLGNBQWMsQ0FBQyxVQUFVLEVBQUUsU0FBUztJQUMzQyxNQUFNLHNCQUFzQixHQUFxQyxDQUFDLDhCQUE4QixDQUFDLE9BQU8sRUFBRSw4QkFBOEIsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNwSixNQUFNLE1BQU0sR0FBVyxJQUFJLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDL0QsTUFBTSwyQkFBMkIsR0FBdUIsU0FBUyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxRQUFRO1NBQ3pGLE1BQU0sQ0FBQyxDQUFDLE9BQWtCLEVBQUUsRUFBRSxDQUM3QixzQkFBc0IsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBRXJGLHdEQUF3RDtJQUN4RCxJQUFJLDJCQUEyQixDQUFDLElBQUksQ0FBQyxDQUFDLEtBQXVCLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUMsS0FBSyxLQUFLLElBQUksQ0FBQyxFQUFFO1FBQ3BHLE9BQU8sSUFBSSxDQUFDO0tBQ2I7SUFFRCxNQUFNLHlCQUF5QixHQUFXLDJCQUEyQixDQUFDLE1BQU0sQ0FBQyxDQUFDLEdBQVcsRUFBRSxLQUFnQixFQUFFLEVBQUUsQ0FBQyxHQUFHLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFFdEosT0FBTyxNQUFNLEtBQUsseUJBQXlCLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxlQUFlLEVBQUUsZ0ZBQWdGLEVBQUUsQ0FBQztBQUM3SixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRm9ybUNvbnRyb2wsIEZvcm1Hcm91cCwgVW50eXBlZEZvcm1Db250cm9sLCBVbnR5cGVkRm9ybUdyb3VwLCBWYWxpZGF0aW9uRXJyb3JzLCBWYWxpZGF0b3JGbiB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IENoYXJ0QWNjb3VudHNNZXRhRmllbGRMaXN0RW51bSB9IGZyb20gJy4uL2RiL0VudW1zJztcbmltcG9ydCB7IENoYXJ0QWNjb3VudHMsIENoYXJ0QWNjb3VudHNNZXRhRmllbGQsIFRyYW5zYWN0aW9uIH0gZnJvbSAnLi4vbW9kZWxzJztcbmltcG9ydCB7IFRyYW5zYWN0aW9uQmFzZUZvcm0gfSBmcm9tICcuLi9mb3Jtcyc7XG5cbi8qKlxuICogVmFsaWRhdG9yIHRoYXQgY2hlY2sgZmllbGRzIGZvciB0cmFuc2FjdGlvbiBtZXRhXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiB0cmFuc2FjdGlvbnNNZXRhRmllbGRzVmFsaWRhdG9yKCk6IFZhbGlkYXRvckZuIHtcbiAgcmV0dXJuIChmb3JtR3JvdXA6IFRyYW5zYWN0aW9uQmFzZUZvcm08VHJhbnNhY3Rpb24+KTogVmFsaWRhdGlvbkVycm9ycyB8IG51bGwgPT4ge1xuICAgIGNvbnN0IGNoYXJ0QWNjb3VudHM6IENoYXJ0QWNjb3VudHMgPSBmb3JtR3JvdXAuZ2V0KCdjaGFydEFjY291bnRzJykudmFsdWU7XG5cbiAgICBpZiAoIWNoYXJ0QWNjb3VudHMpIHtcbiAgICAgIHJldHVybiBudWxsO1xuICAgIH1cblxuICAgIGNvbnN0IG1ldGFGaWVsZHM6IENoYXJ0QWNjb3VudHNNZXRhRmllbGRbXSA9IGNoYXJ0QWNjb3VudHMubWV0YUZpZWxkcztcblxuICAgIGlmIChjaGFydEFjY291bnRzLmlzRGl2aWRlbmRzKCkpIHtcbiAgICAgIHJldHVybiBjaGVja0RpdmlkZW5kcyhtZXRhRmllbGRzLCBmb3JtR3JvdXApO1xuICAgIH1cblxuICAgIHJldHVybiBudWxsO1xuICB9XG59XG5cbi8qKlxuICogdGhlIHN1bSBvZiB0aGUgZmllbGRzIFwiRnJhbmtlZFwiIGFuZCBcIlVuZnJhbmtlZFwiIG11c3QgZXF1YWwgdHJhbnNhY3Rpb25zIGFtb3VudFxuICovXG5mdW5jdGlvbiBjaGVja0RpdmlkZW5kcyhtZXRhRmllbGRzLCBmb3JtR3JvdXApOiBWYWxpZGF0aW9uRXJyb3JzIHtcbiAgY29uc3QgZnJhbmtlZEFuZFVuZnJhbmtlZElkczogQ2hhcnRBY2NvdW50c01ldGFGaWVsZExpc3RFbnVtW10gPSBbQ2hhcnRBY2NvdW50c01ldGFGaWVsZExpc3RFbnVtLkZSQU5LRUQsIENoYXJ0QWNjb3VudHNNZXRhRmllbGRMaXN0RW51bS5VTkZSQU5LRURdO1xuICBjb25zdCBhbW91bnQ6IG51bWJlciA9IE1hdGguYWJzKGZvcm1Hcm91cC5nZXQoJ2Ftb3VudCcpLnZhbHVlKTtcbiAgY29uc3QgZnJhbmtlZEFuZFVuZnJhbmtlZENvbnRyb2xzOiBVbnR5cGVkRm9ybUdyb3VwW10gPSBmb3JtR3JvdXAuZ2V0KCdtZXRhRmllbGRzJykuY29udHJvbHNcbiAgICAuZmlsdGVyKChjb250cm9sOiBGb3JtR3JvdXApID0+XG4gICAgICBmcmFua2VkQW5kVW5mcmFua2VkSWRzLmluY2x1ZGVzKGNvbnRyb2wuZ2V0KCdjaGFydEFjY291bnRzTWV0YUZpZWxkJykudmFsdWUuaWQpKTtcblxuICAvLyBubyBuZWVkIHRvIHZhbGlkYXRlIHdoZW4gb25lIG9yIGJvdGggZmllbGRzIGFyZSBlbXB0eVxuICBpZiAoZnJhbmtlZEFuZFVuZnJhbmtlZENvbnRyb2xzLmZpbmQoKGdyb3VwOiBVbnR5cGVkRm9ybUdyb3VwKSA9PiBncm91cC5nZXQoJ3ZhbHVlJykudmFsdWUgPT09IG51bGwpKSB7XG4gICAgcmV0dXJuIG51bGw7XG4gIH1cblxuICBjb25zdCBmcmFua2VkQW5kVW5mcmFua2VkQW1vdW50OiBudW1iZXIgPSBmcmFua2VkQW5kVW5mcmFua2VkQ29udHJvbHMucmVkdWNlKChzdW06IG51bWJlciwgZ3JvdXA6IEZvcm1Hcm91cCkgPT4gc3VtICsgKCtncm91cC5nZXQoJ3ZhbHVlJykudmFsdWUpLCAwKTtcblxuICByZXR1cm4gYW1vdW50ID09PSBmcmFua2VkQW5kVW5mcmFua2VkQW1vdW50ID8gbnVsbCA6IHsgd3JvbmdBbW91bnRzU3VtOiAnVGhlIHRvdGFsIEZyYW5rZWQgYW5kIFVuZnJhbmtlZCBhbW91bnRzIG11c3QgZXF1YWwgdGhlIFRvdGFsIFBheW1lbnQgcmVjZWl2ZWQuJyB9O1xufVxuIl19
|
|
@@ -11909,7 +11909,7 @@ class SoleBusinessLossReport extends AbstractModel {
|
|
|
11909
11909
|
const claimAmount = new TransactionCollection(transactions.toArray(), depreciations.toArray())
|
|
11910
11910
|
.getBusinessClaimAmount(new TransactionAllocationCollection(allocations), loss.business.id);
|
|
11911
11911
|
this.netIncome = claimAmount;
|
|
11912
|
-
this.closeBalance = loss.offsetRule ? 0 : claimAmount - this.openBalance;
|
|
11912
|
+
this.closeBalance = loss.offsetRule ? 0 : Math.min(0, claimAmount - this.openBalance);
|
|
11913
11913
|
}
|
|
11914
11914
|
}
|
|
11915
11915
|
|
|
@@ -20506,12 +20506,12 @@ function checkDividends(metaFields, formGroup) {
|
|
|
20506
20506
|
const amount = Math.abs(formGroup.get('amount').value);
|
|
20507
20507
|
const frankedAndUnfrankedControls = formGroup.get('metaFields').controls
|
|
20508
20508
|
.filter((control) => frankedAndUnfrankedIds.includes(control.get('chartAccountsMetaField').value.id));
|
|
20509
|
-
// no need to validate when one or both fields are empty
|
|
20509
|
+
// no need to validate when one or both fields are empty
|
|
20510
20510
|
if (frankedAndUnfrankedControls.find((group) => group.get('value').value === null)) {
|
|
20511
20511
|
return null;
|
|
20512
20512
|
}
|
|
20513
20513
|
const frankedAndUnfrankedAmount = frankedAndUnfrankedControls.reduce((sum, group) => sum + (+group.get('value').value), 0);
|
|
20514
|
-
return amount === frankedAndUnfrankedAmount ? null : { wrongAmountsSum: 'The total Franked and Unfranked amounts must
|
|
20514
|
+
return amount === frankedAndUnfrankedAmount ? null : { wrongAmountsSum: 'The total Franked and Unfranked amounts must equal the Total Payment received.' };
|
|
20515
20515
|
}
|
|
20516
20516
|
|
|
20517
20517
|
class WorkTransactionForm extends TransactionForm {
|