taxtank-core 1.0.52 → 1.0.53

package/fesm2022/taxtank-core.mjs

@@ -7842,8 +7842,9 @@ class MyTaxDeductions {
     setOtherWorkRelatedExpensesTotalAmount() {
         const otherIncomeRelatedExpenses = this.transactions
             .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherIncomeRelatedExpenses);
-        this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) -
-            this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');
+        this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount'))
+            - this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount')
+            + this.depreciations.getByTankType(TankTypeEnum.WORK).getLVPDepreciations().sumBy('claimAmount');
     }
     calculateWorkRelatedSelfEducationTotalAmount() {
         return this.workRelatedSelfEducationExpenses ? this.workRelatedSelfEducationExpenses.sumBy('claimAmount') - MyTaxDeductions.selfEducationNotDeductibleAmount : 0;
@@ -8097,11 +8098,7 @@ class MyTaxRent {
     constructor(transactions, depreciations, taxSummary) {
         this.propertyExpenses = transactions.getPropertyTransactions().getExpenseTransactions();
         this.taxSummaryPropertySection = taxSummary.property;
-        this.grossRentAmount = transactions
-            .getPropertyTransactions()
-            .getIncomeTransactions()
-            .filterBy('chartAccounts.id', [ChartAccountsListEnum.RENTAL_INCOME, ChartAccountsListEnum.OTHER_RENTAL_INCOME])
-            .getGrossClaimAmountWithoutGst();
+        this.grossRentAmount = this.taxSummaryPropertySection.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.property.income, TaxSummarySectionEnum.PROPERTY_TANK);
         this.interestDeductionsAmount = transactions.getInterestTransactions().sumBy('claimAmount');
         this.capitalWorksDeductionsAmount = -depreciations.getCapitalDepreciations().sumBy('claimAmount');
         this.otherRentalDeductionsAmount = this.calculateOtherRentalDeductionsAmount();
@@ -11979,6 +11976,7 @@ let RestService$1 = class RestService extends DataService {
             return;
         }
         this.sseService.on(this.mercureTopic).pipe(map((response) => {
+            console.log(response);
             let model = this.createModelInstance(response);
             let method;
             if (model.id) {
@@ -11991,6 +11989,7 @@ let RestService$1 = class RestService extends DataService {
             }
             return { method, model };
         })).subscribe((change) => {
+            console.log(change);
             this.handleResponse([change.model], change.method);
         });
     }
@@ -12719,6 +12718,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.2", ngImpor
  * Service for work with messages
  */
 class MessageService extends RestService$1 {
+    // mercureTopic = 'messages';
     constructor(environment) {
         super(environment);
         this.environment = environment;
@@ -12726,7 +12726,6 @@ class MessageService extends RestService$1 {
         this.collectionClass = MessageCollection;
         this.endpointUri = 'messages';
         this.disabledMethods = ['postBatch', 'putBatch'];
-        this.mercureTopic = 'messages';
         this.listenEvents();
     }
     listenEvents() {
@@ -13288,6 +13287,7 @@ var ClientInviteMessages;
 })(ClientInviteMessages || (ClientInviteMessages = {}));
 
 class ClientMovementService extends RestService$1 {
+    // mercureTopic = 'clientMovements';
     constructor(environment) {
         super(environment);
         this.environment = environment;
@@ -13295,7 +13295,6 @@ class ClientMovementService extends RestService$1 {
         this.collectionClass = ClientMovementCollection;
         this.modelClass = ClientMovement;
         this.disabledMethods = ['postBatch', 'delete', 'deleteBatch'];
-        this.mercureTopic = 'clientMovements';
         this.listenEvents();
     }
     listenEvents() {
@@ -15682,8 +15681,8 @@ class TaxSummary {
     }
     get workDepreciations() {
         return this.work.items
-            .findByCategory(TaxReturnCategoryListEnum.WORK_OTHER_EXPENSES).details.items
-            .find(item => item.name === 'Depreciation')?.amount;
+            .findByCategory(TaxReturnCategoryListEnum.WORK_OTHER_EXPENSES)?.details?.items
+            .find(item => item.name === 'Depreciation')?.amount ?? 0;
     }
     /**
      * Property Net Cash (Cash Position) = Rental Income - expenses - interest
@@ -24176,6 +24175,14 @@ class MyTaxIncomeStatementsForm extends AbstractForm {
                 value: incomeStatements.australianSpecialPaymentsTotalTax,
                 disabled: true
             }),
+            foreignIncome: new UntypedFormControl({
+                value: incomeStatements.foreignIncome,
+                disabled: true
+            }),
+            foreignTaxWithheld: new UntypedFormControl({
+                value: incomeStatements.foreignTaxWithheld,
+                disabled: true
+            }),
         });
         this.incomeStatements = incomeStatements;
     }