taxtank-core 0.28.110 → 0.28.111

package/lib/collections/transaction/transaction.collection.d.ts

@@ -19,9 +19,6 @@ export declare class TransactionCollection extends ExportableCollection<Transact
     constructor(transactions?: Transaction[], depreciations?: Depreciation[]);
     getSoleTransactions(): this;
     get amount(): number;
-    /**
-     * Difference between allocated amount and total amount
-     */
     getUnallocatedAmount(allocations: TransactionAllocationCollection): number;
     /**
      * get date of the last transaction

package/lib/forms/transaction/work-income.form.d.ts

@@ -11,16 +11,12 @@ export declare class WorkIncomeForm extends TransactionForm implements IEventLis
      */
     private buildMetadataForm;
     /**
-     * @param transaction
-     * @param includeAdjustments reduce result by adjustments included in salary if false or increase amount with included salary adjustments to match received payment if true,
-     * salary/wage comes to bankAccount together with related chartAccounts like tips (kind of salary, but reported in different tax summary section),
+     * salary comes to bankAccount together with related transactions like tips (kind of salary, but reported in different tax summary section),
      * adjustments used to clarify received payment by separating it into multiple transactions,
-     * formAmount always match received payment, it also matches parent transactionAmount when there are no adjustments,
-     * otherwise it includes such adjustments, so we should exclude it from formAmount to create a salary transaction (on submit)
-     * but include in form->amount to match bank transaction (on edit),
-     * ie bankTransaction=1000$, it includes 900$ salary and 100$ tips (should be reported in different tax summary sections),
-     * so we should show 1000$ in formAmount, but create 2 transactions with 900$ and 100$
+     * netAmount always match received payment and includes related adjustments
+     * amount calculated as netAmount - salary included adjustments
+     * ie bankTransaction=1000$ with 900$ salary and 100$ tips will create 2 transactions with 900$ and 100$
      */
-    getAmount(transaction: Transaction, includeAdjustments?: boolean): number;
+    getAmount(): number;
     submit(data?: object): Transaction;
 }

package/lib/models/transaction/transaction.d.ts

@@ -85,12 +85,14 @@ export declare class Transaction extends TransactionBase implements Expense, IRe
     isAllocated(allocations: TransactionAllocationCollection): boolean;
     getAllocatedAmount(allocations: TransactionAllocationCollection): number;
     getAllocatedClaimAmount(allocations: TransactionAllocationCollection): number;
-    /**
-     * Get transaction unallocated amount
-     */
     getUnallocatedAmount(allocations: TransactionAllocationCollection): number;
     /**
      * Total transaction amount including taxes and other additional amounts
      */
     get grossAmount(): number;
+    /**
+     * netAmount matches received payment (bankTransaction amount), includes gst and salary included adjustments
+     * ie user received 1000$ salary including 100$ tips. NetAmount=1000$, amount=900$, tips=100$
+     */
+    get netAmount(): number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.28.110",
+  "version": "0.28.111",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^12.2.3 || ~13.0.0",