taxtank-core 0.28.65 → 0.28.66

package/bundles/taxtank-core.umd.js

@@ -3634,6 +3634,13 @@
         function TransactionBase() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
+        Object.defineProperty(TransactionBase.prototype, "claimRatio", {
+            get: function () {
+                return this.claimPercent / 100;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(TransactionBase.prototype, "tankType", {
             get: function () {
                 switch (true) {
@@ -3682,12 +3689,41 @@
             }
             return !!this.business;
         };
-        TransactionBase.prototype.getAmountWithGst = function () {
-            return this.isGST ? +(this.amount * ChartAccounts.GSTCoefficient).toFixed(2) : this.amount;
-        };
-        TransactionBase.prototype.getGstAmount = function () {
-            return +(this.getAmountWithGst() - this.amount).toFixed(2);
-        };
+        Object.defineProperty(TransactionBase.prototype, "amountWithGst", {
+            get: function () {
+                return this.isGST ? +(this.amount * ChartAccounts.GSTCoefficient).toFixed(2) : this.amount;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(TransactionBase.prototype, "gstAmount", {
+            get: function () {
+                return +(this.amountWithGst - this.amount).toFixed(2);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(TransactionBase.prototype, "gstClaimAmount", {
+            get: function () {
+                return this.gstAmount * this.claimRatio;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(TransactionBase.prototype, "grossAmount", {
+            get: function () {
+                return this.amount + this.gstAmount;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(TransactionBase.prototype, "grossClaimAmount", {
+            get: function () {
+                return +(this.grossAmount * (this.claimPercent / 100)).toFixed(2);
+            },
+            enumerable: false,
+            configurable: true
+        });
         return TransactionBase;
     }(AbstractModel));
     __decorate([
@@ -3698,6 +3734,15 @@
             return obj.file;
         })
     ], TransactionBase.prototype, "file", void 0);
+    __decorate([
+        classTransformer.Exclude()
+    ], TransactionBase.prototype, "amountWithGst", null);
+    __decorate([
+        classTransformer.Exclude()
+    ], TransactionBase.prototype, "gstAmount", null);
+    __decorate([
+        classTransformer.Exclude()
+    ], TransactionBase.prototype, "gstClaimAmount", null);
 
     var Transaction$1 = /** @class */ (function (_super) {
         __extends(Transaction, _super);
@@ -4173,15 +4218,6 @@
         classTransformer.Type(function () { return Transaction; })
     ], TransactionAllocation.prototype, "transaction", void 0);
 
-    /**
-     * Enum with income amount types (Net or Gross)
-     */
-    exports.IncomeAmountTypeEnum = void 0;
-    (function (IncomeAmountTypeEnum) {
-        IncomeAmountTypeEnum[IncomeAmountTypeEnum["NET"] = 0] = "NET";
-        IncomeAmountTypeEnum[IncomeAmountTypeEnum["GROSS"] = 1] = "GROSS";
-    })(exports.IncomeAmountTypeEnum || (exports.IncomeAmountTypeEnum = {}));
-
     var Depreciation$1 = /** @class */ (function (_super) {
         __extends(Depreciation, _super);
         function Depreciation() {
@@ -4392,7 +4428,12 @@
          */
         Depreciation.prototype.toTransaction = function (params) {
             if (params === void 0) { params = {}; }
-            return classTransformer.plainToClass(Transaction, Object.assign(params, this, { amount: -this.claimAmount, claimAmount: -this.amount * (this.claimPercent / 100) }));
+            var _a, _b;
+            return classTransformer.plainToClass(Transaction, Object.assign(params, this, {
+                amount: -((_a = this.currentYearForecast) === null || _a === void 0 ? void 0 : _a.amount) || 0,
+                claimAmount: ((_b = this.currentYearForecast) === null || _b === void 0 ? void 0 : _b.claimAmount) || 0,
+                date: this.purchaseDate
+            }));
         };
         Object.defineProperty(Depreciation.prototype, "claimAmount", {
             /**
@@ -4405,6 +4446,28 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(Depreciation.prototype, "amountWithGst", {
+            get: function () {
+                // only new assets
+                if (new FinancialYear(this.purchaseDate).year !== new FinancialYear().year) {
+                    return this.amount;
+                }
+                return _super.prototype.amountWithGst;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(Depreciation.prototype, "grossAmount", {
+            /**
+             * @TODO temporary hack, in future backend should return negative numbers
+             */
+            get: function () {
+                var _a;
+                return -((_a = this.currentYearForecast) === null || _a === void 0 ? void 0 : _a.amount) - this.gstAmount;
+            },
+            enumerable: false,
+            configurable: true
+        });
         return Depreciation;
     }(Depreciation$1));
     Depreciation.WRITTEN_OFF_THRESHOLD = 300;
@@ -4429,8 +4492,8 @@
     ], Depreciation.prototype, "depreciationCapitalProject", void 0);
     __decorate([
         classTransformer.Type(function () { return DepreciationForecast; }),
-        classTransformer.Transform(function (_b) {
-            var value = _b.value, obj = _b.obj;
+        classTransformer.Transform(function (_c) {
+            var value = _c.value, obj = _c.obj;
             // value = array of DepreciationForecast
             // obj = plain (whole Depreciation object)
             // Set isLVP flag for each DepreciationForecast
@@ -4452,6 +4515,9 @@
     __decorate([
         classTransformer.Type(function () { return BankTransaction; })
     ], Depreciation.prototype, "bankTransaction", void 0);
+    __decorate([
+        classTransformer.Exclude()
+    ], Depreciation.prototype, "amountWithGst", null);
 
     // @TODO Alex: refactor: move here allocations methods, netAmount = amount, grossAmount calculation, remove unused methods, etc.
     var Transaction = /** @class */ (function (_super) {
@@ -4474,13 +4540,21 @@
         Transaction.prototype.isCredit = function () {
             return this.type === exports.TransactionTypeEnum.CREDIT;
         };
+        /**
+         * @TODO move to base collection
+         */
         Transaction.prototype.isIncome = function () {
+            // @TODO not used
             if (!this.chartAccounts) {
                 return this.isCredit();
             }
             return CHART_ACCOUNTS_CATEGORIES.income.includes(this.chartAccounts.category);
         };
+        /**
+         * @TODO move to base collection
+         */
         Transaction.prototype.isExpense = function () {
+            // @TODO not used
             if (!this.chartAccounts) {
                 return this.isDebit();
             }
@@ -4489,6 +4563,9 @@
         Transaction.prototype.isPersonal = function () {
             return CHART_ACCOUNTS_CATEGORIES.personal.includes(this.chartAccounts.category);
         };
+        Transaction.prototype.isInterest = function () {
+            return this.chartAccounts.id === exports.ChartAccountsListEnum.INTEREST_ON_LOAN;
+        };
         Object.defineProperty(Transaction.prototype, "chartAccountsCategories", {
             get: function () {
                 switch (true) {
@@ -4527,21 +4604,6 @@
         Transaction.prototype.isVehicleTransaction = function () {
             return this.chartAccounts.isVehicleExpense();
         };
-        /**
-         * Get net amount (clean amount after all deductions)
-         * @TODO Alex: remove, this.amount should be netAmount actually
-         */
-        Transaction.prototype.getNetAmount = function () {
-            // @TODO fix hack while transactions refactoring (use class-transformer)
-            return +(Math.round(this.getIncomeAmountByType(exports.IncomeAmountTypeEnum.NET) * 100) / 100).toFixed(2);
-        };
-        /**
-         * Get gross income amount
-         */
-        Transaction.prototype.getGrossIncome = function () {
-            // @TODO fix hack while transactions refactoring (use class-transformer)
-            return +(Math.round(this.getIncomeAmountByType(exports.IncomeAmountTypeEnum.GROSS) * 100) / 100).toFixed(2);
-        };
         Object.defineProperty(Transaction.prototype, "taxFreeComponent", {
             get: function () {
                 return this.getMetadataFieldValue(exports.ChartAccountsMetadataListEnum.TAX_FREE_COMPONENT);
@@ -4612,29 +4674,6 @@
                 return transactionMetadata.chartAccountsMetadata.id === field;
             })) === null || _a === void 0 ? void 0 : _a.value) || 0;
         };
-        /**
-         * Returns Net or Gross income amount based on provided income type
-         * @param incomeType by which amount should be returned
-         */
-        Transaction.prototype.getIncomeAmountByType = function (incomeType) {
-            // modifier that determines whether the values of the transaction fields will be added or subtracted
-            var modifier = incomeType === exports.IncomeAmountTypeEnum.GROSS ? 1 : -1;
-            switch (true) {
-                case this.isPropertyTank():
-                    return this.amount +
-                        (this.transactions
-                            .reduce(function (sum, transaction) { return sum + Math.abs(transaction.amount); }, 0) * modifier);
-                case this.isWorkTank():
-                    return this.amount + ((this.tax + this.frankingCredit - this.taxFreeComponent - this.eligibleForReduction) * modifier);
-                case this.isSoleTank():
-                    return this.amount + this.tax * modifier;
-                default:
-                    return this.amount || 0;
-            }
-        };
-        Transaction.prototype.isInterest = function () {
-            return this.chartAccounts.id === exports.ChartAccountsListEnum.INTEREST_ON_LOAN;
-        };
         Transaction.prototype.isCash = function () {
             return this.source === exports.TransactionSourceEnum.CASH;
         };
@@ -4674,10 +4713,17 @@
         Object.defineProperty(Transaction.prototype, "grossAmount", {
             /**
              * Total transaction amount including taxes and other additional amounts
-             * @TODO Alex: refactor everything related to amounts
              */
             get: function () {
-                return this.isIncome() ? this.getGrossIncome() : this.amount;
+                var grossAmount = _super.prototype.grossAmount + this.tax;
+                if (this.isExpense()) {
+                    return grossAmount;
+                }
+                grossAmount += this.transactions.reduce(function (sum, transaction) { return sum + Math.abs(transaction.amount); }, 0);
+                if (this.isWorkTank()) {
+                    grossAmount += this.frankingCredit - this.taxFreeComponent - this.eligibleForReduction;
+                }
+                return +(Math.round(grossAmount * 100) / 100).toFixed(2);
             },
             enumerable: false,
             configurable: true
@@ -5348,6 +5394,43 @@
         classTransformer.Type(function () { return User; })
     ], SoleDetails.prototype, "user", void 0);
 
+    var BasReport$1 = /** @class */ (function () {
+        function BasReport() {
+        }
+        return BasReport;
+    }());
+
+    var BasReport = /** @class */ (function (_super) {
+        __extends(BasReport, _super);
+        function BasReport() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        Object.defineProperty(BasReport.prototype, "taxWithheldTotal", {
+            get: function () {
+                return this.taxWithheldSalary + this.taxWithheldNoABN;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(BasReport.prototype, "gst", {
+            /**
+             * GST payable to the ATO, or refundable from the ATO in case it's negative
+             */
+            get: function () {
+                return this.incomeGST - this.expenseGST + this.taxWithheldTotal + this.paygTaxInstalment - this.fuelTaxCredit;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        return BasReport;
+    }(BasReport$1));
+    __decorate([
+        classTransformer.Type(function () { return Date; })
+    ], BasReport.prototype, "dateFrom", void 0);
+    __decorate([
+        classTransformer.Type(function () { return Date; })
+    ], BasReport.prototype, "dateTo", void 0);
+
     var User = /** @class */ (function (_super) {
         __extends(User, _super);
         function User() {
@@ -7718,19 +7801,32 @@
     var MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'Jan'];
 
     /**
+     * @TODO extend from TransactionBaseCollection
      * Collection of transactions
      */
     var TransactionCollection = /** @class */ (function (_super) {
         __extends(TransactionCollection, _super);
-        function TransactionCollection() {
-            return _super !== null && _super.apply(this, arguments) || this;
+        /**
+         * @TODO use TransactionBaseCollection instead
+         * we use depreciations as expense transactions a lot
+         */
+        function TransactionCollection(transactions, depreciations) {
+            if (transactions === void 0) { transactions = []; }
+            if (depreciations === void 0) { depreciations = []; }
+            return _super.call(this, __spreadArray(__spreadArray([], __read(transactions)), __read(depreciations.map(function (depreciation) { return depreciation.toTransaction(); })))) || this;
         }
+        /**
+         * Get business related transactions
+         */
+        TransactionCollection.prototype.getWithBusiness = function () {
+            return this.filter(function (transaction) { return !!transaction.business; });
+        };
         Object.defineProperty(TransactionCollection.prototype, "amount", {
             /**
              * Get total amount of all transactions in the collection
              */
             get: function () {
-                return +this.items.reduce(function (sum, transaction) { return sum + transaction.getNetAmount(); }, 0).toFixed(2);
+                return +this.items.reduce(function (sum, transaction) { return sum + transaction.amount; }, 0).toFixed(2);
             },
             enumerable: false,
             configurable: true
@@ -7771,13 +7867,6 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TransactionCollection.prototype, "grossAmount", {
-            get: function () {
-                return +this.items.reduce(function (sum, transaction) { return sum + transaction.amount; }, 0).toFixed(2);
-            },
-            enumerable: false,
-            configurable: true
-        });
         TransactionCollection.prototype.getByChartAccountsCategories = function (categories) {
             return new TransactionCollection(this.items.filter(function (transaction) { return categories.includes(transaction.chartAccounts.category); }));
         };
@@ -7801,6 +7890,9 @@
         TransactionCollection.prototype.getIncomeTransactions = function () {
             return new TransactionCollection(this.items.filter(function (transaction) { return transaction.isIncome(); }));
         };
+        TransactionCollection.prototype.getExpenseTransactions = function () {
+            return new TransactionCollection(this.items.filter(function (transaction) { return transaction.isExpense() && !transaction.isInterest(); }));
+        };
         Object.defineProperty(TransactionCollection.prototype, "claimIncome", {
             get: function () {
                 return this.getIncomeTransactions().claimAmount;
@@ -7808,9 +7900,6 @@
             enumerable: false,
             configurable: true
         });
-        TransactionCollection.prototype.getExpenseTransactions = function () {
-            return new TransactionCollection(this.items.filter(function (transaction) { return transaction.isExpense() && !transaction.isInterest(); }));
-        };
         Object.defineProperty(TransactionCollection.prototype, "claimExpense", {
             get: function () {
                 return this.getExpenseTransactions().claimAmount;
@@ -7958,6 +8047,22 @@
             });
             return chartData;
         };
+        /**
+         * user pays GST only from allocated part of income (the rest user didn't get, so don't have to pay)
+         *
+         * @param allocations
+         */
+        TransactionCollection.prototype.calculateAllocatedGST = function (allocations) {
+            var allocationsByTransaction = allocations.groupBy('transaction.id');
+            var allocatedGST = 0;
+            this.filterBy('isGST', true).toArray().forEach(function (transaction) {
+                allocatedGST += allocationsByTransaction.get(transaction.id).sumBy('amount') * transaction.claimRatio * ChartAccounts.GSTRatio;
+            });
+            return allocatedGST;
+        };
+        TransactionCollection.prototype.getAllocatedAmount = function (allocations) {
+            return allocations.getByTransactionsIds(this.getIds()).sumBy('amount');
+        };
         return TransactionCollection;
     }(ExportableCollection));
 
@@ -8009,11 +8114,17 @@
         return TransactionAllocationCollection;
     }(Collection));
 
+    /**
+     * used to combine transactions/depreciations
+     */
     var TransactionBaseCollection = /** @class */ (function (_super) {
         __extends(TransactionBaseCollection, _super);
         function TransactionBaseCollection() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
+        TransactionBaseCollection.prototype.filterByBusiness = function (business) {
+            return this.filterBy('business.id', business.id);
+        };
         TransactionBaseCollection.prototype.getClaimAmountByBusinessId = function (businessId) {
             return +this.filterBy('business.id', businessId).items.map(function (transaction) { return transaction instanceof Depreciation ? -transaction.claimAmount : transaction['claimAmount']; }).reduce(function (sum, claimAmount) { return sum + claimAmount; }, 0).toFixed(2);
         };
@@ -8023,6 +8134,12 @@
         TransactionBaseCollection.prototype.getWithBusiness = function () {
             return this.filter(function (transaction) { return !!transaction.business; });
         };
+        TransactionBaseCollection.prototype.getIncomeTransactions = function () {
+            return this.create(this.items.filter(function (transaction) { return transaction.isIncome(); }));
+        };
+        TransactionBaseCollection.prototype.getExpenseTransactions = function () {
+            return this.create(this.items.filter(function (transaction) { return transaction.isExpense() && !transaction.isInterest(); }));
+        };
         return TransactionBaseCollection;
     }(Collection));
 
@@ -8413,11 +8530,26 @@
         return ClientPortfolioReportCollection;
     }(Collection));
 
+    /**
+     * @TODO extend from TransactionBaseCollection
+     */
     var DepreciationCollection = /** @class */ (function (_super) {
         __extends(DepreciationCollection, _super);
         function DepreciationCollection() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
+        /**
+         * Get business related transactions
+         */
+        DepreciationCollection.prototype.getWithBusiness = function () {
+            return this.filter(function (depreciation) { return !!depreciation.business; });
+        };
+        /**
+         * assets purchased in the current financial year
+         */
+        DepreciationCollection.prototype.getNew = function () {
+            return this.filter(function (depreciation) { return new FinancialYear(depreciation.purchaseDate).year === new FinancialYear().year; });
+        };
         Object.defineProperty(DepreciationCollection.prototype, "amount", {
             /**
              * Get total amount of all depreciations in the collection
@@ -8835,7 +8967,7 @@
         __extends(PropertyReportItemTransaction, _super);
         function PropertyReportItemTransaction(transactions, property, chartAccounts) {
             var _this = _super.call(this, property, chartAccounts) || this;
-            _this.amount = Math.abs(transactions.grossAmount);
+            _this.amount = Math.abs(transactions.amount);
             _this.description = chartAccounts.name;
             return _this;
         }
@@ -9433,6 +9565,15 @@
         DocumentTypeEnum[DocumentTypeEnum["INVOICE"] = 1] = "INVOICE";
     })(exports.DocumentTypeEnum || (exports.DocumentTypeEnum = {}));
 
+    exports.AnnualFrequencyEnum = void 0;
+    (function (AnnualFrequencyEnum) {
+        AnnualFrequencyEnum[AnnualFrequencyEnum["ANNUAL"] = 1] = "ANNUAL";
+        AnnualFrequencyEnum[AnnualFrequencyEnum["QUARTERLY"] = 3] = "QUARTERLY";
+        AnnualFrequencyEnum[AnnualFrequencyEnum["MONTHLY"] = 12] = "MONTHLY";
+        AnnualFrequencyEnum[AnnualFrequencyEnum["FORTNIGHTLY"] = 26] = "FORTNIGHTLY";
+        AnnualFrequencyEnum[AnnualFrequencyEnum["WEEKLY"] = 52] = "WEEKLY";
+    })(exports.AnnualFrequencyEnum || (exports.AnnualFrequencyEnum = {}));
+
     // @TODO Artem TT-2308 move everything
 
     exports.ChartAccountsEtpEnum = void 0;
@@ -12301,6 +12442,15 @@
         TaxSummaryTypeEnum["FORECASTS"] = "forecasts";
     })(exports.TaxSummaryTypeEnum || (exports.TaxSummaryTypeEnum = {}));
 
+    /**
+     * Enum with income amount types (Net or Gross)
+     */
+    exports.IncomeAmountTypeEnum = void 0;
+    (function (IncomeAmountTypeEnum) {
+        IncomeAmountTypeEnum[IncomeAmountTypeEnum["NET"] = 0] = "NET";
+        IncomeAmountTypeEnum[IncomeAmountTypeEnum["GROSS"] = 1] = "GROSS";
+    })(exports.IncomeAmountTypeEnum || (exports.IncomeAmountTypeEnum = {}));
+
     exports.TransactionCategoryEnum = void 0;
     (function (TransactionCategoryEnum) {
         TransactionCategoryEnum[TransactionCategoryEnum["PROPERTY"] = 0] = "PROPERTY";
@@ -12733,7 +12883,6 @@
             // use id only to avoid unexpected changes
             return this.update(merge__default["default"]({}, invoice, { document: document, status: exports.SoleInvoiceStatusesEnum.PENDING }))
                 .pipe(operators.map(function (publishedInvoice) {
-                debugger;
                 _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.SOLE_INVOICE_PUBLISHED, publishedInvoice));
                 return publishedInvoice;
             }));
@@ -12772,6 +12921,26 @@
                     }]
             }] });
 
+    var BasReportService = /** @class */ (function (_super) {
+        __extends(BasReportService, _super);
+        function BasReportService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+            _this.modelClass = BasReport;
+            _this.url = 'bas-reports';
+            _this.isHydra = true;
+            return _this;
+        }
+        return BasReportService;
+    }(RestService));
+    BasReportService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasReportService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BasReportService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasReportService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasReportService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }] });
+
     /**
      * Service that allows to work with WorkTank operations
      */
@@ -17986,6 +18155,8 @@
         __extends(AbstractForm, _super);
         function AbstractForm(controls, model, validatorOrOpts, asyncValidator) {
             var _this = _super.call(this, controls, validatorOrOpts, asyncValidator) || this;
+            // @TODO remove and use getRawValue instead of value (needs testing and refactoring)
+            _this.submitDisabledFields = false;
             /**
              * @TODO Alex bad name, it's also about unchanged
              * Flag display if some form values changed
@@ -18027,7 +18198,8 @@
             if (!this.disabled && !this.valid) {
                 return null;
             }
-            var model = this.createModelInstance(Object.assign({}, this.model, this.value, data));
+            var value = this.submitDisabledFields ? this.getRawValue() : this.value;
+            var model = this.createModelInstance(Object.assign({}, this.model, value, data));
             this.onSubmit.emit(model);
             return model;
         };
@@ -18914,6 +19086,67 @@
         return SoleInvoiceTemplateForm;
     }(AbstractForm));
 
+    /**
+     * business activity statement report
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/268533936/BAS+Report
+     */
+    var BasReportForm = /** @class */ (function (_super) {
+        __extends(BasReportForm, _super);
+        /**
+         * @TODO vik TransactionBaseCollection here and everywhere
+         */
+        function BasReportForm(report, transactions, allocations, depreciations) {
+            var _this = _super.call(this, {
+                dateFrom: new forms.FormControl(report.dateFrom, forms.Validators.required),
+                dateTo: new forms.FormControl(report.dateTo, forms.Validators.required),
+                income: new forms.FormControl({ value: report.income, disabled: true }),
+                incomeGST: new forms.FormControl({ value: report.incomeGST, disabled: true }, forms.Validators.required),
+                expenseGST: new forms.FormControl({ value: report.expenseGST, disabled: true }, forms.Validators.required),
+                salary: new forms.FormControl(report.salary, forms.Validators.required),
+                taxWithheldSalary: new forms.FormControl(report.taxWithheldSalary, forms.Validators.required),
+                taxWithheldNoABN: new forms.FormControl(report.taxWithheldNoABN, forms.Validators.required),
+                taxWithheldTotal: new forms.FormControl({ value: report.taxWithheldTotal || 0, disabled: true }),
+                paygTaxInstalment: new forms.FormControl(report.paygTaxInstalment, forms.Validators.required),
+                fuelTaxCredit: new forms.FormControl(report.fuelTaxCredit, forms.Validators.required),
+                gst: new forms.FormControl({ value: report.gst, disabled: true }),
+            }, report) || this;
+            _this.report = report;
+            _this.submitDisabledFields = true;
+            // prefill income/expense data based on transactions/depreciations filtered by specified date
+            rxjs.combineLatest([_this.get('dateFrom').valueChanges, _this.get('dateTo').valueChanges])
+                .subscribe(function (_a) {
+                var _b = __read(_a, 2), dateFrom = _b[0], dateTo = _b[1];
+                var filteredTransactions = transactions.filterByRange('date', dateFrom, dateTo);
+                var filteredDepreciations = depreciations.filterByRange('purchaseDate', dateFrom, dateTo);
+                var incomeTransactions = filteredTransactions.getIncomeTransactions();
+                var expenseTransactions = new TransactionBaseCollection(__spreadArray(__spreadArray([], __read(filteredTransactions.getExpenseTransactions().toArray())), __read(filteredDepreciations.toArray())));
+                // all sole income claimed as 100%
+                _this.get('income').setValue(incomeTransactions.getAllocatedAmount(allocations));
+                _this.get('incomeGST').setValue(incomeTransactions.calculateAllocatedGST(allocations));
+                _this.get('expenseGST').setValue(expenseTransactions.filterBy('isGST', true).sumBy('gstClaimAmount'));
+            });
+            // calculate taxWithheldTotal
+            rxjs.combineLatest([_this.get('taxWithheldSalary').valueChanges, _this.get('taxWithheldNoABN').valueChanges])
+                .subscribe(function (_a) {
+                var _b = __read(_a, 2), taxWithheldSalary = _b[0], taxWithheldNoABN = _b[1];
+                _this.get('taxWithheldTotal').setValue(taxWithheldSalary + taxWithheldNoABN);
+            });
+            // calculate gst payable/refundable
+            rxjs.combineLatest([
+                _this.get('incomeGST').valueChanges,
+                _this.get('expenseGST').valueChanges,
+                _this.get('taxWithheldTotal').valueChanges,
+                _this.get('paygTaxInstalment').valueChanges,
+                _this.get('fuelTaxCredit').valueChanges,
+            ]).subscribe(function (_a) {
+                var _b = __read(_a, 5), incomeGST = _b[0], expenseGST = _b[1], taxWithheldTotal = _b[2], paygTaxInstalment = _b[3], fuelTaxCredit = _b[4];
+                _this.get('gst').setValue(incomeGST - expenseGST + taxWithheldTotal + paygTaxInstalment - fuelTaxCredit);
+            });
+            return _this;
+        }
+        return BasReportForm;
+    }(AbstractForm));
+
     var BankAccountAllocationForm = /** @class */ (function (_super) {
         __extends(BankAccountAllocationForm, _super);
         function BankAccountAllocationForm(bankAccount, controls) {
@@ -20208,6 +20441,9 @@
     exports.BankTransactionChartData = BankTransactionChartData;
     exports.BankTransactionCollection = BankTransactionCollection;
     exports.BankTransactionService = BankTransactionService;
+    exports.BasReport = BasReport;
+    exports.BasReportForm = BasReportForm;
+    exports.BasReportService = BasReportService;
     exports.BasiqConfig = BasiqConfig;
     exports.BasiqJob = BasiqJob;
     exports.BasiqJobResponse = BasiqJobResponse;