taxtank-core 0.32.86 → 0.32.88
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/lib/db/Enums/chart-accounts/chart-accounts-adjustment-included-list.enum.mjs +3 -3
- package/esm2022/lib/db/Enums/chart-accounts/chart-accounts-property-adjustments-list.enum.mjs +6 -6
- package/esm2022/lib/db/Models/transaction/transaction-base.mjs +2 -2
- package/esm2022/lib/forms/sole/bas-report.form.mjs +2 -2
- package/esm2022/lib/models/depreciation/depreciation.mjs +2 -2
- package/fesm2022/taxtank-core.mjs +10 -10
- package/fesm2022/taxtank-core.mjs.map +1 -1
- package/lib/db/Enums/chart-accounts/chart-accounts-adjustment-included-list.enum.d.ts +2 -2
- package/lib/db/Enums/chart-accounts/chart-accounts-property-adjustments-list.enum.d.ts +5 -5
- package/package.json +1 -1
package/esm2022/lib/db/Enums/chart-accounts/chart-accounts-adjustment-included-list.enum.mjs
CHANGED
|
@@ -10,7 +10,7 @@ export var ChartAccountsAdjustmentIncludedListEnum;
|
|
|
10
10
|
ChartAccountsAdjustmentIncludedListEnum[ChartAccountsAdjustmentIncludedListEnum["TRAVEL_ALLOWANCE"] = 649] = "TRAVEL_ALLOWANCE";
|
|
11
11
|
ChartAccountsAdjustmentIncludedListEnum[ChartAccountsAdjustmentIncludedListEnum["OTHER_ALLOWANCE"] = 650] = "OTHER_ALLOWANCE";
|
|
12
12
|
ChartAccountsAdjustmentIncludedListEnum[ChartAccountsAdjustmentIncludedListEnum["LAFH"] = 651] = "LAFH";
|
|
13
|
-
ChartAccountsAdjustmentIncludedListEnum[ChartAccountsAdjustmentIncludedListEnum["FUNDS_OVER_ADJUSTMENT"] =
|
|
14
|
-
ChartAccountsAdjustmentIncludedListEnum[ChartAccountsAdjustmentIncludedListEnum["LANDLORD_REIMBURSEMENT"] =
|
|
13
|
+
ChartAccountsAdjustmentIncludedListEnum[ChartAccountsAdjustmentIncludedListEnum["FUNDS_OVER_ADJUSTMENT"] = 906] = "FUNDS_OVER_ADJUSTMENT";
|
|
14
|
+
ChartAccountsAdjustmentIncludedListEnum[ChartAccountsAdjustmentIncludedListEnum["LANDLORD_REIMBURSEMENT"] = 908] = "LANDLORD_REIMBURSEMENT";
|
|
15
15
|
})(ChartAccountsAdjustmentIncludedListEnum || (ChartAccountsAdjustmentIncludedListEnum = {}));
|
|
16
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhcnQtYWNjb3VudHMtYWRqdXN0bWVudC1pbmNsdWRlZC1saXN0LmVudW0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZGIvRW51bXMvY2hhcnQtYWNjb3VudHMvY2hhcnQtYWNjb3VudHMtYWRqdXN0bWVudC1pbmNsdWRlZC1saXN0LmVudW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxDQUFOLElBQVksdUNBYVg7QUFiRCxXQUFZLHVDQUF1QztJQUNsRCwrR0FBYSxDQUFBO0lBQ2IscUdBQVEsQ0FBQTtJQUNSLDJIQUFvQixDQUFBO0lBQ3BCLDZHQUFhLENBQUE7SUFDWiw2SEFBcUIsQ0FBQTtJQUN0QixpSUFBdUIsQ0FBQTtJQUN2QiwySEFBb0IsQ0FBQTtJQUNwQiwrSEFBc0IsQ0FBQTtJQUN0Qiw2SEFBcUIsQ0FBQTtJQUNwQix1R0FBVSxDQUFBO0lBQ1YseUlBQTJCLENBQUE7SUFDM0IsMklBQTRCLENBQUE7QUFDOUIsQ0FBQyxFQWJXLHVDQUF1QyxLQUF2Qyx1Q0FBdUMsUUFhbEQiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZW51bSBDaGFydEFjY291bnRzQWRqdXN0bWVudEluY2x1ZGVkTGlzdEVudW0ge1xuXHRBTExPV0FOQ0UgPSA0LFxuXHRUSVBTID0gNSxcblx0UkVJTUJVUlNFTUVOVFMgPSA1NTUsXG5cdEFEVkFOQ0UgPSA1NTYsXG4gIFBIT05FX0FMTE9XQU5DRSA9IDY0Nixcblx0VU5JRk9STV9BTExPV0FOQ0UgPSA2NDcsXG5cdE1FVEFfQUxMT1dBTkNFID0gNjQ4LFxuXHRUUkFWRUxfQUxMT1dBTkNFID0gNjQ5LFxuXHRPVEhFUl9BTExPV0FOQ0UgPSA2NTAsXG4gIExBRkggPSA2NTEsXG4gIEZVTkRTX09WRVJfQURKVVNUTUVOVCA9IDkwNixcbiAgTEFORExPUkRfUkVJTUJVUlNFTUVOVCA9IDkwOFxufVxuIl19
|
package/esm2022/lib/db/Enums/chart-accounts/chart-accounts-property-adjustments-list.enum.mjs
CHANGED
|
@@ -41,10 +41,10 @@ export var ChartAccountsPropertyAdjustmentsListEnum;
|
|
|
41
41
|
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["SUNDRY_ELECTRICITY_GAS"] = 664] = "SUNDRY_ELECTRICITY_GAS";
|
|
42
42
|
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["MANAGEMENT_FEES_PLATFORM_FEES"] = 857] = "MANAGEMENT_FEES_PLATFORM_FEES";
|
|
43
43
|
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["LOAN_DRAWDOWN"] = 883] = "LOAN_DRAWDOWN";
|
|
44
|
-
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["LANDLORD_CONTRIBUTION"] =
|
|
45
|
-
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["FUNDS_HELD_BY_AGENT"] =
|
|
46
|
-
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["FUNDS_OVER_ADJUSTMENT"] =
|
|
47
|
-
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["RENT_NOT_PAID_OUT"] =
|
|
48
|
-
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["LANDLORD_REIMBURSEMENT"] =
|
|
44
|
+
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["LANDLORD_CONTRIBUTION"] = 904] = "LANDLORD_CONTRIBUTION";
|
|
45
|
+
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["FUNDS_HELD_BY_AGENT"] = 905] = "FUNDS_HELD_BY_AGENT";
|
|
46
|
+
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["FUNDS_OVER_ADJUSTMENT"] = 906] = "FUNDS_OVER_ADJUSTMENT";
|
|
47
|
+
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["RENT_NOT_PAID_OUT"] = 907] = "RENT_NOT_PAID_OUT";
|
|
48
|
+
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["LANDLORD_REIMBURSEMENT"] = 908] = "LANDLORD_REIMBURSEMENT";
|
|
49
49
|
})(ChartAccountsPropertyAdjustmentsListEnum || (ChartAccountsPropertyAdjustmentsListEnum = {}));
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhcnQtYWNjb3VudHMtcHJvcGVydHktYWRqdXN0bWVudHMtbGlzdC5lbnVtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL2RiL0VudW1zL2NoYXJ0LWFjY291bnRzL2NoYXJ0LWFjY291bnRzLXByb3BlcnR5LWFkanVzdG1lbnRzLWxpc3QuZW51bS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLENBQU4sSUFBWSx3Q0ErQ1g7QUEvQ0QsV0FBWSx3Q0FBd0M7SUFDbEQsaUlBQXNCLENBQUE7SUFDdEIsK0lBQTZCLENBQUE7SUFDN0Isd0lBQTBCLENBQUE7SUFDMUIseUhBQWtCLENBQUE7SUFDbEIseUpBQWtDLENBQUE7SUFDbEMscUlBQXdCLENBQUE7SUFDeEIsaUhBQWMsQ0FBQTtJQUNkLDJIQUFtQixDQUFBO0lBQ25CLG1IQUFlLENBQUE7SUFDZix1SEFBaUIsQ0FBQTtJQUNqQixtSEFBZSxDQUFBO0lBQ2YscUlBQXdCLENBQUE7SUFDeEIsaUhBQWMsQ0FBQTtJQUNkLHFIQUFnQixDQUFBO0lBQ2hCLCtIQUFxQixDQUFBO0lBQ3JCLHlIQUFrQixDQUFBO0lBQ2xCLCtIQUFxQixDQUFBO0lBQ3JCLHlIQUFrQixDQUFBO0lBQ2xCLCtIQUFxQixDQUFBO0lBQ3JCLDZIQUFvQixDQUFBO0lBQ3BCLDJJQUEyQixDQUFBO0lBQzNCLHVKQUFpQyxDQUFBO0lBQ2pDLDZKQUFvQyxDQUFBO0lBQ3BDLHlKQUFrQyxDQUFBO0lBQ2xDLHFIQUFnQixDQUFBO0lBQ2hCLHVJQUF5QixDQUFBO0lBQ3pCLHVLQUF5QyxDQUFBO0lBQ3pDLG1KQUErQixDQUFBO0lBQy9CLHFIQUFnQixDQUFBO0lBQ2hCLGlJQUFzQixDQUFBO0lBQ3RCLCtHQUFhLENBQUE7SUFDYixpSEFBYyxDQUFBO0lBQ2QsbUlBQXVCLENBQUE7SUFDdkIscUhBQWdCLENBQUE7SUFDaEIsNkdBQVksQ0FBQTtJQUNaLDJJQUEyQixDQUFBO0lBQzNCLCtJQUE2QixDQUFBO0lBQzdCLCtIQUFxQixDQUFBO0lBQ3JCLDZJQUE0QixDQUFBO0lBQzVCLDJKQUFtQyxDQUFBO0lBQ25DLDJIQUFtQixDQUFBO0lBQ25CLDJJQUEyQixDQUFBO0lBQzNCLHVJQUF5QixDQUFBO0lBQ3pCLDJJQUEyQixDQUFBO0lBQzNCLG1JQUF1QixDQUFBO0lBQ3ZCLDZJQUE0QixDQUFBO0FBQzlCLENBQUMsRUEvQ1csd0NBQXdDLEtBQXhDLHdDQUF3QyxRQStDbkQiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZW51bSBDaGFydEFjY291bnRzUHJvcGVydHlBZGp1c3RtZW50c0xpc3RFbnVtIHtcbiAgSU5URVJFU1RfT05fTE9BTiA9IDMwMixcbiAgQURWRVJUSVNJTkdfRk9SX1RFTkFOVFMgPSAzMDgsXG4gIEJPRFlfQ09SUE9SQVRFX0ZFRVMgPSAzMDEwLFxuICBTUEVDSUFMX0xFVlkgPSAzMTEsXG4gIEJPUlJPV0lOR19FWFBFTlNFU19CQU5LX0ZFRVMgPSAzMTMsXG4gIEJPUlJPV0lOR19FWFBFTlNFUyA9IDMxNSxcbiAgQ0xFQU5JTkcgPSAzMTcsXG4gIENPVU5DSUxfUkFURVMgPSAzMTksXG4gIEdBUkRFTklORyA9IDMyMSxcbiAgTEFXTl9NT1dJTkcgPSAzMjIsXG4gIElOU1VSQU5DRSA9IDQ3NixcbiAgTEFORExPUkRfSU5TVVJBTkNFID0gNDc3LFxuICBMQU5EX1RBWCA9IDQ3OSxcbiAgTEVHQUxfRkVFUyA9IDQ4MSxcbiAgUEVTVF9JTlNQRUNUSU9OID0gNDgzLFxuICBQRVNUX0NPTlRST0wgPSA0ODQsXG4gIE1BTkFHRU1FTlRfRkVFUyA9IDQ4NixcbiAgTEVUVElOR19GRUVTID0gNDg3LFxuICBJTlNQRUNUSU9OX0ZFRVMgPSA0ODgsXG4gIFRSSUJVTklBTF9GRUVTID0gNDg5LFxuICBNQU5BR0VNRU5UX0ZFRVNfT1RIRVIgPSA0OTAsXG4gIEdFTkVSQUxfUkVQQUlSU19NQUlOVEVOQU5DRSA9IDQ5MixcbiAgRUxFQ1RSSUNBTF9SRVBBSVJTX01BSU5URU5BTkNFID0gNDkzLFxuICBQTFVNQklOR19SRVBBSVJTX01BSU5URU5BTkNFID0gNDk0LFxuICBLRVlTX0xPQ0tTID0gNDk1LFxuICBTTU9LRV9BTEFSTV9TRVJWSUNFID0gNDk2LFxuICBBSVJfQ09ORElUSU9ORVJfUkVQQUlSU19NQUlOVEVOQU5DRSA9IDQ5NyxcbiAgUkVQQUlSU19NQUlOVEVOQU5DRV9PVEhFUiA9IDQ5OCxcbiAgU1RBVElPTkVSWSA9IDUwMCxcbiAgVEVMRVBIT05FX01PQklMRSA9IDUwMSxcbiAgUE9TVEFHRSA9IDUwMixcbiAgSU5URVJORVQgPSA1MDMsXG4gIFdBVEVSX1JBVEVTX1VTQUdFID0gNTA1LFxuICBXQVRFUl9UQU5LID0gNTA2LFxuICBTVU5EUlkgPSA1MDgsXG4gIERFUFJFQ0lBVElPTl9TQ0hFRFVMRSA9IDUwOSxcbiAgUkVOVEFMX0RFRFVDVElPTlNfT1RIRVIgPSA1MTAsXG4gIFRSQVZFTF9FWFBFTlNFUyA9IDY1NSxcbiAgU1VORFJZX0VMRUNUUklDSVRZX0dBUyA9IDY2NCxcbiAgTUFOQUdFTUVOVF9GRUVTX1BMQVRGT1JNX0ZFRVMgPSA4NTcsXG4gIExPQU5fRFJBV0RPV04gPSA4ODMsXG4gIExBTkRMT1JEX0NPTlRSSUJVVElPTiA9IDkwNCxcbiAgRlVORFNfSEVMRF9CWV9BR0VOVCA9IDkwNSxcbiAgRlVORFNfT1ZFUl9BREpVU1RNRU5UID0gOTA2LFxuICBSRU5UX05PVF9QQUlEX09VVCA9IDkwNyxcbiAgTEFORExPUkRfUkVJTUJVUlNFTUVOVCA9IDkwOFxufVxuIl19
|
|
@@ -84,7 +84,7 @@ export class TransactionBase extends ObservableModel {
|
|
|
84
84
|
return CHART_ACCOUNTS_CATEGORIES.personal.includes(this.chartAccounts?.category);
|
|
85
85
|
}
|
|
86
86
|
get amountWithGst() {
|
|
87
|
-
return this.isGST ?
|
|
87
|
+
return this.isGST ? round(this.amount * ChartAccounts.GSTCoefficient, 2) : this.amount;
|
|
88
88
|
}
|
|
89
89
|
get gstAmount() {
|
|
90
90
|
return round(this.amountWithGst - this.amount, 2);
|
|
@@ -120,4 +120,4 @@ __decorate([
|
|
|
120
120
|
__decorate([
|
|
121
121
|
Exclude()
|
|
122
122
|
], TransactionBase.prototype, "gstClaimAmount", null);
|
|
123
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
123
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"transaction-base.js","sourceRoot":"","sources":["../../../../../../../projects/tt-core/src/lib/db/Models/transaction/transaction-base.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,yBAAyB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEpF,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,MAAM,cAAc,CAAC;AAEjC,MAAM,OAAgB,eAAgB,SAAQ,eAAe;IAuB3D,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,kBAAkB,GAAG,GAAG,CAAC;IACvC,CAAC;IAED,IAAI,QAAQ;QACV,QAAQ,IAAI,EAAE;YACZ,KAAK,IAAI,CAAC,cAAc,EAAE;gBACxB,OAAO,YAAY,CAAC,QAAQ,CAAC;YAC/B,KAAK,IAAI,CAAC,UAAU,EAAE;gBACpB,OAAO,YAAY,CAAC,IAAI,CAAC;YAC3B,KAAK,IAAI,CAAC,UAAU,EAAE;gBACpB,OAAO,YAAY,CAAC,IAAI,CAAC;YAC3B,KAAK,IAAI,CAAC,aAAa,EAAE;gBACvB,OAAO,YAAY,CAAC,OAAO,CAAC;YAC9B,KAAK,IAAI,CAAC,WAAW,EAAE;gBACrB,OAAO,YAAY,CAAC,KAAK,CAAC;YAC5B;gBACE,OAAO,YAAY,CAAC,QAAQ,CAAC;SAChC;IACH,CAAC;IAED;;OAEG;IACH,IAAI,QAAQ,CAAC,QAAsB;IACnC,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,gDAAgD;QAChD,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,OAAO,yBAAyB,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;SACjF;QAED,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,UAAU;QACR,gDAAgD;QAChD,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,OAAO,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;SAC9E;QAED,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;IACtD,CAAC;IAED;;OAEG;IACH,UAAU;QACR,gDAAgD;QAChD,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,OAAO,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;SAC9E;QAED,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,aAAa;QACX,gDAAgD;QAChD,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,OAAO,yBAAyB,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;SACjF;QAED,6DAA6D;QAC7D,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;IACtD,CAAC;IAED,WAAW;QACT,gDAAgD;QAChD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACvB,OAAO,KAAK,CAAC;SACd;QAED,OAAO,yBAAyB,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAChF,CAAC;IAED,cAAc;QACZ,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACvB,OAAO,KAAK,CAAC;SACd;QAED,OAAO,yBAAyB,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IACnF,CAAC;IAGD,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;IACzF,CAAC;IAGD,IAAI,SAAS;QACX,OAAO,KAAK,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACpD,CAAC;IAGD,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC;IACtC,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC;IAC5C,CAAC;CACF;AA3IC;IADC,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;+CACzC;AAGhB;IADC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC;6CACN;AAed;IADC,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;2DACL;AAiG5B;IADC,OAAO,EAAE;oDAGT;AAGD;IADC,OAAO,EAAE;gDAGT;AAGD;IADC,OAAO,EAAE;qDAGT","sourcesContent":["import { Property } from '../property/property';\nimport { ChartAccounts as ChartAccountsBase } from '../chart-accounts/chart-accounts';\nimport { AppFile, CHART_ACCOUNTS_CATEGORIES, ChartAccounts } from '../../../models';\nimport { SoleBusiness } from '../sole/sole-business';\nimport { Exclude, Transform, Type } from 'class-transformer';\nimport { TankTypeEnum } from '../../Enums/tank-type.enum';\nimport { ObservableModel } from '../observable-model';\nimport round from 'lodash/round';\n\nexport abstract class TransactionBase extends ObservableModel {\n  // @TODO update db scheme to always have a number\n  @Transform(({ value }) => value === null ? null : +value)\n  amount?: number;\n\n  @Type(() => AppFile)\n  file: AppFile;\n\n  property?: Property;\n  business?: SoleBusiness;\n  date?: Date;\n  chartAccounts?: ChartAccountsBase;\n  description?: string;\n\n  /**\n   * gst applies to sole trader expense/income, if he is registered and chartAccounts is eligible\n   */\n  isGST?: boolean;\n  claimPercent?: number;\n\n  @Transform(({ value }) => +value)\n  sharedClaimPercent?: number;\n\n  get gstCoefficient(): number {\n    return this.isGST ? ChartAccounts.GSTCoefficient : 1;\n  }\n\n  get claimRatio(): number {\n    return this.sharedClaimPercent / 100;\n  }\n\n  get tankType(): TankTypeEnum {\n    switch (true) {\n      case this.isPropertyTank():\n        return TankTypeEnum.PROPERTY;\n      case this.isWorkTank():\n        return TankTypeEnum.WORK;\n      case this.isSoleTank():\n        return TankTypeEnum.SOLE;\n      case this.isHoldingTank():\n        return TankTypeEnum.HOLDING;\n      case this.isOtherTank():\n        return TankTypeEnum.OTHER;\n      default:\n        return TankTypeEnum.PERSONAL;\n    }\n  }\n\n  /**\n   * @TODO remove when AllocateForm is refactored and not merging with Transaction class which cause the issue\n   */\n  set tankType(tankType: TankTypeEnum) {\n  }\n\n  /**\n   * Check if current tank is Property\n   */\n  isPropertyTank(): boolean {\n    // chart accounts may be empty for new instances\n    if (this.chartAccounts) {\n      return CHART_ACCOUNTS_CATEGORIES.property.includes(this.chartAccounts.category);\n    }\n\n    return !!this.property;\n  }\n\n  /**\n   * Check if current tank is Work\n   */\n  isWorkTank(): boolean {\n    // chart accounts may be empty for new instances\n    if (this.chartAccounts) {\n      return CHART_ACCOUNTS_CATEGORIES.work.includes(this.chartAccounts?.category);\n    }\n\n    return !this.isPropertyTank() && !this.isSoleTank();\n  }\n\n  /**\n   * Check if current tank is Sole\n   */\n  isSoleTank(): boolean {\n    // chart accounts may be empty for new instances\n    if (this.chartAccounts) {\n      return CHART_ACCOUNTS_CATEGORIES.sole.includes(this.chartAccounts?.category);\n    }\n\n    return !!this.business;\n  }\n\n  isHoldingTank(): boolean {\n    // chart accounts may be empty for new instances\n    if (this.chartAccounts) {\n      return CHART_ACCOUNTS_CATEGORIES.holding.includes(this.chartAccounts?.category);\n    }\n\n    // @TODO Alex we need another way to distinguish work/holding\n    return !this.isPropertyTank() && !this.isSoleTank();\n  }\n\n  isOtherTank(): boolean {\n    // chart accounts may be empty for new instances\n    if (!this.chartAccounts) {\n      return false;\n    }\n\n    return CHART_ACCOUNTS_CATEGORIES.other.includes(this.chartAccounts?.category);\n  }\n\n  isPersonalTank(): boolean {\n    if (!this.chartAccounts) {\n      return false;\n    }\n\n    return CHART_ACCOUNTS_CATEGORIES.personal.includes(this.chartAccounts?.category);\n  }\n\n  @Exclude()\n  get amountWithGst(): number {\n    return this.isGST ? round(this.amount * ChartAccounts.GSTCoefficient, 2) : this.amount;\n  }\n\n  @Exclude()\n  get gstAmount(): number {\n    return round(this.amountWithGst - this.amount, 2);\n  }\n\n  @Exclude()\n  get gstClaimAmount(): number {\n    return this.gstAmount * this.claimRatio;\n  }\n\n  /**\n   * base grossAmount, extends in child classes\n   */\n  get grossAmount(): number {\n    return this.amount + this.gstAmount;\n  }\n\n  get grossClaimAmount(): number {\n    return this.grossAmount * this.claimRatio;\n  }\n}\n"]}
|
|
@@ -31,7 +31,7 @@ export class BasReportForm extends AbstractForm {
|
|
|
31
31
|
const expenseTransactions = new TransactionCollection(filteredTransactions.getExpenseTransactions().toArray(), filteredDepreciations.toArray());
|
|
32
32
|
// all sole income claimed as 100%
|
|
33
33
|
// @TODO temp fix, waiting for TT-3503/TT-3495 breaking changes
|
|
34
|
-
this.patchField('income', incomeTransactions.sumBy('
|
|
34
|
+
this.patchField('income', incomeTransactions.sumBy('amountWithGst'));
|
|
35
35
|
this.patchField('incomeGST', incomeTransactions.sumBy('gstAmount'));
|
|
36
36
|
this.patchField('expenseGST', expenseTransactions.filterBy('isGST', true).sumBy('gstClaimAmount'));
|
|
37
37
|
});
|
|
@@ -59,4 +59,4 @@ export class BasReportForm extends AbstractForm {
|
|
|
59
59
|
return super.submit(data, true);
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bas-report.form.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/forms/sole/bas-report.form.ts"],"names":[],"mappings":"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","sourcesContent":["import { AbstractForm } from '../abstract.form';\nimport { BasReport } from '../../models';\nimport { UntypedFormControl, Validators } from '@angular/forms';\nimport { combineLatest } from 'rxjs';\nimport {\n  DepreciationCollection,\n  TransactionCollection\n} from '../../collections';\n\n/**\n * business activity statement report\n * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/268533936/BAS+Report\n */\nexport class BasReportForm extends AbstractForm<BasReport> {\n  constructor(report: BasReport, transactions: TransactionCollection, depreciations: DepreciationCollection) {\n    super({\n      dateFrom: new UntypedFormControl(report.dateFrom, Validators.required),\n      dateTo: new UntypedFormControl(report.dateTo, Validators.required),\n      income: new UntypedFormControl({ value: report.income, disabled: true }),\n      incomeGST: new UntypedFormControl({ value: report.incomeGST, disabled: true }, Validators.required),\n      expenseGST: new UntypedFormControl({ value: report.expenseGST, disabled: true }, Validators.required),\n      salary: new UntypedFormControl(report.salary, Validators.required),\n      taxWithheldSalary: new UntypedFormControl(report.taxWithheldSalary, Validators.required),\n      taxWithheldNoABN: new UntypedFormControl(report.taxWithheldNoABN, Validators.required),\n      taxWithheldTotal: new UntypedFormControl({ value: report.taxWithheldTotal || 0, disabled: true }),\n      paygTaxInstalment: new UntypedFormControl(report.paygTaxInstalment, Validators.required),\n      fuelTaxCredit: new UntypedFormControl(report.fuelTaxCredit, Validators.required),\n      gst: new UntypedFormControl({ value: report.gst, disabled: true }),\n    }, report);\n\n    // prefill income/expense data based on transactions/depreciations filtered by specified date\n    combineLatest([this.get('dateFrom').valueChanges, this.get('dateTo').valueChanges])\n      .subscribe(([dateFrom, dateTo]) => {\n        const filteredTransactions = transactions.filterByRange('date', dateFrom, dateTo);\n        const filteredDepreciations = depreciations.filterByRange('date', dateFrom, dateTo);\n\n        const incomeTransactions = filteredTransactions.getIncomeTransactions();\n        const expenseTransactions = new TransactionCollection(\n          filteredTransactions.getExpenseTransactions().toArray(),\n          filteredDepreciations.toArray()\n        );\n\n        // all sole income claimed as 100%\n        // @TODO temp fix, waiting for TT-3503/TT-3495 breaking changes\n        this.patchField('income', incomeTransactions.sumBy('amountWithGst'));\n        this.patchField('incomeGST', incomeTransactions.sumBy('gstAmount'));\n        this.patchField('expenseGST', expenseTransactions.filterBy('isGST', true).sumBy('gstClaimAmount'));\n      });\n\n    // calculate taxWithheldTotal\n    combineLatest([this.get('taxWithheldSalary').valueChanges, this.get('taxWithheldNoABN').valueChanges])\n      .subscribe(([taxWithheldSalary, taxWithheldNoABN]) => {\n        this.patchField('taxWithheldTotal', taxWithheldSalary + taxWithheldNoABN);\n      });\n\n    // calculate gst payable/refundable\n    combineLatest([\n      this.get('incomeGST').valueChanges,\n      this.get('expenseGST').valueChanges,\n      this.get('taxWithheldTotal').valueChanges,\n      this.get('paygTaxInstalment').valueChanges,\n      this.get('fuelTaxCredit').valueChanges,\n    ]).subscribe(([incomeGST, expenseGST, taxWithheldTotal, paygTaxInstalment, fuelTaxCredit]) => {\n      this.patchField('gst', incomeGST - expenseGST + taxWithheldTotal + paygTaxInstalment - fuelTaxCredit);\n    });\n\n    // emit init values to calculate dynamic fields\n    if (report.id) {\n      this.emitValues();\n    }\n  }\n\n  submit(data: object = {}): BasReport {\n    return super.submit(data, true);\n  }\n}\n"]}
|
|
@@ -53,7 +53,7 @@ export class Depreciation extends DepreciationBase {
|
|
|
53
53
|
return this.isAsset()
|
|
54
54
|
&& !this.isSBPCalculation()
|
|
55
55
|
&& this.isDiminishing()
|
|
56
|
-
&& this.
|
|
56
|
+
&& !this.isWrittenOff()
|
|
57
57
|
&& this.currentYearForecast.closeBalance <= Depreciation.LOW_VALUE_POOL_THRESHOLD;
|
|
58
58
|
}
|
|
59
59
|
isSBP() {
|
|
@@ -185,4 +185,4 @@ __decorate([
|
|
|
185
185
|
__decorate([
|
|
186
186
|
Exclude()
|
|
187
187
|
], Depreciation.prototype, "gstClaimAmount", null);
|
|
188
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"depreciation.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/models/depreciation/depreciation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Depreciation as DepreciationBase } from '../../db/Models/depreciation/depreciation';\nimport { DepreciationTypeEnum } from '../../db/Enums/depreciation-type.enum';\nimport { DepreciationCalculationEnum } from '../../db/Enums/depreciation-calculation.enum';\nimport { ChartAccountsHeadingVehicleListEnum, ChartAccountsListEnum } from '../../db/Enums';\nimport { DepreciationCapitalProject } from './depreciation-capital-project';\nimport { DepreciationForecast } from './depreciation-forecast';\nimport { FinancialYear } from '../financial-year';\nimport { ChartAccounts } from '../chart-accounts';\nimport { BankTransaction } from '../bank';\nimport { Exclude, Transform, Type, plainToClass } from 'class-transformer';\nimport { Transaction } from '../transaction';\nimport { Expense } from '../../interfaces';\n\n/**\n * @TODO Alex: clarify grouping rules and refactor\n */\nexport class Depreciation extends DepreciationBase implements Expense {\n  static WRITTEN_OFF_THRESHOLD = 300;\n  static LOW_VALUE_POOL_THRESHOLD = 1000;\n\n  @Type(() => Date)\n  purchaseDate: Date;\n\n  @Type(() => Date)\n  date: Date;\n\n  @Type(() => Date)\n  lowValuePoolDate: Date;\n\n  @Type(() => Date)\n  writeOffManualDate: Date;\n\n  @Type(() => Date)\n  writeOffDate: Date;\n\n  @Type(() => DepreciationCapitalProject)\n  depreciationCapitalProject: DepreciationCapitalProject;\n\n  @Type(() => DepreciationForecast)\n  @Transform(({ value, obj }) => {\n    // value = array of DepreciationForecast\n    // obj = plain (whole Depreciation object)\n    // Set isLVP flag for each DepreciationForecast\n    // @TODO refactor\n    value.forEach((forecast: DepreciationForecast): void => {\n      forecast.isLVP =\n        forecast.closeBalance < 1000 &&\n        obj.calculation === DepreciationCalculationEnum.DIMINISHING &&\n        obj.type === DepreciationTypeEnum.PLANT_EQUIPMENT &&\n        !(obj.amount > Depreciation.WRITTEN_OFF_THRESHOLD && obj.amount < Depreciation.LOW_VALUE_POOL_THRESHOLD) &&\n        !(obj.writeOffDate && new FinancialYear(new Date(obj.writeOffDate)).year === obj.financialYear);\n    });\n    return value;\n  })\n  forecasts: DepreciationForecast[] = [];\n\n  @Type(() => ChartAccounts)\n  chartAccounts: ChartAccounts;\n\n  @Type(() => BankTransaction)\n  bankTransaction: BankTransaction;\n\n  type: DepreciationTypeEnum = DepreciationTypeEnum.PLANT_EQUIPMENT;\n\n  /**\n   * @TODO remove after ? signs removed from db models\n   */\n  amount = 0;\n\n  // Type checking\n\n  isCapital(): boolean {\n    return this.type === DepreciationTypeEnum.CAPITAL_WORKS;\n  }\n\n  isBorrowingExpense(): boolean {\n    return this.type === DepreciationTypeEnum.BORROWING_EXPENSES;\n  }\n\n  isAsset(): boolean {\n    return this.type === DepreciationTypeEnum.PLANT_EQUIPMENT;\n  }\n\n  // Calculation checking\n\n  isSBPCalculation(): boolean {\n    return this.calculation === DepreciationCalculationEnum.SBP;\n  }\n\n  isPrimeCost(): boolean {\n    return this.calculation === DepreciationCalculationEnum.PRIME_COST;\n  }\n\n  isDiminishing(): boolean {\n    return this.calculation === DepreciationCalculationEnum.DIMINISHING;\n  }\n\n  // Pool checking\n\n  isPlantEquipmentPool(): boolean {\n    return this.isAsset() && !this.isSBPCalculation() && !this.isWrittenOff() && !this.isLVP();\n  }\n\n  isLVP(): boolean {\n    return this.isAsset()\n      && !this.isSBPCalculation()\n      && this.isDiminishing()\n      && this.currentYearForecast.closeBalance > Depreciation.WRITTEN_OFF_THRESHOLD\n      && this.currentYearForecast.closeBalance <= Depreciation.LOW_VALUE_POOL_THRESHOLD;\n  }\n\n  isSBP(): boolean {\n    return this.isAsset() && this.isSBPCalculation() && !this.isWrittenOff();\n  }\n\n  isWrittenOff(): boolean {\n    return this.writeOffYear === new FinancialYear().year;\n  }\n\n  get writeOffYear(): number {\n    if (!this.writeOffManualDate && !this.writeOffDate) {\n      return null;\n    }\n\n    return new FinancialYear(this.writeOffManualDate || this.writeOffDate)?.year;\n  }\n\n  /**\n   * Check if depreciation chart accounts heading related to vehicles category\n   */\n  isVehicleDepreciation(): boolean {\n    return this.chartAccounts.heading?.id === ChartAccountsHeadingVehicleListEnum.DEPRECIATION_VEHICLES;\n  }\n\n  /**\n   * Get depreciation purchase date\n   */\n  getDate(): Date {\n    return this.date;\n  }\n\n  /**\n   * @TODO Vik: Research a problem with depreciations without current year forecast\n   */\n  get currentYearForecast(): DepreciationForecast {\n    return this.forecasts.find(\n      (forecast: DepreciationForecast): boolean => forecast.financialYear === new FinancialYear().year\n    ) || plainToClass(DepreciationForecast, {\n      financialYear: new FinancialYear().year,\n      openBalance: 0,\n      closeBalance: 0,\n      amount: 0,\n      claimPercent: 0\n    });\n  }\n\n  getForecastByYear(year: number): DepreciationForecast {\n    return this.forecasts.find((forecast: DepreciationForecast): boolean => forecast.financialYear === year);\n  }\n\n  getClaimAmountByYear(year: number): number {\n    return this.getForecastByYear(year)?.claimAmount || 0;\n  }\n\n  getCloseBalanceByYear(year: number): number {\n    return this.getForecastByYear(year)?.closeBalance || 0;\n  }\n\n  isBuildingAtCost() {\n    return this.chartAccounts.id === ChartAccountsListEnum.BUILDING_AT_COST;\n  }\n\n  /**\n   * Create a new transaction from current depreciation\n   */\n  toTransaction(params = {}): Transaction {\n    return plainToClass(\n      Transaction,\n      Object.assign(params, this, {\n        amount: -this.currentYearForecast?.amount || 0,\n        claimAmount: -this.currentYearForecast?.claimAmount || 0,\n        claimPercent: this.currentYearForecast?.claimPercent || 0,\n      })\n    );\n  }\n\n  /**\n   * @TODO Michael: remove and check everywhere in reports\n   */\n  get claimAmount(): number {\n    return this.currentYearForecast?.claimAmount || 0;\n  }\n\n  @Exclude()\n  get amountWithGst(): number {\n    // gst applies only to new assets\n    if (this.isNew()) {\n      return super.amountWithGst;\n    }\n\n    return this.amount;\n  }\n\n  @Exclude()\n  get gstClaimAmount(): number {\n    return this.gstAmount * this.currentYearForecast?.claimRate;\n  }\n\n  /**\n   * assets purchased in the current financial year\n   */\n  isNew(): boolean {\n    return new FinancialYear(this.date).year === new FinancialYear().year\n  }\n}\n"]}
|
|
188
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"depreciation.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/models/depreciation/depreciation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Depreciation as DepreciationBase } from '../../db/Models/depreciation/depreciation';\nimport { DepreciationTypeEnum } from '../../db/Enums/depreciation-type.enum';\nimport { DepreciationCalculationEnum } from '../../db/Enums/depreciation-calculation.enum';\nimport { ChartAccountsHeadingVehicleListEnum, ChartAccountsListEnum } from '../../db/Enums';\nimport { DepreciationCapitalProject } from './depreciation-capital-project';\nimport { DepreciationForecast } from './depreciation-forecast';\nimport { FinancialYear } from '../financial-year';\nimport { ChartAccounts } from '../chart-accounts';\nimport { BankTransaction } from '../bank';\nimport { Exclude, Transform, Type, plainToClass } from 'class-transformer';\nimport { Transaction } from '../transaction';\nimport { Expense } from '../../interfaces';\n\n/**\n * @TODO Alex: clarify grouping rules and refactor\n */\nexport class Depreciation extends DepreciationBase implements Expense {\n  static WRITTEN_OFF_THRESHOLD = 300;\n  static LOW_VALUE_POOL_THRESHOLD = 1000;\n\n  @Type(() => Date)\n  purchaseDate: Date;\n\n  @Type(() => Date)\n  date: Date;\n\n  @Type(() => Date)\n  lowValuePoolDate: Date;\n\n  @Type(() => Date)\n  writeOffManualDate: Date;\n\n  @Type(() => Date)\n  writeOffDate: Date;\n\n  @Type(() => DepreciationCapitalProject)\n  depreciationCapitalProject: DepreciationCapitalProject;\n\n  @Type(() => DepreciationForecast)\n  @Transform(({ value, obj }) => {\n    // value = array of DepreciationForecast\n    // obj = plain (whole Depreciation object)\n    // Set isLVP flag for each DepreciationForecast\n    // @TODO refactor\n    value.forEach((forecast: DepreciationForecast): void => {\n      forecast.isLVP =\n        forecast.closeBalance < 1000 &&\n        obj.calculation === DepreciationCalculationEnum.DIMINISHING &&\n        obj.type === DepreciationTypeEnum.PLANT_EQUIPMENT &&\n        !(obj.amount > Depreciation.WRITTEN_OFF_THRESHOLD && obj.amount < Depreciation.LOW_VALUE_POOL_THRESHOLD) &&\n        !(obj.writeOffDate && new FinancialYear(new Date(obj.writeOffDate)).year === obj.financialYear);\n    });\n    return value;\n  })\n  forecasts: DepreciationForecast[] = [];\n\n  @Type(() => ChartAccounts)\n  chartAccounts: ChartAccounts;\n\n  @Type(() => BankTransaction)\n  bankTransaction: BankTransaction;\n\n  type: DepreciationTypeEnum = DepreciationTypeEnum.PLANT_EQUIPMENT;\n\n  /**\n   * @TODO remove after ? signs removed from db models\n   */\n  amount = 0;\n\n  // Type checking\n\n  isCapital(): boolean {\n    return this.type === DepreciationTypeEnum.CAPITAL_WORKS;\n  }\n\n  isBorrowingExpense(): boolean {\n    return this.type === DepreciationTypeEnum.BORROWING_EXPENSES;\n  }\n\n  isAsset(): boolean {\n    return this.type === DepreciationTypeEnum.PLANT_EQUIPMENT;\n  }\n\n  // Calculation checking\n\n  isSBPCalculation(): boolean {\n    return this.calculation === DepreciationCalculationEnum.SBP;\n  }\n\n  isPrimeCost(): boolean {\n    return this.calculation === DepreciationCalculationEnum.PRIME_COST;\n  }\n\n  isDiminishing(): boolean {\n    return this.calculation === DepreciationCalculationEnum.DIMINISHING;\n  }\n\n  // Pool checking\n\n  isPlantEquipmentPool(): boolean {\n    return this.isAsset() && !this.isSBPCalculation() && !this.isWrittenOff() && !this.isLVP();\n  }\n\n  isLVP(): boolean {\n    return this.isAsset()\n      && !this.isSBPCalculation()\n      && this.isDiminishing()\n      && !this.isWrittenOff()\n      && this.currentYearForecast.closeBalance <= Depreciation.LOW_VALUE_POOL_THRESHOLD;\n  }\n\n  isSBP(): boolean {\n    return this.isAsset() && this.isSBPCalculation() && !this.isWrittenOff();\n  }\n\n  isWrittenOff(): boolean {\n    return this.writeOffYear === new FinancialYear().year;\n  }\n\n  get writeOffYear(): number {\n    if (!this.writeOffManualDate && !this.writeOffDate) {\n      return null;\n    }\n\n    return new FinancialYear(this.writeOffManualDate || this.writeOffDate)?.year;\n  }\n\n  /**\n   * Check if depreciation chart accounts heading related to vehicles category\n   */\n  isVehicleDepreciation(): boolean {\n    return this.chartAccounts.heading?.id === ChartAccountsHeadingVehicleListEnum.DEPRECIATION_VEHICLES;\n  }\n\n  /**\n   * Get depreciation purchase date\n   */\n  getDate(): Date {\n    return this.date;\n  }\n\n  /**\n   * @TODO Vik: Research a problem with depreciations without current year forecast\n   */\n  get currentYearForecast(): DepreciationForecast {\n    return this.forecasts.find(\n      (forecast: DepreciationForecast): boolean => forecast.financialYear === new FinancialYear().year\n    ) || plainToClass(DepreciationForecast, {\n      financialYear: new FinancialYear().year,\n      openBalance: 0,\n      closeBalance: 0,\n      amount: 0,\n      claimPercent: 0\n    });\n  }\n\n  getForecastByYear(year: number): DepreciationForecast {\n    return this.forecasts.find((forecast: DepreciationForecast): boolean => forecast.financialYear === year);\n  }\n\n  getClaimAmountByYear(year: number): number {\n    return this.getForecastByYear(year)?.claimAmount || 0;\n  }\n\n  getCloseBalanceByYear(year: number): number {\n    return this.getForecastByYear(year)?.closeBalance || 0;\n  }\n\n  isBuildingAtCost() {\n    return this.chartAccounts.id === ChartAccountsListEnum.BUILDING_AT_COST;\n  }\n\n  /**\n   * Create a new transaction from current depreciation\n   */\n  toTransaction(params = {}): Transaction {\n    return plainToClass(\n      Transaction,\n      Object.assign(params, this, {\n        amount: -this.currentYearForecast?.amount || 0,\n        claimAmount: -this.currentYearForecast?.claimAmount || 0,\n        claimPercent: this.currentYearForecast?.claimPercent || 0,\n      })\n    );\n  }\n\n  /**\n   * @TODO Michael: remove and check everywhere in reports\n   */\n  get claimAmount(): number {\n    return this.currentYearForecast?.claimAmount || 0;\n  }\n\n  @Exclude()\n  get amountWithGst(): number {\n    // gst applies only to new assets\n    if (this.isNew()) {\n      return super.amountWithGst;\n    }\n\n    return this.amount;\n  }\n\n  @Exclude()\n  get gstClaimAmount(): number {\n    return this.gstAmount * this.currentYearForecast?.claimRate;\n  }\n\n  /**\n   * assets purchased in the current financial year\n   */\n  isNew(): boolean {\n    return new FinancialYear(this.date).year === new FinancialYear().year\n  }\n}\n"]}
|
|
@@ -522,7 +522,7 @@ class TransactionBase extends ObservableModel {
|
|
|
522
522
|
return CHART_ACCOUNTS_CATEGORIES.personal.includes(this.chartAccounts?.category);
|
|
523
523
|
}
|
|
524
524
|
get amountWithGst() {
|
|
525
|
-
return this.isGST ?
|
|
525
|
+
return this.isGST ? round(this.amount * ChartAccounts.GSTCoefficient, 2) : this.amount;
|
|
526
526
|
}
|
|
527
527
|
get gstAmount() {
|
|
528
528
|
return round(this.amountWithGst - this.amount, 2);
|
|
@@ -1292,8 +1292,8 @@ var ChartAccountsAdjustmentIncludedListEnum;
|
|
|
1292
1292
|
ChartAccountsAdjustmentIncludedListEnum[ChartAccountsAdjustmentIncludedListEnum["TRAVEL_ALLOWANCE"] = 649] = "TRAVEL_ALLOWANCE";
|
|
1293
1293
|
ChartAccountsAdjustmentIncludedListEnum[ChartAccountsAdjustmentIncludedListEnum["OTHER_ALLOWANCE"] = 650] = "OTHER_ALLOWANCE";
|
|
1294
1294
|
ChartAccountsAdjustmentIncludedListEnum[ChartAccountsAdjustmentIncludedListEnum["LAFH"] = 651] = "LAFH";
|
|
1295
|
-
ChartAccountsAdjustmentIncludedListEnum[ChartAccountsAdjustmentIncludedListEnum["FUNDS_OVER_ADJUSTMENT"] =
|
|
1296
|
-
ChartAccountsAdjustmentIncludedListEnum[ChartAccountsAdjustmentIncludedListEnum["LANDLORD_REIMBURSEMENT"] =
|
|
1295
|
+
ChartAccountsAdjustmentIncludedListEnum[ChartAccountsAdjustmentIncludedListEnum["FUNDS_OVER_ADJUSTMENT"] = 906] = "FUNDS_OVER_ADJUSTMENT";
|
|
1296
|
+
ChartAccountsAdjustmentIncludedListEnum[ChartAccountsAdjustmentIncludedListEnum["LANDLORD_REIMBURSEMENT"] = 908] = "LANDLORD_REIMBURSEMENT";
|
|
1297
1297
|
})(ChartAccountsAdjustmentIncludedListEnum || (ChartAccountsAdjustmentIncludedListEnum = {}));
|
|
1298
1298
|
|
|
1299
1299
|
var ChartAccountsTypeEnum;
|
|
@@ -1391,11 +1391,11 @@ var ChartAccountsPropertyAdjustmentsListEnum;
|
|
|
1391
1391
|
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["SUNDRY_ELECTRICITY_GAS"] = 664] = "SUNDRY_ELECTRICITY_GAS";
|
|
1392
1392
|
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["MANAGEMENT_FEES_PLATFORM_FEES"] = 857] = "MANAGEMENT_FEES_PLATFORM_FEES";
|
|
1393
1393
|
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["LOAN_DRAWDOWN"] = 883] = "LOAN_DRAWDOWN";
|
|
1394
|
-
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["LANDLORD_CONTRIBUTION"] =
|
|
1395
|
-
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["FUNDS_HELD_BY_AGENT"] =
|
|
1396
|
-
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["FUNDS_OVER_ADJUSTMENT"] =
|
|
1397
|
-
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["RENT_NOT_PAID_OUT"] =
|
|
1398
|
-
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["LANDLORD_REIMBURSEMENT"] =
|
|
1394
|
+
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["LANDLORD_CONTRIBUTION"] = 904] = "LANDLORD_CONTRIBUTION";
|
|
1395
|
+
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["FUNDS_HELD_BY_AGENT"] = 905] = "FUNDS_HELD_BY_AGENT";
|
|
1396
|
+
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["FUNDS_OVER_ADJUSTMENT"] = 906] = "FUNDS_OVER_ADJUSTMENT";
|
|
1397
|
+
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["RENT_NOT_PAID_OUT"] = 907] = "RENT_NOT_PAID_OUT";
|
|
1398
|
+
ChartAccountsPropertyAdjustmentsListEnum[ChartAccountsPropertyAdjustmentsListEnum["LANDLORD_REIMBURSEMENT"] = 908] = "LANDLORD_REIMBURSEMENT";
|
|
1399
1399
|
})(ChartAccountsPropertyAdjustmentsListEnum || (ChartAccountsPropertyAdjustmentsListEnum = {}));
|
|
1400
1400
|
|
|
1401
1401
|
var DocumentTypeEnum;
|
|
@@ -6682,7 +6682,7 @@ class Depreciation extends Depreciation$1 {
|
|
|
6682
6682
|
return this.isAsset()
|
|
6683
6683
|
&& !this.isSBPCalculation()
|
|
6684
6684
|
&& this.isDiminishing()
|
|
6685
|
-
&& this.
|
|
6685
|
+
&& !this.isWrittenOff()
|
|
6686
6686
|
&& this.currentYearForecast.closeBalance <= Depreciation.LOW_VALUE_POOL_THRESHOLD;
|
|
6687
6687
|
}
|
|
6688
6688
|
isSBP() {
|
|
@@ -21432,7 +21432,7 @@ class BasReportForm extends AbstractForm {
|
|
|
21432
21432
|
const expenseTransactions = new TransactionCollection(filteredTransactions.getExpenseTransactions().toArray(), filteredDepreciations.toArray());
|
|
21433
21433
|
// all sole income claimed as 100%
|
|
21434
21434
|
// @TODO temp fix, waiting for TT-3503/TT-3495 breaking changes
|
|
21435
|
-
this.patchField('income', incomeTransactions.sumBy('
|
|
21435
|
+
this.patchField('income', incomeTransactions.sumBy('amountWithGst'));
|
|
21436
21436
|
this.patchField('incomeGST', incomeTransactions.sumBy('gstAmount'));
|
|
21437
21437
|
this.patchField('expenseGST', expenseTransactions.filterBy('isGST', true).sumBy('gstClaimAmount'));
|
|
21438
21438
|
});
|