taxtank-core 2.1.21 → 2.1.23

package/fesm2022/taxtank-core.mjs

@@ -1096,6 +1096,9 @@ var ChartAccountsHeadingListEnum;
     ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["TYRES_BATTERIES"] = 66] = "TYRES_BATTERIES";
     ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["OTHER_EXPENSES"] = 67] = "OTHER_EXPENSES";
     ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["DEPRECIATION_EXPENSES"] = 68] = "DEPRECIATION_EXPENSES";
+    ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["BAS_GST"] = 69] = "BAS_GST";
+    ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SOLE_HOME_OFFICE_FIXED"] = 76] = "SOLE_HOME_OFFICE_FIXED";
+    ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SOLE_HOME_OFFICE_ACTUAL"] = 77] = "SOLE_HOME_OFFICE_ACTUAL";
 })(ChartAccountsHeadingListEnum || (ChartAccountsHeadingListEnum = {}));
 
 var ChartAccountsHeadingTaxDeductibleEnum;
@@ -6996,12 +6999,23 @@ class Transaction extends Transaction$1 {
     isInterest() {
         return this.chartAccounts.id === ChartAccountsListEnum.INTEREST_ON_LOAN;
     }
-    /**
-     * Check if transaction type is vehicle
-     */
-    isVehicleTransaction() {
+    isVehicleExpense() {
         return this.chartAccounts.isVehicleExpense();
     }
+    isHomeOfficeExpense() {
+        return [
+            ChartAccountsHeadingListEnum.HOME_OFFICE_RUNNING,
+            ChartAccountsHeadingListEnum.HOME_OFFICE_OCCUPANCY,
+            ChartAccountsHeadingListEnum.SOLE_HOME_OFFICE_FIXED,
+            ChartAccountsHeadingListEnum.SOLE_HOME_OFFICE_ACTUAL,
+        ].includes(this.chartAccounts.heading?.id);
+    }
+    isBasExpense() {
+        return this.chartAccounts.heading?.id === ChartAccountsHeadingListEnum.BAS_GST;
+    }
+    isOperatingExpense() {
+        return !this.isVehicleExpense() && !this.isHomeOfficeExpense() && !this.isBasExpense();
+    }
     get taxFreeComponent() {
         return this.getMetaFieldValue(ChartAccountsMetaFieldListEnum.TAX_FREE_COMPONENT);
     }
@@ -7658,11 +7672,14 @@ class TransactionCollection extends TransactionBaseCollection {
         });
         return dictionary;
     }
