taxtank-core 0.28.112 → 0.28.114

package/bundles/taxtank-core.umd.js

@@ -1778,8 +1778,9 @@
         /**
          * Get total sum of items by field
          */
-        Collection.prototype.sumBy = function (path) {
-            return +this.items.reduce(function (sum, item) { return sum + Number(get__default["default"](item, path)); }, 0).toFixed(2);
+        Collection.prototype.sumBy = function (path, abs) {
+            if (abs === void 0) { abs = false; }
+            return +this.items.reduce(function (sum, item) { return sum + (abs ? Math.abs(Number(get__default["default"](item, path))) : Number(get__default["default"](item, path))); }, 0).toFixed(2);
         };
         Collection.prototype.groupBy = function (path) {
             if (path === void 0) { path = ''; }
@@ -3489,6 +3490,16 @@
         ChartAccountsTypeEnum[ChartAccountsTypeEnum["EXPENSE"] = 2] = "EXPENSE";
     })(exports.ChartAccountsTypeEnum || (exports.ChartAccountsTypeEnum = {}));
 
+    /**
+     * most of chartAccounts could have only negative or positive amount,
+     * but there are exceptions like advance income (free loan from company u work for), it's positive number when you receive it,
+     * and negative when you pay it back (still income, but with negative amount)
+     */
+    exports.ChartAccountsKeepSign = void 0;
+    (function (ChartAccountsKeepSign) {
+        ChartAccountsKeepSign[ChartAccountsKeepSign["ADVANCE"] = 556] = "ADVANCE";
+    })(exports.ChartAccountsKeepSign || (exports.ChartAccountsKeepSign = {}));
+
     // @TODO Artem TT-2308 move everything
 
     var ChartAccountsMetadata = /** @class */ (function (_super) {
@@ -5854,7 +5865,7 @@
                 // salary included transactions affect parent transaction amount and as a result grossAmount, skip to avoid double sum
                 grossAmount += new Collection(this.transactions)
                     .filter(function (t) { var _a; return !((_a = t.chartAccounts) === null || _a === void 0 ? void 0 : _a.isSalaryIncluded()); })
-                    .sumBy('amount');
+                    .sumBy('amount', true);
                 if (this.isWorkTank()) {
                     grossAmount += this.frankingCredit - this.taxFreeComponent - this.eligibleForReduction;
                 }
@@ -5876,6 +5887,14 @@
             enumerable: false,
             configurable: true
         });
+        /**
+         * most of the transactions could have only positive or negative amount depends on chartAccounts, so we ignore
+         * user's choice and transform amount, but there are exceptions like advance (negative or positive amount)
+         */
+        Transaction.prototype.ignoreSign = function () {
+            var _a;
+            return !(((_a = this.chartAccounts) === null || _a === void 0 ? void 0 : _a.id) in exports.ChartAccountsKeepSign);
+        };
         return Transaction;
     }(Transaction$1));
     __decorate([
@@ -18557,8 +18576,6 @@
         __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
@@ -18592,15 +18609,17 @@
          * Check validation and return a new instance of generic model.
          * Merge form value to initial object
          * @param data Additional data object which be merged to form value
+         * @param includeDisabledFields ignore disabled fields
          */
-        AbstractForm.prototype.submit = function (data) {
+        AbstractForm.prototype.submit = function (data, includeDisabledFields) {
             if (data === void 0) { data = {}; }
+            if (includeDisabledFields === void 0) { includeDisabledFields = false; }
             this.submitted = true;
             this.markAllAsTouched();
             if (!this.disabled && !this.valid) {
                 return null;
             }
-            var value = this.submitDisabledFields ? this.getRawValue() : this.value;
+            var value = includeDisabledFields ? this.getRawValue() : this.value;
             var model = this.createModelInstance(Object.assign({}, this.model, value, data));
             this.onSubmit.emit(model);
             return model;
@@ -19611,7 +19630,6 @@
                 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) {
@@ -19644,6 +19662,10 @@
             });
             return _this;
         }
+        BasReportForm.prototype.submit = function (data) {
+            if (data === void 0) { data = {}; }
+            return _super.prototype.submit.call(this, data, true);
+        };
         return BasReportForm;
     }(AbstractForm));
 
