@accounter/server 0.0.8-alpha-20251028104723-d7150deb91ef4f0b4cb8615dd9764727e684a57f → 0.0.8-alpha-20251028120806-2ffeafaf43eece2a7685012216a6fcc962bc1406

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @accounter/server
 
-## 0.0.8-alpha-20251028104723-d7150deb91ef4f0b4cb8615dd9764727e684a57f
+## 0.0.8-alpha-20251028120806-2ffeafaf43eece2a7685012216a6fcc962bc1406
 
 ### Patch Changes
 
@@ -242,6 +242,23 @@
   * `packages/server/src/modules/transactions/resolvers/transaction-suggestions.resolver.ts`:
     Updated import path for `suggestionDataSchema`.
 
+- [#2626](https://github.com/Urigo/accounter-fullstack/pull/2626)
+  [`2ffeafa`](https://github.com/Urigo/accounter-fullstack/commit/2ffeafaf43eece2a7685012216a6fcc962bc1406)
+  Thanks [@gilgardosh](https://github.com/gilgardosh)! - - **Client Creation Flow Enhancement**: The
+  "Create New Business" dialog now includes an option to immediately create a client associated with
+  the new business. If selected, a `ModifyClientDialog` will automatically open after business
+  creation, streamlining the onboarding process.
+  - **`ModifyClientDialog` Flexibility**: The `ModifyClientDialog` component has been enhanced with
+    a `showTrigger` prop, allowing it to be rendered without its default trigger button, making it
+    suitable for programmatic opening. It also now consistently calls the `onDone` callback when
+    closed, improving callback reliability.
+  - **User Navigation Improvements**: The user dropdown menu now displays the actual logged-in
+    username from the `UserContext` and includes a direct link to the "Admin Configurations" page
+    for the user's primary business, providing quicker access to administrative settings.
+  - **Form Schema Refinements**: The business creation form schema has been updated to use more
+    direct Zod validators (`z.email()`, `z.url()`) for better type safety and includes a new
+    `isClient` boolean field to indicate if the business is also a client.
+
 - [#2582](https://github.com/Urigo/accounter-fullstack/pull/2582)
   [`32276b4`](https://github.com/Urigo/accounter-fullstack/commit/32276b47e164f0976fcdd5523fa5e26f0704014f)
   Thanks [@gilgardosh](https://github.com/gilgardosh)! - - **New Business/Client Page**: Introduced
@@ -380,9 +397,9 @@
   [[`65e3c7f`](https://github.com/Urigo/accounter-fullstack/commit/65e3c7f01993eb4f41244a40feefefa08b31a4e6),
   [`65e3c7f`](https://github.com/Urigo/accounter-fullstack/commit/65e3c7f01993eb4f41244a40feefefa08b31a4e6),
   [`65e3c7f`](https://github.com/Urigo/accounter-fullstack/commit/65e3c7f01993eb4f41244a40feefefa08b31a4e6)]:
-  - @accounter/pcn874-generator@0.6.3-alpha-20251028104723-d7150deb91ef4f0b4cb8615dd9764727e684a57f
-  - @accounter/shaam-uniform-format-generator@0.2.2-alpha-20251028104723-d7150deb91ef4f0b4cb8615dd9764727e684a57f
-  - @accounter/shaam6111-generator@0.1.4-alpha-20251028104723-d7150deb91ef4f0b4cb8615dd9764727e684a57f
+  - @accounter/pcn874-generator@0.6.3-alpha-20251028120806-2ffeafaf43eece2a7685012216a6fcc962bc1406
+  - @accounter/shaam-uniform-format-generator@0.2.2-alpha-20251028120806-2ffeafaf43eece2a7685012216a6fcc962bc1406
+  - @accounter/shaam6111-generator@0.1.4-alpha-20251028120806-2ffeafaf43eece2a7685012216a6fcc962bc1406
 
 ## 0.0.7
 

package/dist/server/src/__generated__/types.d.ts

@@ -188,15 +188,16 @@ export type AddBusinessTripTravelAndSubsistenceExpenseInput = {
 /**  Represents a business entity managed by an accountant in the system. */
 export type AdminBusiness = {
     readonly __typename?: 'AdminBusiness';
-    readonly advanceTaxRate?: Maybe<Scalars['Float']['output']>;
     readonly business: LtdFinancialEntity;
-    readonly employerWithholdingTaxAccountNumber?: Maybe<Scalars['String']['output']>;
     readonly governmentId: Scalars['String']['output'];
     readonly id: Scalars['UUID']['output'];
     readonly name: Scalars['String']['output'];
-    readonly nationalInsuranceEmployerId?: Maybe<Scalars['String']['output']>;
     readonly registrationDate: Scalars['TimelessDate']['output'];
-    readonly taxPrepaymentId?: Maybe<Scalars['String']['output']>;
+    readonly socialSecurityEmployerId?: Maybe<Scalars['String']['output']>;
+    readonly taxAdvancesId?: Maybe<Scalars['String']['output']>;
+    readonly taxAdvancesRate?: Maybe<Scalars['Float']['output']>;
+    readonly withholdingTaxBookNumber?: Maybe<Scalars['String']['output']>;
+    readonly withholdingTaxFileNumber?: Maybe<Scalars['String']['output']>;
 };
 /**  defines a tag / category for charge arrangement */
 export type AdminContext = {
@@ -1104,12 +1105,13 @@ export type Country = {
 };
 /**  Input type for creating a new admin business.  */
 export type CreateAdminBusinessInput = {
-    readonly advanceTaxRate?: InputMaybe<Scalars['Float']['input']>;
     readonly businessId: Scalars['UUID']['input'];
-    readonly employerWithholdingTaxAccountNumber?: InputMaybe<Scalars['String']['input']>;
-    readonly nationalInsuranceEmployerId?: InputMaybe<Scalars['String']['input']>;
     readonly registrationDate: Scalars['TimelessDate']['input'];
-    readonly taxPrepaymentId?: InputMaybe<Scalars['String']['input']>;
+    readonly socialSecurityEmployerId?: InputMaybe<Scalars['String']['input']>;
+    readonly taxAdvancesId?: InputMaybe<Scalars['String']['input']>;
+    readonly taxAdvancesRate?: InputMaybe<Scalars['Float']['input']>;
+    readonly withholdingTaxBookNumber?: InputMaybe<Scalars['String']['input']>;
+    readonly withholdingTaxFileNumber?: InputMaybe<Scalars['String']['input']>;
 };
 /**  input for creating a new contract  */
 export type CreateContractInput = {
@@ -3641,11 +3643,12 @@ export type Unprocessed = Document & Linkable & {
 };
 /**  Input type for updating admin business details.  */
 export type UpdateAdminBusinessInput = {
-    readonly advanceTaxRate?: InputMaybe<Scalars['Float']['input']>;
-    readonly employerWithholdingTaxAccountNumber?: InputMaybe<Scalars['String']['input']>;
-    readonly nationalInsuranceEmployerId?: InputMaybe<Scalars['String']['input']>;
     readonly registrationDate?: InputMaybe<Scalars['TimelessDate']['input']>;
-    readonly taxPrepaymentId?: InputMaybe<Scalars['String']['input']>;
+    readonly socialSecurityEmployerId?: InputMaybe<Scalars['String']['input']>;
+    readonly taxAdvancesId?: InputMaybe<Scalars['String']['input']>;
+    readonly taxAdvancesRate?: InputMaybe<Scalars['Float']['input']>;
+    readonly withholdingTaxBookNumber?: InputMaybe<Scalars['String']['input']>;
+    readonly withholdingTaxFileNumber?: InputMaybe<Scalars['String']['input']>;
 };
 /**  input for updateBusiness  */
 export type UpdateBusinessInput = {
@@ -4773,15 +4776,16 @@ export type DeferDirectiveResolver<Result, Parent, ContextType = GraphQLModules.
 export type StreamDirectiveArgs = {};
 export type StreamDirectiveResolver<Result, Parent, ContextType = GraphQLModules.Context, Args = StreamDirectiveArgs> = DirectiveResolverFn<Result, Parent, ContextType, Args>;
 export type AdminBusinessResolvers<ContextType = GraphQLModules.Context, ParentType extends ResolversParentTypes['AdminBusiness'] = ResolversParentTypes['AdminBusiness']> = {
-    advanceTaxRate?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
     business?: Resolver<ResolversTypes['LtdFinancialEntity'], ParentType, ContextType>;
-    employerWithholdingTaxAccountNumber?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     governmentId?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
     id?: Resolver<ResolversTypes['UUID'], ParentType, ContextType>;
     name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-    nationalInsuranceEmployerId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     registrationDate?: Resolver<ResolversTypes['TimelessDate'], ParentType, ContextType>;
-    taxPrepaymentId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+    socialSecurityEmployerId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+    taxAdvancesId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+    taxAdvancesRate?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+    withholdingTaxBookNumber?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+    withholdingTaxFileNumber?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 export type AdminContextResolvers<ContextType = GraphQLModules.Context, ParentType extends ResolversParentTypes['AdminContext'] = ResolversParentTypes['AdminContext']> = {

package/dist/server/src/__generated__/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/__generated__/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAo2BrD,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAsX7B,OAAO,EAAE,QAAQ,EAAE,CAAC;AAuLpB,OAAO,EAAE,YAAY,EAAE,CAAC;AA2lCxB,OAAO,EAAE,iBAAiB,EAAE,CAAC;AA62D7B,OAAO,EAAE,oBAAoB,EAAE,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/__generated__/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAq2BrD,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAuX7B,OAAO,EAAE,QAAQ,EAAE,CAAC;AAuLpB,OAAO,EAAE,YAAY,EAAE,CAAC;AA2lCxB,OAAO,EAAE,iBAAiB,EAAE,CAAC;AA62D7B,OAAO,EAAE,oBAAoB,EAAE,CAAC"}

package/dist/server/src/modules/financial-entities/__generated__/types.d.ts

@@ -4,7 +4,7 @@ export declare namespace FinancialEntitiesModule {
     interface DefinedFields {
         Query: 'adminBusiness' | 'allAdminBusinesses' | 'businessTransactionsSumFromLedgerRecords' | 'businessTransactionsFromLedgerRecords' | 'business' | 'businesses' | 'allBusinesses' | 'client' | 'allClients' | 'financialEntity' | 'allFinancialEntities' | 'taxCategories' | 'taxCategory' | 'taxCategoryByBusinessId';
         Mutation: 'createAdminBusiness' | 'updateAdminBusiness' | 'deleteAdminBusiness' | 'updateBusiness' | 'insertNewBusiness' | 'mergeBusinesses' | 'batchGenerateBusinessesOutOfTransactions' | 'updateClient' | 'insertClient' | 'updateTaxCategory' | 'insertTaxCategory';
-        AdminBusiness: 'id' | 'name' | 'governmentId' | 'business' | 'employerWithholdingTaxAccountNumber' | 'taxPrepaymentId' | 'nationalInsuranceEmployerId' | 'advanceTaxRate' | 'registrationDate';
+        AdminBusiness: 'id' | 'name' | 'governmentId' | 'business' | 'withholdingTaxBookNumber' | 'withholdingTaxFileNumber' | 'socialSecurityEmployerId' | 'taxAdvancesRate' | 'taxAdvancesId' | 'registrationDate';
         BusinessTransactionsSumFromLedgerRecordsSuccessfulResult: 'businessTransactionsSum';
         BusinessTransactionSum: 'business' | 'credit' | 'debit' | 'total' | 'foreignCurrenciesSum';
         ForeignCurrencySum: 'credit' | 'debit' | 'total' | 'currency';
@@ -48,8 +48,8 @@ export declare namespace FinancialEntitiesModule {
         EmailAttachmentType: 'PDF' | 'PNG' | 'JPEG';
     }
     interface DefinedInputFields {
-        CreateAdminBusinessInput: 'businessId' | 'employerWithholdingTaxAccountNumber' | 'taxPrepaymentId' | 'nationalInsuranceEmployerId' | 'advanceTaxRate' | 'registrationDate';
-        UpdateAdminBusinessInput: 'employerWithholdingTaxAccountNumber' | 'taxPrepaymentId' | 'nationalInsuranceEmployerId' | 'advanceTaxRate' | 'registrationDate';
+        CreateAdminBusinessInput: 'businessId' | 'withholdingTaxBookNumber' | 'withholdingTaxFileNumber' | 'socialSecurityEmployerId' | 'taxAdvancesRate' | 'taxAdvancesId' | 'registrationDate';
+        UpdateAdminBusinessInput: 'withholdingTaxBookNumber' | 'withholdingTaxFileNumber' | 'socialSecurityEmployerId' | 'taxAdvancesRate' | 'taxAdvancesId' | 'registrationDate';
         BusinessTransactionsFilter: 'businessIDs' | 'ownerIds' | 'type' | 'fromDate' | 'toDate' | 'includeRevaluation';
         UpdateBusinessInput: 'name' | 'sortCode' | 'country' | 'hebrewName' | 'address' | 'email' | 'website' | 'phoneNumber' | 'governmentId' | 'taxCategory' | 'exemptDealer' | 'suggestions' | 'optionalVAT' | 'isReceiptEnough' | 'isDocumentsOptional' | 'pcn874RecordType' | 'irsCode' | 'isActive';
         InsertNewBusinessInput: 'name' | 'sortCode' | 'country' | 'hebrewName' | 'address' | 'email' | 'website' | 'phoneNumber' | 'governmentId' | 'taxCategory' | 'exemptDealer' | 'suggestions' | 'optionalVAT' | 'isReceiptEnough' | 'isDocumentsOptional' | 'pcn874RecordType' | 'irsCode' | 'isActive';
@@ -250,10 +250,11 @@ export declare namespace FinancialEntitiesModule {
             name?: gm.Middleware[];
             governmentId?: gm.Middleware[];
             business?: gm.Middleware[];
-            employerWithholdingTaxAccountNumber?: gm.Middleware[];
-            taxPrepaymentId?: gm.Middleware[];
-            nationalInsuranceEmployerId?: gm.Middleware[];
-            advanceTaxRate?: gm.Middleware[];
+            withholdingTaxBookNumber?: gm.Middleware[];
+            withholdingTaxFileNumber?: gm.Middleware[];
+            socialSecurityEmployerId?: gm.Middleware[];
+            taxAdvancesRate?: gm.Middleware[];
+            taxAdvancesId?: gm.Middleware[];
             registrationDate?: gm.Middleware[];
         };
         LtdFinancialEntity?: {

package/dist/server/src/modules/financial-entities/__generated__/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../src/modules/financial-entities/__generated__/types.ts"],"names":[],"mappings":"AAEA,MAAM,KAAW,uBAAuB,CAmevC;AAneD,WAAiB,uBAAuB;IA0CrC,CAAC;IAKD,CAAC;IAeD,CAAC;IAuJD,CAAC;IA6QD,CAAC;AACJ,CAAC,EAnegB,uBAAuB,KAAvB,uBAAuB,QAmevC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../src/modules/financial-entities/__generated__/types.ts"],"names":[],"mappings":"AAEA,MAAM,KAAW,uBAAuB,CAoevC;AApeD,WAAiB,uBAAuB;IA0CrC,CAAC;IAKD,CAAC;IAeD,CAAC;IAuJD,CAAC;IA8QD,CAAC;AACJ,CAAC,EApegB,uBAAuB,KAAvB,uBAAuB,QAoevC"}

package/dist/server/src/modules/financial-entities/resolvers/admin-businesses.resolver.js

@@ -34,10 +34,11 @@ export const adminBusinessesResolvers = {
             }
             return business;
         },
-        employerWithholdingTaxAccountNumber: admin => admin.tax_nikuim_pinkas_number,
-        taxPrepaymentId: admin => admin.tax_siduri_number_2022,
-        nationalInsuranceEmployerId: admin => admin.pinkas_social_security_2022,
-        advanceTaxRate: admin => admin.advance_tax_rate,
+        withholdingTaxBookNumber: admin => admin.tax_nikuim_pinkas_number,
+        withholdingTaxFileNumber: admin => admin.nikuim,
+        socialSecurityEmployerId: admin => admin.pinkas_social_security_2022,
+        taxAdvancesRate: admin => admin.advance_tax_rate,
+        taxAdvancesId: admin => admin.tax_siduri_number_2022,
         registrationDate: admin => {
             if (!admin.registration_date) {
                 throw new GraphQLError(`Admin business ID="${admin.id}" has no registration date`);

package/dist/server/src/modules/financial-entities/resolvers/admin-businesses.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin-businesses.resolver.js","sourceRoot":"","sources":["../../../../../../src/modules/financial-entities/resolvers/admin-businesses.resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"admin-businesses.resolver.js","sourceRoot":"","sources":["../../../../../../src/modules/financial-entities/resolvers/admin-businesses.resolver.ts"],"names":[],"mappings":"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"}

package/dist/server/src/modules/financial-entities/typeDefs/admin-businesses.graphql.js

@@ -19,29 +19,32 @@ export default gql `
     name: String!
     governmentId: String!
     business: LtdFinancialEntity!
-    employerWithholdingTaxAccountNumber: String
-    taxPrepaymentId: String
-    nationalInsuranceEmployerId: String
-    advanceTaxRate: Float
+    withholdingTaxBookNumber: String
+    withholdingTaxFileNumber: String
+    socialSecurityEmployerId: String
+    taxAdvancesRate: Float
+    taxAdvancesId: String
     registrationDate: TimelessDate!
   }
 
   " Input type for creating a new admin business. "
   input CreateAdminBusinessInput {
     businessId: UUID!
-    employerWithholdingTaxAccountNumber: String
-    taxPrepaymentId: String
-    nationalInsuranceEmployerId: String
-    advanceTaxRate: Float
+    withholdingTaxBookNumber: String
+    withholdingTaxFileNumber: String
+    socialSecurityEmployerId: String
+    taxAdvancesRate: Float
+    taxAdvancesId: String
     registrationDate: TimelessDate!
   }
 
   " Input type for updating admin business details. "
   input UpdateAdminBusinessInput {
-    employerWithholdingTaxAccountNumber: String
-    taxPrepaymentId: String
-    nationalInsuranceEmployerId: String
-    advanceTaxRate: Float
+    withholdingTaxBookNumber: String
+    withholdingTaxFileNumber: String
+    socialSecurityEmployerId: String
+    taxAdvancesRate: Float
+    taxAdvancesId: String
     registrationDate: TimelessDate
   }
 

package/dist/server/src/modules/financial-entities/typeDefs/admin-businesses.graphql.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin-businesses.graphql.js","sourceRoot":"","sources":["../../../../../../src/modules/financial-entities/typeDefs/admin-businesses.graphql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,eAAe,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiDjB,CAAC"}
+{"version":3,"file":"admin-businesses.graphql.js","sourceRoot":"","sources":["../../../../../../src/modules/financial-entities/typeDefs/admin-businesses.graphql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,eAAe,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoDjB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@accounter/server",
-  "version": "0.0.8-alpha-20251028104723-d7150deb91ef4f0b4cb8615dd9764727e684a57f",
+  "version": "0.0.8-alpha-20251028120806-2ffeafaf43eece2a7685012216a6fcc962bc1406",
   "type": "module",
   "description": "",
   "license": "MIT",
@@ -22,7 +22,7 @@
     "@accounter/pcn874-generator": "workspace:^",
     "@accounter/shaam-uniform-format-generator": "workspace:^",
     "@accounter/shaam6111-generator": "workspace:^",
-    "@ai-sdk/anthropic": "2.0.38",
+    "@ai-sdk/anthropic": "2.0.35",
     "@envelop/generic-auth": "10.0.0",
     "@envelop/graphql-modules": "8.0.0",
     "@google-cloud/pubsub": "5.2.0",
@@ -31,7 +31,7 @@
     "@pgtyped/cli": "2.4.3",
     "@pgtyped/runtime": "2.4.2",
     "@whatwg-node/fetch": "0.10.11",
-    "ai": "5.0.81",
+    "ai": "5.0.76",
     "basic-auth": "2.0.1",
     "bcrypt": "6.0.0",
     "cloudinary": "2.8.0",
@@ -48,7 +48,7 @@
     "node-cache": "5.1.2",
     "node-xlsx": "0.24.0",
     "pg": "8.16.3",
-    "puppeteer": "24.26.1",
+    "puppeteer": "24.26.0",
     "reflect-metadata": "0.2.2",
     "strip-indent": "4.1.1",
     "zod": "4.1.12"
@@ -57,7 +57,7 @@
     "@types/basic-auth": "1.1.8",
     "@types/bcrypt": "6.0.0",
     "@types/inline-css": "3.0.4",
-    "@types/pg": "8.15.6",
+    "@types/pg": "8.15.5",
     "nodemon": "3.1.10",
     "pino-pretty": "13.1.2",
     "rimraf": "6.0.1",

package/src/__generated__/types.ts

@@ -143,15 +143,16 @@ export type AddBusinessTripTravelAndSubsistenceExpenseInput = {
 /**  Represents a business entity managed by an accountant in the system. */
 export type AdminBusiness = {
   readonly __typename?: 'AdminBusiness';
-  readonly advanceTaxRate?: Maybe<Scalars['Float']['output']>;
   readonly business: LtdFinancialEntity;
-  readonly employerWithholdingTaxAccountNumber?: Maybe<Scalars['String']['output']>;
   readonly governmentId: Scalars['String']['output'];
   readonly id: Scalars['UUID']['output'];
   readonly name: Scalars['String']['output'];
-  readonly nationalInsuranceEmployerId?: Maybe<Scalars['String']['output']>;
   readonly registrationDate: Scalars['TimelessDate']['output'];
-  readonly taxPrepaymentId?: Maybe<Scalars['String']['output']>;
+  readonly socialSecurityEmployerId?: Maybe<Scalars['String']['output']>;
+  readonly taxAdvancesId?: Maybe<Scalars['String']['output']>;
+  readonly taxAdvancesRate?: Maybe<Scalars['Float']['output']>;
+  readonly withholdingTaxBookNumber?: Maybe<Scalars['String']['output']>;
+  readonly withholdingTaxFileNumber?: Maybe<Scalars['String']['output']>;
 };
 
 /**  defines a tag / category for charge arrangement */
@@ -1145,12 +1146,13 @@ export type Country = {
 
 /**  Input type for creating a new admin business.  */
 export type CreateAdminBusinessInput = {
-  readonly advanceTaxRate?: InputMaybe<Scalars['Float']['input']>;
   readonly businessId: Scalars['UUID']['input'];
-  readonly employerWithholdingTaxAccountNumber?: InputMaybe<Scalars['String']['input']>;
-  readonly nationalInsuranceEmployerId?: InputMaybe<Scalars['String']['input']>;
   readonly registrationDate: Scalars['TimelessDate']['input'];
-  readonly taxPrepaymentId?: InputMaybe<Scalars['String']['input']>;
+  readonly socialSecurityEmployerId?: InputMaybe<Scalars['String']['input']>;
+  readonly taxAdvancesId?: InputMaybe<Scalars['String']['input']>;
+  readonly taxAdvancesRate?: InputMaybe<Scalars['Float']['input']>;
+  readonly withholdingTaxBookNumber?: InputMaybe<Scalars['String']['input']>;
+  readonly withholdingTaxFileNumber?: InputMaybe<Scalars['String']['input']>;
 };
 
 /**  input for creating a new contract  */
@@ -4479,11 +4481,12 @@ export type Unprocessed = Document & Linkable & {
 
 /**  Input type for updating admin business details.  */
 export type UpdateAdminBusinessInput = {
-  readonly advanceTaxRate?: InputMaybe<Scalars['Float']['input']>;
-  readonly employerWithholdingTaxAccountNumber?: InputMaybe<Scalars['String']['input']>;
-  readonly nationalInsuranceEmployerId?: InputMaybe<Scalars['String']['input']>;
   readonly registrationDate?: InputMaybe<Scalars['TimelessDate']['input']>;
-  readonly taxPrepaymentId?: InputMaybe<Scalars['String']['input']>;
+  readonly socialSecurityEmployerId?: InputMaybe<Scalars['String']['input']>;
+  readonly taxAdvancesId?: InputMaybe<Scalars['String']['input']>;
+  readonly taxAdvancesRate?: InputMaybe<Scalars['Float']['input']>;
+  readonly withholdingTaxBookNumber?: InputMaybe<Scalars['String']['input']>;
+  readonly withholdingTaxFileNumber?: InputMaybe<Scalars['String']['input']>;
 };
 
 /**  input for updateBusiness  */
@@ -5523,15 +5526,16 @@ export type StreamDirectiveArgs = { };
 export type StreamDirectiveResolver<Result, Parent, ContextType = GraphQLModules.Context, Args = StreamDirectiveArgs> = DirectiveResolverFn<Result, Parent, ContextType, Args>;
 
 export type AdminBusinessResolvers<ContextType = GraphQLModules.Context, ParentType extends ResolversParentTypes['AdminBusiness'] = ResolversParentTypes['AdminBusiness']> = {
-  advanceTaxRate?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
   business?: Resolver<ResolversTypes['LtdFinancialEntity'], ParentType, ContextType>;
-  employerWithholdingTaxAccountNumber?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   governmentId?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   id?: Resolver<ResolversTypes['UUID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  nationalInsuranceEmployerId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   registrationDate?: Resolver<ResolversTypes['TimelessDate'], ParentType, ContextType>;
-  taxPrepaymentId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  socialSecurityEmployerId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  taxAdvancesId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  taxAdvancesRate?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+  withholdingTaxBookNumber?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  withholdingTaxFileNumber?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 

package/src/modules/financial-entities/__generated__/types.ts

@@ -4,7 +4,7 @@ export namespace FinancialEntitiesModule {
   interface DefinedFields {
     Query: 'adminBusiness' | 'allAdminBusinesses' | 'businessTransactionsSumFromLedgerRecords' | 'businessTransactionsFromLedgerRecords' | 'business' | 'businesses' | 'allBusinesses' | 'client' | 'allClients' | 'financialEntity' | 'allFinancialEntities' | 'taxCategories' | 'taxCategory' | 'taxCategoryByBusinessId';
     Mutation: 'createAdminBusiness' | 'updateAdminBusiness' | 'deleteAdminBusiness' | 'updateBusiness' | 'insertNewBusiness' | 'mergeBusinesses' | 'batchGenerateBusinessesOutOfTransactions' | 'updateClient' | 'insertClient' | 'updateTaxCategory' | 'insertTaxCategory';
-    AdminBusiness: 'id' | 'name' | 'governmentId' | 'business' | 'employerWithholdingTaxAccountNumber' | 'taxPrepaymentId' | 'nationalInsuranceEmployerId' | 'advanceTaxRate' | 'registrationDate';
+    AdminBusiness: 'id' | 'name' | 'governmentId' | 'business' | 'withholdingTaxBookNumber' | 'withholdingTaxFileNumber' | 'socialSecurityEmployerId' | 'taxAdvancesRate' | 'taxAdvancesId' | 'registrationDate';
     BusinessTransactionsSumFromLedgerRecordsSuccessfulResult: 'businessTransactionsSum';
     BusinessTransactionSum: 'business' | 'credit' | 'debit' | 'total' | 'foreignCurrenciesSum';
     ForeignCurrencySum: 'credit' | 'debit' | 'total' | 'currency';
@@ -50,8 +50,8 @@ export namespace FinancialEntitiesModule {
   };
   
   interface DefinedInputFields {
-    CreateAdminBusinessInput: 'businessId' | 'employerWithholdingTaxAccountNumber' | 'taxPrepaymentId' | 'nationalInsuranceEmployerId' | 'advanceTaxRate' | 'registrationDate';
-    UpdateAdminBusinessInput: 'employerWithholdingTaxAccountNumber' | 'taxPrepaymentId' | 'nationalInsuranceEmployerId' | 'advanceTaxRate' | 'registrationDate';
+    CreateAdminBusinessInput: 'businessId' | 'withholdingTaxBookNumber' | 'withholdingTaxFileNumber' | 'socialSecurityEmployerId' | 'taxAdvancesRate' | 'taxAdvancesId' | 'registrationDate';
+    UpdateAdminBusinessInput: 'withholdingTaxBookNumber' | 'withholdingTaxFileNumber' | 'socialSecurityEmployerId' | 'taxAdvancesRate' | 'taxAdvancesId' | 'registrationDate';
     BusinessTransactionsFilter: 'businessIDs' | 'ownerIds' | 'type' | 'fromDate' | 'toDate' | 'includeRevaluation';
     UpdateBusinessInput: 'name' | 'sortCode' | 'country' | 'hebrewName' | 'address' | 'email' | 'website' | 'phoneNumber' | 'governmentId' | 'taxCategory' | 'exemptDealer' | 'suggestions' | 'optionalVAT' | 'isReceiptEnough' | 'isDocumentsOptional' | 'pcn874RecordType' | 'irsCode' | 'isActive';
     InsertNewBusinessInput: 'name' | 'sortCode' | 'country' | 'hebrewName' | 'address' | 'email' | 'website' | 'phoneNumber' | 'governmentId' | 'taxCategory' | 'exemptDealer' | 'suggestions' | 'optionalVAT' | 'isReceiptEnough' | 'isDocumentsOptional' | 'pcn874RecordType' | 'irsCode' | 'isActive';
@@ -256,10 +256,11 @@ export namespace FinancialEntitiesModule {
       name?: gm.Middleware[];
       governmentId?: gm.Middleware[];
       business?: gm.Middleware[];
-      employerWithholdingTaxAccountNumber?: gm.Middleware[];
-      taxPrepaymentId?: gm.Middleware[];
-      nationalInsuranceEmployerId?: gm.Middleware[];
-      advanceTaxRate?: gm.Middleware[];
+      withholdingTaxBookNumber?: gm.Middleware[];
+      withholdingTaxFileNumber?: gm.Middleware[];
+      socialSecurityEmployerId?: gm.Middleware[];
+      taxAdvancesRate?: gm.Middleware[];
+      taxAdvancesId?: gm.Middleware[];
       registrationDate?: gm.Middleware[];
     };
     LtdFinancialEntity?: {

package/src/modules/financial-entities/resolvers/admin-businesses.resolver.ts

@@ -38,10 +38,11 @@ export const adminBusinessesResolvers: FinancialEntitiesModule.Resolvers = {
       }
       return business;
     },
-    employerWithholdingTaxAccountNumber: admin => admin.tax_nikuim_pinkas_number,
-    taxPrepaymentId: admin => admin.tax_siduri_number_2022,
-    nationalInsuranceEmployerId: admin => admin.pinkas_social_security_2022,
-    advanceTaxRate: admin => admin.advance_tax_rate,
+    withholdingTaxBookNumber: admin => admin.tax_nikuim_pinkas_number,
+    withholdingTaxFileNumber: admin => admin.nikuim,
+    socialSecurityEmployerId: admin => admin.pinkas_social_security_2022,
+    taxAdvancesRate: admin => admin.advance_tax_rate,
+    taxAdvancesId: admin => admin.tax_siduri_number_2022,
     registrationDate: admin => {
       if (!admin.registration_date) {
         throw new GraphQLError(`Admin business ID="${admin.id}" has no registration date`);

package/src/modules/financial-entities/typeDefs/admin-businesses.graphql.ts

@@ -20,29 +20,32 @@ export default gql`
     name: String!
     governmentId: String!
     business: LtdFinancialEntity!
-    employerWithholdingTaxAccountNumber: String
-    taxPrepaymentId: String
-    nationalInsuranceEmployerId: String
-    advanceTaxRate: Float
+    withholdingTaxBookNumber: String
+    withholdingTaxFileNumber: String
+    socialSecurityEmployerId: String
+    taxAdvancesRate: Float
+    taxAdvancesId: String
     registrationDate: TimelessDate!
   }
 
   " Input type for creating a new admin business. "
   input CreateAdminBusinessInput {
     businessId: UUID!
-    employerWithholdingTaxAccountNumber: String
-    taxPrepaymentId: String
-    nationalInsuranceEmployerId: String
-    advanceTaxRate: Float
+    withholdingTaxBookNumber: String
+    withholdingTaxFileNumber: String
+    socialSecurityEmployerId: String
+    taxAdvancesRate: Float
+    taxAdvancesId: String
     registrationDate: TimelessDate!
   }
 
   " Input type for updating admin business details. "
   input UpdateAdminBusinessInput {
-    employerWithholdingTaxAccountNumber: String
-    taxPrepaymentId: String
-    nationalInsuranceEmployerId: String
-    advanceTaxRate: Float
+    withholdingTaxBookNumber: String
+    withholdingTaxFileNumber: String
+    socialSecurityEmployerId: String
+    taxAdvancesRate: Float
+    taxAdvancesId: String
     registrationDate: TimelessDate
   }