-    /**
-     * Get transactions related to Vehicle category
-     */
-    getVehicleTransactions() {
-        return this.create(this.items.filter((transaction) => transaction.isVehicleTransaction()));
+    getVehicleExpenses() {
+        return this.create(this.items.filter((transaction) => transaction.isVehicleExpense()));
+    }
+    getHomeOfficeExpenses() {
+        return this.create(this.items.filter((transaction) => transaction.isHomeOfficeExpense()));
+    }
+    getOperatingExpenses() {
+        return this.create(this.items.filter((transaction) => transaction.isOperatingExpense()));
     }
     /**
      * Get new transaction collection filtered by tank type
@@ -7700,7 +7717,7 @@ class TransactionCollection extends TransactionBaseCollection {
         if (!vehicleClaim) {
             return this.create([]);
         }
-        return this.getVehicleTransactions()
+        return this.getVehicleExpenses()
             .filterBy('tankType', vehicleClaim.tankType)
             .filterBy('business.id', vehicleClaim.business?.id);
     }
@@ -7709,7 +7726,7 @@ class TransactionCollection extends TransactionBaseCollection {
      */
     getLogbookTransactions() {
         return this
-            .getVehicleTransactions()
+            .getVehicleExpenses()
             .removeBy('chartAccounts.id', [ChartAccountsListEnum.KMS_TRAVELLED, BusinessChartAccountsEnum.KMS_TRAVELLED]);
     }
     /**
@@ -8148,7 +8165,7 @@ class MyTaxBusinessLosses {
             depreciations
                 .filterBy('chartAccounts.category', [BusinessChartAccountsEnum.KMS_TRAVELLED])
                 .sumBy('claimAmount'));
-        this.logbookExpensesAmount = Math.abs(transactions.getVehicleTransactions().sumBy('claimAmount')) +
+        this.logbookExpensesAmount = Math.abs(transactions.getVehicleExpenses().sumBy('claimAmount')) +
             depreciations.getVehicleDepreciations().sumBy('claimAmount');
         this.otherExpensesAmount = Math.abs(transactions
             .filterBy('chartAccounts.taxReturnItem.id', TaxReturnItemEnum.ALL_OTHER_EXPENSES)
@@ -8876,6 +8893,10 @@ const REPORTS = {
             title: 'BAS Report',
             description: 'Summarises your GST obligations from applicable sales and purchases to enable accurate ATO lodgements.',
             routerLink: './bas',
+        }, {
+            title: 'Profit & Loss Report',
+            description: 'Business-style P&L showing income, expenses and profit across your selected businesses, with optional prior year comparison.',
+            routerLink: './sole-profit-loss',
         },
     ],
     [UserRolesEnum$1.HOLDING_TANK]: [
@@ -24705,6 +24726,18 @@ class BankAccountPropertiesForm extends UntypedFormArray {
     }
 }
 
+/**
+ * Validator check if entered strong length is equal to passed length parameter
+ */
+function requiredLengthValidator(length) {
+    return (control) => {
+        if (control.value && control.value.length !== length) {
+            return { requiredLength: length };
+        }
+        return null;
+    };
+}
+
 class SoleBusinessForm extends AbstractForm {
     constructor(business = plainToClass(SoleBusiness, {})) {
         super({
@@ -24715,6 +24748,7 @@ class SoleBusinessForm extends AbstractForm {
             file: new UntypedFormControl(business.file),
             isPrimaryProduction: new FormControl(business.isPrimaryProduction),
             isTaxFree: new FormControl(business.isTaxFree),
+            abn: new FormControl(business.abn, requiredLengthValidator(11)),
         }, business);
         this.business = business;
         // User have to create income source with new business.
@@ -24745,6 +24779,9 @@ class SoleBusinessForm extends AbstractForm {
         if (this.contains('incomeSource')) {
             this.listenNameChanges();
         }
+        this.get('isTaxFree').valueChanges.subscribe(() => {
+            this.get('abn').setValue(null);
+        });
     }
     /**
      * We take the first forecast because income sources available only for new business, so we have only one forecast
@@ -24852,18 +24889,6 @@ class SoleBusinessLossForm extends AbstractForm {
     }
 }
 
-/**
- * Validator check if entered strong length is equal to passed length parameter
- */
-function requiredLengthValidator(length) {
-    return (control) => {
-        if (control.value && control.value.length !== length) {
-            return { requiredLength: length };
-        }
-        return null;
-    };
-}
-
 class SoleContactForm extends AbstractForm {
     constructor(contact = plainToClass(SoleContact, {})) {
         super({
@@ -27356,8 +27381,8 @@ class TransactionBaseFilterForm extends FormGroup {
     constructor(model = plainToClass(TransactionBaseFilter, {})) {
         super({
             tankType: new FormControl(model.tankType),
-            business: new FormControl({ value: model.business, disabled: true }),
-            properties: new FormControl({ value: model.properties, disabled: true }),
+            business: new FormControl({ value: model.business, disabled: model.tankType !== TankTypeEnum.SOLE }),
+            properties: new FormControl({ value: model.properties, disabled: model.tankType !== TankTypeEnum.PROPERTY }),
             dateRange: new FormControl(model.dateRange),
             chartAccounts: new FormControl(model.chartAccounts),
         });
@@ -27385,6 +27410,7 @@ class TransactionBaseFilterForm extends FormGroup {
         }
         const value = this.value;
         const [dateFrom, dateTo] = value.dateRange || [];
+        const businesses = Array.isArray(value.business) ? value.business : [value.business];
         if (!excludeDate && dateFrom) {
             collection = collection.filter(transaction => transaction.date >= dateFrom);
         }
@@ -27394,8 +27420,8 @@ class TransactionBaseFilterForm extends FormGroup {
         if (value.tankType) {
             collection = collection.filterBy('tankType', value.tankType);
         }
-        if (value.business) {
-            collection = collection.filterBy('business.id', value.business.id);
+        if (businesses.length) {
+            collection = collection.filterBy('business.id', businesses.map(business => business.id));
         }
         if (value.properties?.length) {
             collection = collection.filterBy('property.id', value.properties.map(property => property.id));