@@ -20958,17 +20980,14 @@
         };
         TransactionBaseForm.prototype.watchChartAccounts = function () {
             var _this = this;
-            this.get('chartAccounts').valueChanges.subscribe(function (value) {
-                if (!(value instanceof ChartAccounts)) {
-                    return;
-                }
+            this.get('chartAccounts').valueChanges.subscribe(function (chartAccounts) {
                 // recalculate claim percent for selected chart accounts
-                _this.updateClaimPercent(value);
+                _this.updateClaimPercent(chartAccounts);
                 if (!_this.isGstApplicable()) {
                     return;
                 }
                 // update gst if applicable
-                if (value.isGST) {
+                if (chartAccounts.isGST) {
                     _this.get('isGST').enable();
                     _this.get('isGST').patchValue(true);
                 }
@@ -21062,7 +21081,7 @@
             var formGroup = new forms.FormGroup({
                 id: new forms.FormControl(transaction.id),
                 chartAccounts: new forms.FormControl(transaction.chartAccounts, [forms.Validators.required, autocompleteValidator()]),
-                amount: new forms.FormControl(Math.abs(transaction.amount), [forms.Validators.required]),
+                amount: new forms.FormControl(transaction.amount, [forms.Validators.required]),
             });
             this.get('transactions').push(formGroup);
         };
@@ -21075,19 +21094,22 @@
          */
         TransactionForm.prototype.buildTransactions = function (transaction) {
             var _this = this;
-            return this.get('transactions').value.map(function (childTransaction) { return Object.assign({
-                description: childTransaction.chartAccounts.name,
-                date: transaction.date,
-                claimPercent: transaction.claimPercent,
-                source: exports.TransactionSourceEnum.BANK_TRANSACTION,
-                type: childTransaction.chartAccounts.isExpense() ? exports.TransactionTypeEnum.DEBIT : exports.TransactionTypeEnum.CREDIT,
-                incomeSource: transaction.incomeSource,
-                property: transaction.property
-            }, _this.model.transactions.find(function (transaction) { return transaction.id === childTransaction['id']; }) || {}, childTransaction); });
+            return this.get('transactions').value.map(function (childTransaction) {
+                var _a, _b, _c;
+                return Object.assign({
+                    description: (_a = childTransaction.chartAccounts) === null || _a === void 0 ? void 0 : _a.name,
+                    date: transaction.date,
+                    claimPercent: (transaction.claimPercent * ((_b = childTransaction.chartAccounts) === null || _b === void 0 ? void 0 : _b.taxablePercent)) / 100,
+                    source: exports.TransactionSourceEnum.BANK_TRANSACTION,
+                    type: ((_c = childTransaction.chartAccounts) === null || _c === void 0 ? void 0 : _c.isExpense()) ? exports.TransactionTypeEnum.DEBIT : exports.TransactionTypeEnum.CREDIT,
+                    incomeSource: transaction.incomeSource,
+                    property: transaction.property
+                }, _this.model.transactions.find(function (transaction) { return transaction.id === childTransaction['id']; }) || {}, childTransaction);
+            });
         };
         TransactionForm.prototype.submit = function (data) {
             if (data === void 0) { data = {}; }
-            return _super.prototype.submit.call(this, Object.assign(data, { transactions: this.buildTransactions(this.currentValue) }));
+            return _super.prototype.submit.call(this, Object.assign(data, { transactions: this.buildTransactions(this.currentValue) }), true);
         };
         return TransactionForm;
     }(TransactionBaseForm));
@@ -21097,6 +21119,8 @@
         function WorkIncomeForm(transaction, registeredForGst, allocations) {
             var _this = this;
             var _a;
+            // for work income we need to show netAmount instead of amount (because some adjustments are included in amount)
+            transaction.amount = transaction.netAmount;
             _this = _super.call(this, transaction, registeredForGst, allocations, {
                 // additional data related to work income (like tax instalments)
                 metadata: new forms.FormArray((transaction.metadata || []).map(function (transactionMetadata) {
@@ -21111,10 +21135,6 @@
                 }, forms.Validators.required),
                 incomeSource: new forms.FormControl(transaction.incomeSource, [forms.Validators.required, autocompleteValidator()]),
             }) || this;
-            // @TODO we use amount field as netAmount to avoid extra watcher for amount recalculation
-            if (transaction.id) {
-                _this.get('amount').setValue(transaction.netAmount);
-            }
             // forbid to edit some fields for allocated transaction
             if (allocations.length) {
                 _this.get('chartAccounts').disable();
@@ -21142,23 +21162,17 @@
         WorkIncomeForm.prototype.watchChartAccounts = function () {
             var _this = this;
             _super.prototype.watchChartAccounts.call(this);
-            this.get('chartAccounts').valueChanges.subscribe(function (value) {
-                // some fields depend on ChartAccounts and can't be filled until it's selected
-                if (!(value instanceof ChartAccounts)) {
-                    _this.get('tax').disable();
-                    _this.get('transactions').disable();
-                    return;
-                }
+            this.get('chartAccounts').valueChanges.subscribe(function (chartAccounts) {
                 _this.buildMetadataForm();
                 // tax make no sense for pre-paying tax category
-                if (value.isNRAS()) {
+                if (chartAccounts.isNRAS()) {
                     _this.get('tax').disable();
                 }
                 else {
                     _this.get('tax').enable();
                 }
                 // adjustments possible only for salary chartAccounts
-                if (value.isSalary()) {
+                if (chartAccounts.isSalary()) {
                     _this.get('transactions').enable();
                 }
                 else {