taxtank-core 2.1.81 → 2.1.82

package/fesm2022/taxtank-core.mjs

@@ -12317,6 +12317,9 @@ class Holding extends AbstractModel {
 }
 
 class HoldingTaxStatementItem {
+    constructor() {
+        this.amount = 0;
+    }
 }
 
 class TaxReturnCategory extends TaxReturnCategory$1 {
@@ -12379,20 +12382,20 @@ class HoldingTaxStatement extends AbstractModel {
         super(...arguments);
         this.items = [
             // Trust Income (Item 13)
-            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 155, code: 13, subCode: 'U' }), label: 'Share of net income from trusts' }),
-            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 157, code: 13, subCode: 'Y' }), label: 'Other deductions relating to non-primary production income' }),
-            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 200, code: 13, subCode: 'C' }), label: 'Franked distributions from trusts' }),
-            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 210, code: 13, subCode: 'Q' }), label: 'Share of franking credits from franked dividends' }),
-            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 211, code: 13, subCode: 'R' }), label: 'TFN withholding credit' }),
-            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 212, code: 13, subCode: 'S' }), label: 'Credit for tax paid by trustee' }),
+            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 155, code: '13', subCode: 'U' }), label: 'Share of net income from trusts' }),
+            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 157, code: '13', subCode: 'Y' }), label: 'Other deductions relating to non-primary production income' }),
+            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 200, code: '13', subCode: 'C' }), label: 'Franked distributions from trusts' }),
+            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 210, code: '13', subCode: 'Q' }), label: 'Share of franking credits from franked dividends' }),
+            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 211, code: '13', subCode: 'R' }), label: 'TFN withholding credit' }),
+            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 212, code: '13', subCode: 'S' }), label: 'Credit for tax paid by trustee' }),
             // Capital Gains (Item 18)
-            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 18, code: 18, subCode: 'A' }), label: 'Net capital gain' }),
-            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 18, code: 18, subCode: 'H' }), label: 'Total current year capital gains' }),
+            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 18, code: '18', subCode: 'A' }), label: 'Net capital gain' }),
+            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 18, code: '18', subCode: 'H' }), label: 'Total current year capital gains' }),
             // Foreign Income (Item 20)
-            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 234, code: 20, subCode: 'E' }), label: 'Assessable foreign source income' }),
-            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 226, code: 20, subCode: 'F' }), label: 'Australian franking credits from a NZ company' }),
-            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 223, code: 20, subCode: 'M' }), label: 'Other net foreign source income' }),
-            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 224, code: 20, subCode: 'O' }), label: 'Foreign income tax offset' }),
+            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 234, code: '20', subCode: 'E' }), label: 'Assessable foreign source income' }),
+            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 226, code: '20', subCode: 'F' }), label: 'Australian franking credits from a NZ company' }),
+            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 223, code: '20', subCode: 'M' }), label: 'Other net foreign source income' }),
+            plainToClass(HoldingTaxStatementItem, { taxReturnItem: plainToClass(TaxReturnItem, { id: 224, code: '20', subCode: 'O' }), label: 'Foreign income tax offset' }),
         ];
     }
     get amount() {
@@ -29862,6 +29865,7 @@ class HoldingTradeImportForm extends AbstractForm {
 
 class HoldingTaxStatementItemForm extends AbstractForm {
     constructor(item) {
+        console.log(item);
         super({
             amount: new FormControl(item.amount, Validators.required),
         }, item);
@@ -29882,6 +29886,14 @@ class HoldingTaxStatementForm extends AbstractForm {
     get itemsArray() {
         return this.get('items');
     }
+    get itemGroups() {
+        const controls = this.itemsArray.controls;
+        return {
+            'Trust Income (Item 13)': controls.filter(control => control.model.taxReturnItem.code === '13'),
+            'Capital Gains (Item 18)': controls.filter(control => control.model.taxReturnItem.code === '18'),
+            'Foreign Income (Item 20)': controls.filter(control => control.model.taxReturnItem.code === '20'),
+        };
+    }
     submit() {
         return super.submit({ items: this.itemsArray.controls.map((form) => form.submit()) });
     }