mirror of
https://github.com/frappe/books.git
synced 2025-02-02 12:08:27 +00:00
chore: bump pesa
- fix isPesa impl
This commit is contained in:
parent
8e2c89b0eb
commit
401a86eeeb
@ -104,7 +104,7 @@ describe('DatabaseCore: Migrate and Check Db', function () {
|
|||||||
);
|
);
|
||||||
|
|
||||||
assert.strictEqual(
|
assert.strictEqual(
|
||||||
column.type,
|
column.type.toLowerCase(),
|
||||||
dbColType,
|
dbColType,
|
||||||
`${schemaName}.${column.name}:: type check: ${column.type}, ${dbColType}`
|
`${schemaName}.${column.name}:: type check: ${column.type}, ${dbColType}`
|
||||||
);
|
);
|
||||||
|
@ -164,6 +164,10 @@ async function getPayments(fyo: Fyo, invoices: Invoice[]) {
|
|||||||
amount: invoice.outstandingAmount,
|
amount: invoice.outstandingAmount,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (doc.amount!.isZero()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
payments.push(doc);
|
payments.push(doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ import 'mocha';
|
|||||||
import { getTestDbPath } from 'tests/helpers';
|
import { getTestDbPath } from 'tests/helpers';
|
||||||
import { setupDummyInstance } from '..';
|
import { setupDummyInstance } from '..';
|
||||||
|
|
||||||
describe.skip('dummy', function () {
|
describe('dummy', function () {
|
||||||
const dbPath = getTestDbPath();
|
const dbPath = getTestDbPath();
|
||||||
|
|
||||||
let fyo: Fyo;
|
let fyo: Fyo;
|
||||||
@ -28,7 +28,7 @@ describe.skip('dummy', function () {
|
|||||||
|
|
||||||
specify('setupDummyInstance', async function () {
|
specify('setupDummyInstance', async function () {
|
||||||
await assertDoesNotThrow(async () => {
|
await assertDoesNotThrow(async () => {
|
||||||
await setupDummyInstance(dbPath, fyo);
|
await setupDummyInstance(dbPath, fyo, 1, 25);
|
||||||
}, 'setup instance failed');
|
}, 'setup instance failed');
|
||||||
|
|
||||||
for (const item in purchaseItemPartyMap) {
|
for (const item in purchaseItemPartyMap) {
|
||||||
|
@ -3,7 +3,7 @@ import { Doc } from 'fyo/model/doc';
|
|||||||
import { isPesa } from 'fyo/utils';
|
import { isPesa } from 'fyo/utils';
|
||||||
import { ValueError } from 'fyo/utils/errors';
|
import { ValueError } from 'fyo/utils/errors';
|
||||||
import { DateTime } from 'luxon';
|
import { DateTime } from 'luxon';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
import { Field, FieldTypeEnum, RawValue, TargetField } from 'schemas/types';
|
import { Field, FieldTypeEnum, RawValue, TargetField } from 'schemas/types';
|
||||||
import { getIsNullOrUndef } from 'utils';
|
import { getIsNullOrUndef } from 'utils';
|
||||||
import { DatabaseHandler } from './dbHandler';
|
import { DatabaseHandler } from './dbHandler';
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { Doc } from 'fyo/model/doc';
|
import { Doc } from 'fyo/model/doc';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
import { RawValue } from 'schemas/types';
|
import { RawValue } from 'schemas/types';
|
||||||
import { AuthDemuxBase } from 'utils/auth/types';
|
import { AuthDemuxBase } from 'utils/auth/types';
|
||||||
import { DatabaseDemuxBase } from 'utils/db/types';
|
import { DatabaseDemuxBase } from 'utils/db/types';
|
||||||
|
@ -5,7 +5,7 @@ import { Verb } from 'fyo/telemetry/types';
|
|||||||
import { DEFAULT_USER } from 'fyo/utils/consts';
|
import { DEFAULT_USER } from 'fyo/utils/consts';
|
||||||
import { ConflictError, MandatoryError, NotFoundError } from 'fyo/utils/errors';
|
import { ConflictError, MandatoryError, NotFoundError } from 'fyo/utils/errors';
|
||||||
import Observable from 'fyo/utils/observable';
|
import Observable from 'fyo/utils/observable';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
import {
|
import {
|
||||||
Field,
|
Field,
|
||||||
FieldTypeEnum,
|
FieldTypeEnum,
|
||||||
|
@ -2,7 +2,7 @@ import { Fyo } from 'fyo';
|
|||||||
import { DocValue } from 'fyo/core/types';
|
import { DocValue } from 'fyo/core/types';
|
||||||
import { isPesa } from 'fyo/utils';
|
import { isPesa } from 'fyo/utils';
|
||||||
import { isEqual } from 'lodash';
|
import { isEqual } from 'lodash';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
|
import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
|
||||||
import { getIsNullOrUndef } from 'utils';
|
import { getIsNullOrUndef } from 'utils';
|
||||||
import { Doc } from './doc';
|
import { Doc } from './doc';
|
||||||
|
@ -2,7 +2,7 @@ import { Fyo } from 'fyo';
|
|||||||
import { DocValue } from 'fyo/core/types';
|
import { DocValue } from 'fyo/core/types';
|
||||||
import { Doc } from 'fyo/model/doc';
|
import { Doc } from 'fyo/model/doc';
|
||||||
import { DateTime } from 'luxon';
|
import { DateTime } from 'luxon';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
|
import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
|
||||||
import { getIsNullOrUndef } from 'utils';
|
import { getIsNullOrUndef } from 'utils';
|
||||||
import {
|
import {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { Fyo } from 'fyo';
|
import { Fyo } from 'fyo';
|
||||||
import { Doc } from 'fyo/model/doc';
|
import { Doc } from 'fyo/model/doc';
|
||||||
import { Action } from 'fyo/model/types';
|
import { Action } from 'fyo/model/types';
|
||||||
import { pesa } from 'pesa';
|
import { Money } from 'pesa';
|
||||||
import { Field, OptionField, SelectOption } from 'schemas/types';
|
import { Field, OptionField, SelectOption } from 'schemas/types';
|
||||||
import { getIsNullOrUndef } from 'utils';
|
import { getIsNullOrUndef } from 'utils';
|
||||||
|
|
||||||
@ -37,7 +37,7 @@ export function getDuplicates(array: unknown[]) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function isPesa(value: unknown): boolean {
|
export function isPesa(value: unknown): boolean {
|
||||||
return value instanceof pesa().constructor;
|
return value instanceof Money;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getActions(doc: Doc): Action[] {
|
export function getActions(doc: Doc): Action[] {
|
||||||
|
@ -3,7 +3,7 @@ import { ValidationError } from 'fyo/utils/errors';
|
|||||||
import { Account } from 'models/baseModels/Account/Account';
|
import { Account } from 'models/baseModels/Account/Account';
|
||||||
import { AccountingLedgerEntry } from 'models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry';
|
import { AccountingLedgerEntry } from 'models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry';
|
||||||
import { ModelNameEnum } from 'models/types';
|
import { ModelNameEnum } from 'models/types';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
import { Transactional } from './Transactional';
|
import { Transactional } from './Transactional';
|
||||||
import { AccountBalanceChange, TransactionType } from './types';
|
import { AccountBalanceChange, TransactionType } from './types';
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { Doc } from 'fyo/model/doc';
|
import { Doc } from 'fyo/model/doc';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
|
|
||||||
export interface LedgerPostingOptions {
|
export interface LedgerPostingOptions {
|
||||||
reference: Doc;
|
reference: Doc;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { Doc } from 'fyo/model/doc';
|
import { Doc } from 'fyo/model/doc';
|
||||||
import { ListViewSettings } from 'fyo/model/types';
|
import { ListViewSettings } from 'fyo/model/types';
|
||||||
import { ModelNameEnum } from 'models/types';
|
import { ModelNameEnum } from 'models/types';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
|
|
||||||
export class AccountingLedgerEntry extends Doc {
|
export class AccountingLedgerEntry extends Doc {
|
||||||
date?: string | Date;
|
date?: string | Date;
|
||||||
|
@ -4,7 +4,7 @@ import { DefaultMap, FiltersMap, FormulaMap } from 'fyo/model/types';
|
|||||||
import { getExchangeRate } from 'models/helpers';
|
import { getExchangeRate } from 'models/helpers';
|
||||||
import { Transactional } from 'models/Transactional/Transactional';
|
import { Transactional } from 'models/Transactional/Transactional';
|
||||||
import { ModelNameEnum } from 'models/types';
|
import { ModelNameEnum } from 'models/types';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
import { getIsNullOrUndef } from 'utils';
|
import { getIsNullOrUndef } from 'utils';
|
||||||
import { Party } from '../Party/Party';
|
import { Party } from '../Party/Party';
|
||||||
import { Payment } from '../Payment/Payment';
|
import { Payment } from '../Payment/Payment';
|
||||||
|
@ -2,7 +2,7 @@ import { DocValue } from 'fyo/core/types';
|
|||||||
import { Doc } from 'fyo/model/doc';
|
import { Doc } from 'fyo/model/doc';
|
||||||
import { FiltersMap, FormulaMap, ValidationMap } from 'fyo/model/types';
|
import { FiltersMap, FormulaMap, ValidationMap } from 'fyo/model/types';
|
||||||
import { ValidationError } from 'fyo/utils/errors';
|
import { ValidationError } from 'fyo/utils/errors';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
import { Invoice } from '../Invoice/Invoice';
|
import { Invoice } from '../Invoice/Invoice';
|
||||||
|
|
||||||
export abstract class InvoiceItem extends Doc {
|
export abstract class InvoiceItem extends Doc {
|
||||||
|
@ -9,7 +9,7 @@ import {
|
|||||||
ValidationMap,
|
ValidationMap,
|
||||||
} from 'fyo/model/types';
|
} from 'fyo/model/types';
|
||||||
import { ValidationError } from 'fyo/utils/errors';
|
import { ValidationError } from 'fyo/utils/errors';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
import { AccountRootTypeEnum, AccountTypeEnum } from '../Account/types';
|
import { AccountRootTypeEnum, AccountTypeEnum } from '../Account/types';
|
||||||
|
|
||||||
export class Item extends Doc {
|
export class Item extends Doc {
|
||||||
|
@ -4,12 +4,12 @@ import {
|
|||||||
Action,
|
Action,
|
||||||
DefaultMap,
|
DefaultMap,
|
||||||
FiltersMap,
|
FiltersMap,
|
||||||
ListViewSettings
|
ListViewSettings,
|
||||||
} from 'fyo/model/types';
|
} from 'fyo/model/types';
|
||||||
import { DateTime } from 'luxon';
|
import { DateTime } from 'luxon';
|
||||||
import { getLedgerLinkAction } from 'models/helpers';
|
import { getLedgerLinkAction } from 'models/helpers';
|
||||||
import { Transactional } from 'models/Transactional/Transactional';
|
import { Transactional } from 'models/Transactional/Transactional';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
import { LedgerPosting } from '../../Transactional/LedgerPosting';
|
import { LedgerPosting } from '../../Transactional/LedgerPosting';
|
||||||
|
|
||||||
export class JournalEntry extends Transactional {
|
export class JournalEntry extends Transactional {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { Doc } from 'fyo/model/doc';
|
import { Doc } from 'fyo/model/doc';
|
||||||
import { FiltersMap, FormulaMap } from 'fyo/model/types';
|
import { FiltersMap, FormulaMap } from 'fyo/model/types';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
|
|
||||||
export class JournalEntryAccount extends Doc {
|
export class JournalEntryAccount extends Doc {
|
||||||
getAutoDebitCredit(type: 'debit' | 'credit') {
|
getAutoDebitCredit(type: 'debit' | 'credit') {
|
||||||
|
@ -11,7 +11,7 @@ import {
|
|||||||
validateEmail,
|
validateEmail,
|
||||||
validatePhoneNumber,
|
validatePhoneNumber,
|
||||||
} from 'fyo/model/validationFunction';
|
} from 'fyo/model/validationFunction';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
import { PartyRole } from './types';
|
import { PartyRole } from './types';
|
||||||
|
|
||||||
export class Party extends Doc {
|
export class Party extends Doc {
|
||||||
|
@ -17,7 +17,7 @@ import { getLedgerLinkAction } from 'models/helpers';
|
|||||||
import { LedgerPosting } from 'models/Transactional/LedgerPosting';
|
import { LedgerPosting } from 'models/Transactional/LedgerPosting';
|
||||||
import { Transactional } from 'models/Transactional/Transactional';
|
import { Transactional } from 'models/Transactional/Transactional';
|
||||||
import { ModelNameEnum } from 'models/types';
|
import { ModelNameEnum } from 'models/types';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
import { Invoice } from '../Invoice/Invoice';
|
import { Invoice } from '../Invoice/Invoice';
|
||||||
import { Party } from '../Party/Party';
|
import { Party } from '../Party/Party';
|
||||||
import { PaymentFor } from '../PaymentFor/PaymentFor';
|
import { PaymentFor } from '../PaymentFor/PaymentFor';
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { Doc } from 'fyo/model/doc';
|
import { Doc } from 'fyo/model/doc';
|
||||||
import { FiltersMap, FormulaMap } from 'fyo/model/types';
|
import { FiltersMap, FormulaMap } from 'fyo/model/types';
|
||||||
import { ModelNameEnum } from 'models/types';
|
import { ModelNameEnum } from 'models/types';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
import { PartyRoleEnum } from '../Party/types';
|
import { PartyRoleEnum } from '../Party/types';
|
||||||
import { Payment } from '../Payment/Payment';
|
import { Payment } from '../Payment/Payment';
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { Doc } from 'fyo/model/doc';
|
import { Doc } from 'fyo/model/doc';
|
||||||
import { FormulaMap } from 'fyo/model/types';
|
import { FormulaMap } from 'fyo/model/types';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
|
|
||||||
export class TaxSummary extends Doc {
|
export class TaxSummary extends Doc {
|
||||||
account?: string;
|
account?: string;
|
||||||
|
@ -3,7 +3,7 @@ import { Doc } from 'fyo/model/doc';
|
|||||||
import { Action, ColumnConfig } from 'fyo/model/types';
|
import { Action, ColumnConfig } from 'fyo/model/types';
|
||||||
import { NotFoundError } from 'fyo/utils/errors';
|
import { NotFoundError } from 'fyo/utils/errors';
|
||||||
import { DateTime } from 'luxon';
|
import { DateTime } from 'luxon';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
import { Router } from 'vue-router';
|
import { Router } from 'vue-router';
|
||||||
import {
|
import {
|
||||||
AccountRootType,
|
AccountRootType,
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"luxon": "^2.0.2",
|
"luxon": "^2.0.2",
|
||||||
"node-fetch": "2",
|
"node-fetch": "2",
|
||||||
"pesa": "^1.1.11",
|
"pesa": "^1.1.12",
|
||||||
"vue": "^3.2.30",
|
"vue": "^3.2.30",
|
||||||
"vue-router": "^4.0.12"
|
"vue-router": "^4.0.12"
|
||||||
},
|
},
|
||||||
|
@ -5,7 +5,7 @@ import { t } from 'fyo';
|
|||||||
import { Doc } from 'fyo/model/doc';
|
import { Doc } from 'fyo/model/doc';
|
||||||
import { isPesa } from 'fyo/utils';
|
import { isPesa } from 'fyo/utils';
|
||||||
import { DuplicateEntryError, LinkValidationError } from 'fyo/utils/errors';
|
import { DuplicateEntryError, LinkValidationError } from 'fyo/utils/errors';
|
||||||
import Money from 'pesa/dist/types/src/money';
|
import { Money } from 'pesa';
|
||||||
import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
|
import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
|
||||||
|
|
||||||
export function stringifyCircular(
|
export function stringifyCircular(
|
||||||
|
@ -9403,10 +9403,10 @@ performance-now@^2.1.0:
|
|||||||
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
|
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
|
||||||
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
|
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
|
||||||
|
|
||||||
pesa@^1.1.11:
|
pesa@^1.1.12:
|
||||||
version "1.1.11"
|
version "1.1.12"
|
||||||
resolved "https://registry.yarnpkg.com/pesa/-/pesa-1.1.11.tgz#85829e5aa11ea3e44d7c9ea4b500e4d6def6dc5f"
|
resolved "https://registry.yarnpkg.com/pesa/-/pesa-1.1.12.tgz#905132abf9e1aa33eaf68cdea61c07ea2284d12d"
|
||||||
integrity sha512-eyl0lpdUIV0dNXVeTMnhBJj6u9GRIYwP+vFdUN+767Fv3PNQHPHAkCQJqDseGfEF75lhe23ZnfbA/uMidlq5/Q==
|
integrity sha512-OnbJne4T1vRXbBbvnRy3NZVI1hVmcDBsBZ2GcQk3KydbONuDUE7R3xB604bnXTgt44h2ujcVBJvMU9I7ObqBRQ==
|
||||||
|
|
||||||
pg-connection-string@2.5.0:
|
pg-connection-string@2.5.0:
|
||||||
version "2.5.0"
|
version "2.5.0"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user