@tasenor/common-plugins 1.9.116 → 1.9.118

package/src/FinnishBalanceSheetReport/backend/index.ts

@@ -1,4 +1,4 @@
-import { AccountNumber, Language, PluginCode, ReportID, ReportOptions, Version } from '@tasenor/common'
+import { AccountNumber, Language, PluginCode, ReportID, ReportLine, ReportOptions, Version } from '@tasenor/common'
 import { ReportPlugin } from '@tasenor/common-node'
 import dayjs from 'dayjs'
 import quarterOfYear from 'dayjs/plugin/quarterOfYear'
@@ -66,7 +66,7 @@ class FinnishBalanceSheetReport extends ReportPlugin {
     }
   }
 
-  preProcess(id, entries, options, settings, columns) {
+  preProcess(id, entries, options, settings, columns): ReportLine[] {
     const columnNames = columns.map((col) => col.name)
 
     // Summarize all totals from the entries.
@@ -92,8 +92,8 @@ class FinnishBalanceSheetReport extends ReportPlugin {
     const liabilities = data.find(line => line.name === 'Vastattavaa yhteensä')
     const assets = data.find(line => line.name === 'Vastaavaa yhteensä')
     if (liabilities && assets) {
-      Object.values(liabilities.amounts).forEach((value, idx) => {
-        if (Object.values(assets.amounts)[idx] !== value) {
+      Object.values(liabilities.values).forEach((value, idx) => {
+        if (Object.values(assets.values)[idx] !== value) {
           assets.error = true
           liabilities.error = true
         }

package/src/FinnishBalanceSheetReportLite/backend/index.ts

@@ -67,7 +67,7 @@ class FinnishBalanceSheetReportLite extends ReportPlugin {
   async getColumns(id, entries, options) {
     const columns = options.periods.map((period) => {
       return {
-        type: 'numeric',
+        type: 'currency',
         name: 'period' + period.id,
         title: this.columnTitle(id, period, options)
       }
@@ -106,8 +106,8 @@ class FinnishBalanceSheetReportLite extends ReportPlugin {
     const liabilities = data.find(line => line.name === 'Vastattavaa yhteensä')
     const assets = data.find(line => line.name === 'Vastaavaa yhteensä')
     if (liabilities && assets) {
-      Object.values(liabilities.amounts).forEach((value, idx) => {
-        if (Object.values(assets.amounts)[idx] !== value) {
+      Object.values(liabilities.values).forEach((value, idx) => {
+        if (Object.values(assets.values)[idx] !== value) {
           assets.error = true
           liabilities.error = true
         }

package/src/FinnishIncomeStatementReport/backend/index.ts

@@ -82,12 +82,12 @@ class FinnishIncomeStatementReport extends ReportPlugin {
     // Construct columns for each tag and extra column for non-tagged.
     if (options.byTags) {
       const columns = settings.tags.map((tag) => ({
-        type: 'numeric',
+        type: 'currency',
         name: `tag-${tag.tag}`,
         title: tag.name
       }))
       columns.push({
-        type: 'numeric',
+        type: 'currency',
         name: 'other',
         title: '{Other}'
       })
@@ -188,10 +188,10 @@ class FinnishIncomeStatementReport extends ReportPlugin {
     // Find empty columns.
     const found = new Set()
     for (const line of data) {
-      if (!line.amounts) {
+      if (!line.values) {
         continue
       }
-      for (const [k, v] of Object.entries(line.amounts)) {
+      for (const [k, v] of Object.entries(line.values)) {
         if (v !== null && !isNaN(v as number)) {
           found.add(k)
         }
@@ -200,7 +200,7 @@ class FinnishIncomeStatementReport extends ReportPlugin {
 
     // Remove empty columns.
     for (let i = 0; i < columns.length; i++) {
-      if (columns[i].type === 'numeric' && !found.has(columns[i].name)) {
+      if ((columns[i].type === 'currency' || columns[i].type === 'numeric') && !found.has(columns[i].name)) {
         columns.splice(i, 1)
         i--
       }

package/src/FinnishIncomeStatementReportLite/backend/index.ts

@@ -80,12 +80,12 @@ class FinnishIncomeStatementReportLite extends ReportPlugin {
     // Construct columns for each tag and extra column for non-tagged.
     if (options.byTags) {
       const columns = settings.tags.map((tag) => ({
-        type: 'numeric',
+        type: 'currency',
         name: `tag-${tag.tag}`,
         title: tag.name
       }))
       columns.push({
-        type: 'numeric',
+        type: 'currency',
         name: 'other',
         title: '{Other}'
       })
@@ -186,10 +186,10 @@ class FinnishIncomeStatementReportLite extends ReportPlugin {
     // Find empty columns.
     const found = new Set()
     for (const line of data) {
-      if (!line.amounts) {
+      if (!line.values) {
         continue
       }
-      for (const [k, v] of Object.entries(line.amounts)) {
+      for (const [k, v] of Object.entries(line.values)) {
         if (v !== null && !isNaN(v as number)) {
           found.add(k)
         }
@@ -198,7 +198,7 @@ class FinnishIncomeStatementReportLite extends ReportPlugin {
 
     // Remove empty columns.
     for (let i = 0; i < columns.length; i++) {
-      if (columns[i].type === 'numeric' && !found.has(columns[i].name)) {
+      if ((columns[i].type === 'numeric' || columns[i].type === 'currency') && !found.has(columns[i].name)) {
         columns.splice(i, 1)
         i--
       }

package/src/IncomeAndExpenses/backend/income.json

@@ -65,6 +65,12 @@
       "OTHER_OPERATING_INCOME",
       "MISC_INCOME"
     ],
+    "MISC_INCOME": [
+      "REWARDS"
+    ],
+    "REWARDS": [
+      "LEARNING_REWARDS"
+    ],
     "SPECIAL_INCOME_CASES": [
       "NEEDS_MANUAL_INSPECTION_IN",
       "ERROR_INCOME"
@@ -110,6 +116,8 @@
     "OTHER_INCOME": "INCOME",
     "OTHER_OPERATING_INCOME": "OTHER_INCOME",
     "MISC_INCOME": "OTHER_INCOME",
+    "REWARDS": "MISC_INCOME",
+    "LEARNING_REWARDS": "REWARDS",
     "SPECIAL_INCOME_CASES": "INCOME",
     "NEEDS_MANUAL_INSPECTION_IN": "SPECIAL_INCOME_CASES",
     "ERROR_INCOME": "SPECIAL_INCOME_CASES",

package/src/IncomeAndExpenses/backend/index.ts

@@ -145,6 +145,7 @@ class IncomeAndExpenses extends DataPlugin {
         'income-INCOME_CORRECTION_WITHHOLDING_TAX': 'Corrections in Withholding Tax',
         'income-INTEREST': 'Interest Income',
         'income-INVEST': 'Capital Investments',
+        'income-LEARNING_REWARDS': 'Learning rewards',
         'income-LISTED_CASH_DIVIDEND': 'Cash Dividends from Listed Companies',
         'income-LISTED_DIVIDEND': 'Dividends from Listed Companies',
         'income-LISTED_STOCK_DIVIDEND': 'Stock Dividends from Listed Companies',
@@ -158,6 +159,7 @@ class IncomeAndExpenses extends DataPlugin {
         'income-OTHER_OPERATING_INCOME': 'Other operating income',
         'income-P2P_INTEREST': 'Interest Income from P2P Loaning',
         'income-PAID_SHARES': 'Payment Received from Company Shares',
+        'income-REWARDS': 'Rewards',
         'income-SALES': 'Sales',
         'income-SHAREHOLDER_BORROWING': 'Loan from a Shareholder',
         'income-SHARE_ISSUED': 'Issue New Shares',
@@ -310,6 +312,7 @@ class IncomeAndExpenses extends DataPlugin {
         'income-INCOME_CORRECTION_WITHHOLDING_TAX': 'Korjaukset ennakonpidätyksiin',
         'income-INTEREST': 'Korkotulot',
         'income-INVEST': 'Pääomasijoitukset',
+        'income-LEARNING_REWARDS': 'Opintopalkkiot',
         'income-LISTED_CASH_DIVIDEND': 'Käteisosingot listatuista yhtiöistä',
         'income-LISTED_DIVIDEND': 'Osingot listatuista yhtiöistä',
         'income-LISTED_STOCK_DIVIDEND': 'Osakeosingot listatuista yhtiöistä',
@@ -323,6 +326,7 @@ class IncomeAndExpenses extends DataPlugin {
         'income-OTHER_OPERATING_INCOME': 'Muut liiketoiminnan tuotot',
         'income-P2P_INTEREST': 'Korkotulot P2P lainaamisesta',
         'income-PAID_SHARES': 'Osakeannista saadut maksut',
+        'income-REWARDS': 'Palkkiot',
         'income-SALES': 'Myynti',
         'income-SHAREHOLDER_BORROWING': 'Osakaslainan nosto',
         'income-SHARE_ISSUED': 'Uusien osakkeiden liikkeellelasku',

package/src/JournalReport/backend/index.ts

@@ -56,11 +56,11 @@ class JournalReport extends ReportPlugin {
       name: 'title',
       title: '{column-date-and-accounts}'
     }, {
-      type: 'numeric',
+      type: 'currency',
       name: 'debit',
       title: '{column-debit}'
     }, {
-      type: 'numeric',
+      type: 'currency',
       name: 'credit',
       title: '{column-credit}'
     }]
@@ -81,7 +81,7 @@ class JournalReport extends ReportPlugin {
         number: entry.number,
         description: entry.description,
         date: entry.date,
-        amounts: {
+        values: {
           debit: entry.amount >= 0 ? entry.amount : null,
           credit: entry.amount < 0 ? -entry.amount : null
         }
@@ -138,13 +138,13 @@ class JournalReport extends ReportPlugin {
           data.push({
             tab: 0,
             name: `${line.number} ${line.name}: ${line.description}`,
-            amounts: line.amounts
+            values: line.values
           })
         } else {
           data.push({
             tab: 2,
             name: `${line.number} ${line.name}`,
-            amounts: line.amounts
+            values: line.values
           })
         }
       })

package/src/LedgerReport/backend/index.ts

@@ -56,15 +56,15 @@ class LedgerReport extends ReportPlugin {
       name: 'name',
       title: '{column-name-or-date}'
     }, {
-      type: 'numeric',
+      type: 'currency',
       name: 'debit',
       title: '{column-debit}'
     }, {
-      type: 'numeric',
+      type: 'currency',
       name: 'credit',
       title: '{column-credit}'
     }, {
-      type: 'numeric',
+      type: 'currency',
       name: 'balance',
       title: '{column-balance}'
     }]
@@ -87,7 +87,7 @@ class LedgerReport extends ReportPlugin {
         documentId: entry.documentId,
         description: entry.description,
         date: entry.date,
-        amounts: {
+        values: {
           debit: entry.amount >= 0 ? entry.amount : null,
           credit: entry.amount < 0 ? -entry.amount : null,
           balance: null
@@ -110,16 +110,16 @@ class LedgerReport extends ReportPlugin {
       })
       let total = 0
       lines.forEach((line) => {
-        total += line.amounts.debit
-        total -= line.amounts.credit
-        line.amounts.balance = total
+        total += line.values.debit
+        total -= line.values.credit
+        line.values.balance = total
         if (options.compact) {
           data.push({
             tab: 0,
             needLocalization: true,
             id: `#${line.documentId}`,
             name: `{${this.time2str(line.date)}} ${line.description.replace(/^(\[.+?\])+\s*/g, '')}`,
-            amounts: line.amounts
+            values: line.values
           })
         } else {
           data.push({
@@ -137,7 +137,7 @@ class LedgerReport extends ReportPlugin {
           data.push({
             tab: 0,
             name: '',
-            amounts: line.amounts
+            values: line.values
           })
         }
       })
@@ -146,7 +146,7 @@ class LedgerReport extends ReportPlugin {
         name: '',
         bold: true,
         bigger: true,
-        amounts: {
+        values: {
           debit: '',
           credit: '',
           balance: total

package/src/index.ts

@@ -1,3 +1,4 @@
+export { default as AssetReportBackend } from './AssetReport/backend'
 export { default as CoinAPIBackend } from './CoinAPI/backend'
 export { default as CoinbaseImportBackend } from './CoinbaseImport/backend'
 export { CoinbaseHandler } from './CoinbaseImport/backend/CoinbaseHandler'

package/.turbo/turbo-nightly3.log

@@ -1,56 +0,0 @@
-
-> @tasenor/common-plugins@1.9.113 nightly3 /home/wigy/project/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
-> pnpm run data
-
-
-> @tasenor/common-plugins@1.9.113 data /home/wigy/project/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
-> data/bin/build_all
-
-
-Running /home/wigy/project/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins/data/FinnishBalanceSheetReportLite.mjs
-
-2023-11-02T02:16:00.414Z Saved text data to src/FinnishBalanceSheetReportLite/backend/balance-sheet-lite-fi.tsv
-2023-11-02T02:16:00.417Z Saved text data to src/FinnishBalanceSheetReportLite/backend/balance-sheet-lite-en.tsv
-
-Running /home/wigy/project/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins/data/FinnishBalanceSheetReport.mjs
-
-2023-11-02T02:16:02.840Z Saved text data to src/FinnishBalanceSheetReport/backend/balance-sheet-fi.tsv
-2023-11-02T02:16:02.842Z Saved text data to src/FinnishBalanceSheetReport/backend/balance-sheet-detailed-fi.tsv
-
-Running /home/wigy/project/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins/data/FinnishIncomeStatementReportLite.mjs
-
-2023-11-02T02:16:05.274Z Saved text data to src/FinnishIncomeStatementReportLite/backend/income-statement-lite-fi.tsv
-2023-11-02T02:16:05.276Z Saved text data to src/FinnishIncomeStatementReportLite/backend/income-statement-lite-en.tsv
-
-Running /home/wigy/project/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins/data/FinnishIncomeStatementReport.mjs
-
-2023-11-02T02:16:07.668Z Saved text data to src/FinnishIncomeStatementReport/backend/income-statement-fi.tsv
-2023-11-02T02:16:07.670Z Saved text data to src/FinnishIncomeStatementReport/backend/income-statement-detailed-fi.tsv
-
-Running /home/wigy/project/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins/data/FinnishLimitedCompanyComplete.mjs
-
-2023-11-02T02:16:10.049Z Saved data to src/FinnishLimitedCompanyComplete/backend/fi-EUR.tsv
-
-Running /home/wigy/project/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins/data/FinnishLimitedCompanyLite.mjs
-
-2023-11-02T02:16:12.479Z Saved data to src/FinnishLimitedCompanyLite/backend/fi-EUR.tsv
-2023-11-02T02:16:12.482Z Saved data to src/FinnishLimitedCompanyLite/backend/en-EUR.tsv
-
-Running /home/wigy/project/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins/data/IncomeAndExpenses.mjs
-
-2023-11-02T02:16:14.903Z Saved JSON data to src/IncomeAndExpenses/backend/income.json
-2023-11-02T02:16:14.906Z Saved JSON data to src/IncomeAndExpenses/backend/expense.json
-2023-11-02T02:16:14.907Z Saved JSON data to src/IncomeAndExpenses/backend/assetCodes.json
-2023-11-02T02:16:14.907Z Saved JSON data to src/IncomeAndExpenses/backend/taxTypes.json
-2023-11-02T02:16:14.908Z Refreshed translation data in src/IncomeAndExpenses/backend/index.ts
-2023-11-02T02:16:14.908Z Saved data to ../tasenor-common/src/types/income.ts
-2023-11-02T02:16:14.909Z Saved data to ../tasenor-common/src/types/expense.ts
-2023-11-02T02:16:14.909Z Saved data to ../tasenor-common/src/types/assetCodes.ts
-
-Running /home/wigy/project/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins/data/PluginIndex.mjs
-
-2023-11-02T02:16:15.640Z Saved plugin index to /home/wigy/project/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins/src/index.ts
-
-Running /home/wigy/project/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins/data/VATFinland.mjs
-
-2023-11-02T02:16:18.033Z Saved JSON data to src/VATFinland/backend/vat.json