diff --git a/.fern/metadata.json b/.fern/metadata.json index 659327584..00cad54c3 100644 --- a/.fern/metadata.json +++ b/.fern/metadata.json @@ -20,5 +20,5 @@ "testFramework": "jest", "enableForwardCompatibleEnums": true }, - "sdkVersion": "4.0.1" + "sdkVersion": "4.0.2" } diff --git a/package.json b/package.json index 537b8d53b..4b36deee8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mergeapi/merge-node-client", - "version": "4.0.1", + "version": "4.0.2", "private": false, "repository": { "type": "git", diff --git a/reference.md b/reference.md index 70e0fa24a..d422be979 100644 --- a/reference.md +++ b/reference.md @@ -15427,6 +15427,7 @@ const pageableResponse = await client.accounting.projects.list({ includeDeletedData: true, includeRemoteData: true, includeShellData: true, + isActive: "is_active", modifiedAfter: new Date("2024-01-15T09:30:00.000Z"), modifiedBefore: new Date("2024-01-15T09:30:00.000Z"), pageSize: 1, @@ -15445,6 +15446,7 @@ let page = await client.accounting.projects.list({ includeDeletedData: true, includeRemoteData: true, includeShellData: true, + isActive: "is_active", modifiedAfter: new Date("2024-01-15T09:30:00.000Z"), modifiedBefore: new Date("2024-01-15T09:30:00.000Z"), pageSize: 1, diff --git a/src/BaseClient.ts b/src/BaseClient.ts index e63f7ba18..4affcf1db 100644 --- a/src/BaseClient.ts +++ b/src/BaseClient.ts @@ -56,8 +56,8 @@ export function normalizeClientOptions; remoteFields?: Merge.accounting.RemoteField[]; } diff --git a/src/api/resources/accounting/types/InvoiceLineItemRequest.ts b/src/api/resources/accounting/types/InvoiceLineItemRequest.ts index df29419e7..d54ae3c21 100644 --- a/src/api/resources/accounting/types/InvoiceLineItemRequest.ts +++ b/src/api/resources/accounting/types/InvoiceLineItemRequest.ts @@ -348,6 +348,8 @@ export interface InvoiceLineItemRequest { trackingCategories?: (Merge.accounting.InvoiceLineItemRequestTrackingCategoriesItem | undefined)[]; /** The company the invoice belongs to. */ company?: string; + /** Indicates if the line item can be charged to the client/customer. */ + isBillable?: boolean; integrationParams?: Record; linkedAccountParams?: Record; remoteFields?: Merge.accounting.RemoteFieldRequest[]; diff --git a/src/serialization/resources/accounting/types/InvoiceLineItem.ts b/src/serialization/resources/accounting/types/InvoiceLineItem.ts index d4314789a..3e2dd27d6 100644 --- a/src/serialization/resources/accounting/types/InvoiceLineItem.ts +++ b/src/serialization/resources/accounting/types/InvoiceLineItem.ts @@ -39,6 +39,7 @@ export const InvoiceLineItem: core.serialization.ObjectSchema< ), company: core.serialization.string().optional(), remoteWasDeleted: core.serialization.property("remote_was_deleted", core.serialization.boolean().optional()), + isBillable: core.serialization.property("is_billable", core.serialization.boolean().optional()), fieldMappings: core.serialization.property( "field_mappings", core.serialization.record(core.serialization.string(), core.serialization.unknown()).optional(), @@ -68,6 +69,7 @@ export declare namespace InvoiceLineItem { tracking_categories?: (InvoiceLineItemTrackingCategoriesItem.Raw | null | undefined)[] | null; company?: string | null; remote_was_deleted?: boolean | null; + is_billable?: boolean | null; field_mappings?: Record | null; remote_fields?: RemoteField.Raw[] | null; } diff --git a/src/serialization/resources/accounting/types/InvoiceLineItemRequest.ts b/src/serialization/resources/accounting/types/InvoiceLineItemRequest.ts index eb99c7994..1fbfd0cb5 100644 --- a/src/serialization/resources/accounting/types/InvoiceLineItemRequest.ts +++ b/src/serialization/resources/accounting/types/InvoiceLineItemRequest.ts @@ -38,6 +38,7 @@ export const InvoiceLineItemRequest: core.serialization.ObjectSchema< core.serialization.list(InvoiceLineItemRequestTrackingCategoriesItem.optional()).optional(), ), company: core.serialization.string().optional(), + isBillable: core.serialization.property("is_billable", core.serialization.boolean().optional()), integrationParams: core.serialization.property( "integration_params", core.serialization.record(core.serialization.string(), core.serialization.unknown()).optional(), @@ -67,6 +68,7 @@ export declare namespace InvoiceLineItemRequest { tracking_category?: InvoiceLineItemRequestTrackingCategory.Raw | null; tracking_categories?: (InvoiceLineItemRequestTrackingCategoriesItem.Raw | null | undefined)[] | null; company?: string | null; + is_billable?: boolean | null; integration_params?: Record | null; linked_account_params?: Record | null; remote_fields?: RemoteFieldRequest.Raw[] | null; diff --git a/src/version.ts b/src/version.ts index 45528ca2f..2c0fafcd9 100644 --- a/src/version.ts +++ b/src/version.ts @@ -1 +1 @@ -export const SDK_VERSION = "4.0.1"; +export const SDK_VERSION = "4.0.2"; diff --git a/tests/wire/Accounting/invoices.test.ts b/tests/wire/Accounting/invoices.test.ts index a569add04..b99d6d050 100644 --- a/tests/wire/Accounting/invoices.test.ts +++ b/tests/wire/Accounting/invoices.test.ts @@ -83,6 +83,7 @@ describe("InvoicesClient", () => { "a47e11b6-c73b-4a0c-be31-130fc48177fa", ], company: "595c8f97-2ac4-45b7-b000-41bdf43240b5", + is_billable: true, field_mappings: { organization_defined_targets: { custom_key: "custom_value" }, linked_account_defined_targets: { custom_key: "custom_value" }, @@ -198,6 +199,7 @@ describe("InvoicesClient", () => { "a47e11b6-c73b-4a0c-be31-130fc48177fa", ], company: "595c8f97-2ac4-45b7-b000-41bdf43240b5", + isBillable: true, fieldMappings: { organization_defined_targets: { custom_key: "custom_value", @@ -360,6 +362,7 @@ describe("InvoicesClient", () => { "a47e11b6-c73b-4a0c-be31-130fc48177fa", ], company: "595c8f97-2ac4-45b7-b000-41bdf43240b5", + is_billable: true, field_mappings: { organization_defined_targets: { custom_key: "custom_value" }, linked_account_defined_targets: { custom_key: "custom_value" }, @@ -510,6 +513,7 @@ describe("InvoicesClient", () => { "a47e11b6-c73b-4a0c-be31-130fc48177fa", ], company: "595c8f97-2ac4-45b7-b000-41bdf43240b5", + isBillable: true, fieldMappings: { organization_defined_targets: { custom_key: "custom_value", @@ -681,6 +685,7 @@ describe("InvoicesClient", () => { ], company: "595c8f97-2ac4-45b7-b000-41bdf43240b5", remote_was_deleted: true, + is_billable: true, field_mappings: { organization_defined_targets: { custom_key: "custom_value" }, linked_account_defined_targets: { custom_key: "custom_value" }, @@ -801,6 +806,7 @@ describe("InvoicesClient", () => { ], company: "595c8f97-2ac4-45b7-b000-41bdf43240b5", remoteWasDeleted: true, + isBillable: true, fieldMappings: { organization_defined_targets: { custom_key: "custom_value", @@ -944,6 +950,7 @@ describe("InvoicesClient", () => { "a47e11b6-c73b-4a0c-be31-130fc48177fa", ], company: "595c8f97-2ac4-45b7-b000-41bdf43240b5", + is_billable: true, field_mappings: { organization_defined_targets: { custom_key: "custom_value" }, linked_account_defined_targets: { custom_key: "custom_value" }, @@ -1094,6 +1101,7 @@ describe("InvoicesClient", () => { "a47e11b6-c73b-4a0c-be31-130fc48177fa", ], company: "595c8f97-2ac4-45b7-b000-41bdf43240b5", + isBillable: true, fieldMappings: { organization_defined_targets: { custom_key: "custom_value", diff --git a/tests/wire/Accounting/projects.test.ts b/tests/wire/Accounting/projects.test.ts index eb874dca4..7a4ce0a20 100644 --- a/tests/wire/Accounting/projects.test.ts +++ b/tests/wire/Accounting/projects.test.ts @@ -80,6 +80,7 @@ describe("ProjectsClient", () => { includeDeletedData: true, includeRemoteData: true, includeShellData: true, + isActive: "is_active", modifiedAfter: new Date("2024-01-15T09:30:00.000Z"), modifiedBefore: new Date("2024-01-15T09:30:00.000Z"), pageSize: 1,