feat: more resources support importing

2026-02-20 23:00:34 +00:00 · 2024-04-05 02:00:12 +02:00
parent 3851d34ba4
commit dd9098bdc1
46 changed files with 1510 additions and 149 deletions
--- a/packages/server/src/models/Account.Settings.ts
+++ b/packages/server/src/models/Account.Settings.ts
@@ -119,6 +119,49 @@ export default {
      exportable: true,
    },
  },
+  fields2: {
+    name: {
+      name: 'account.field.name',
+      fieldType: 'text',
+      unique: true,
+      required: true,
+    },
+    description: {
+      name: 'account.field.description',
+      fieldType: 'text',
+    },
+    code: {
+      name: 'account.field.code',
+      fieldType: 'text',
+      minLength: 3,
+      maxLength: 6,
+      unique: true,
+      importHint: 'Unique number to identify the account.',
+    },
+    accountType: {
+      name: 'account.field.type',
+      fieldType: 'enumeration',
+      options: ACCOUNT_TYPES.map((accountType) => ({
+        label: accountType.label,
+        key: accountType.key,
+      })),
+      required: true,
+    },
+    active: {
+      name: 'account.field.active',
+      fieldType: 'boolean',
+    },
+    currencyCode: {
+      name: 'account.field.currency',
+      fieldType: 'text',
+    },
+    parentAccountId: {
+      name: 'account.field.parent_account',
+      fieldType: 'relation',
+      relationModel: 'Account',
+      relationImportMatch: ['name', 'code'],
+    },
+  },
 };

 /**
--- a/packages/server/src/models/Bill.Settings.ts
+++ b/packages/server/src/models/Bill.Settings.ts
@@ -144,7 +144,7 @@ export default {
          required: true,
        },
        description: {
-          name: 'Description',
+          name: 'Line Description',
          fieldType: 'text',
        },
      },
--- a/packages/server/src/models/BillPayment.Settings.ts
+++ b/packages/server/src/models/BillPayment.Settings.ts
@@ -4,6 +4,10 @@ export default {
    sortOrder: 'DESC',
    sortField: 'bill_date',
  },
+  importable: true,
+  importAggregator: 'group',
+  importAggregateOn: 'entries',
+  importAggregateBy: 'paymentNumber',
  fields: {
    vendor: {
      name: 'bill_payment.field.vendor',
@@ -33,7 +37,7 @@ export default {

      relationType: 'enumeration',
      relationKey: 'paymentAccount',
-      
+
      relationEntityLabel: 'name',
      relationEntityKey: 'slug',
    },
@@ -63,4 +67,64 @@ export default {
      fieldType: 'date',
    },
  },
+  fields2: {
+    vendorId: {
+      name: 'bill_payment.field.vendor',
+      fieldType: 'relation',
+      relationModel: 'Contact',
+      relationImportMatch: ['displayName'],
+      required: true,
+    },
+    payment_date: {
+      name: 'bill_payment.field.payment_date',
+      fieldType: 'date',
+      required: true,
+    },
+    paymentNumber: {
+      name: 'bill_payment.field.payment_number',
+      fieldType: 'text',
+      unique: true,
+    },
+    paymentAccountId: {
+      name: 'bill_payment.field.payment_account',
+      fieldType: 'relation',
+      relationModel: 'Account',
+      relationImportMatch: ['name', 'code'],
+      required: true,
+    },
+    exchangeRate: {
+      name: 'bill_payment.field.exchange_rate',
+      fieldType: 'number',
+    },
+    statement: {
+      name: 'bill_payment.field.statement',
+      fieldType: 'text',
+    },
+    reference: {
+      name: 'bill_payment.field.reference',
+      fieldType: 'text',
+    },
+    entries: {
+      name: 'bill_payment.field.entries',
+      column: 'entries',
+      fieldType: 'collection',
+      collectionOf: 'object',
+      collectionMinLength: 1,
+      required: true,
+      fields: {
+        billId: {
+          name: 'bill_payment.field.entries.bill',
+          fieldType: 'relation',
+          relationModel: 'Bill',
+          relationImportMatch: 'billNumber',
+          required: true,
+        },
+        paymentAmount: {
+          name: 'bill_payment.field.entries.payment_amount',
+          fieldType: 'number',
+          required: true,
+        },
+      },
+    },
+  },
 };
--- a/packages/server/src/models/Customer.Settings.ts
+++ b/packages/server/src/models/Customer.Settings.ts
@@ -212,6 +212,161 @@ export default {
      fieldType: 'date',
    },
  },
+  fields2: {
+    customerType: {
+      name: 'Customer Type',
+      fieldType: 'enumeration',
+      options: [
+        { key: 'business', label: 'Business' },
+        { key: 'individual', label: 'Individual' },
+      ],
+      required: true,
+    },
+    firstName: {
+      name: 'customer.field.first_name',
+      column: 'first_name',
+      fieldType: 'text',
+    },
+    lastName: {
+      name: 'customer.field.last_name',
+      column: 'last_name',
+      fieldType: 'text',
+    },
+    displayName: {
+      name: 'customer.field.display_name',
+      column: 'display_name',
+      fieldType: 'text',
+      required: true,
+    },
+    email: {
+      name: 'customer.field.email',
+      column: 'email',
+      fieldType: 'text',
+    },
+    workPhone: {
+      name: 'customer.field.work_phone',
+      column: 'work_phone',
+      fieldType: 'text',
+    },
+    personalPhone: {
+      name: 'customer.field.personal_phone',
+      column: 'personal_phone',
+      fieldType: 'text',
+    },
+    companyName: {
+      name: 'customer.field.company_name',
+      column: 'company_name',
+      fieldType: 'text',
+    },
+    website: {
+      name: 'customer.field.website',
+      column: 'website',
+      fieldType: 'url',
+    },
+    openingBalance: {
+      name: 'customer.field.opening_balance',
+      column: 'opening_balance',
+      fieldType: 'number',
+    },
+    openingBalanceAt: {
+      name: 'customer.field.opening_balance_at',
+      column: 'opening_balance_at',
+      filterable: false,
+      fieldType: 'date',
+    },
+    openingBalanceExchangeRate: {
+      name: 'Opening Balance Ex. Rate',
+      column: 'opening_balance_exchange_rate',
+      fieldType: 'number',
+    },
+    currencyCode: {
+      name: 'customer.field.currency',
+      column: 'currency_code',
+      fieldType: 'text',
+    },
+    note: {
+      name: 'Note',
+      column: 'note',
+      fieldType: 'text',
+    },
+    active: {
+      name: 'Active',
+      column: 'active',
+      fieldType: 'boolean',
+    },
+    // Billing Address
+    billingAddress1: {
+      name: 'Billing Address 1',
+      column: 'billing_address1',
+      fieldType: 'text',
+    },
+    billingAddress2: {
+      name: 'Billing Address 2',
+      column: 'billing_address2',
+      fieldType: 'text',
+    },
+    billingAddressCity: {
+      name: 'Billing Address City',
+      column: 'billing_address_city',
+      fieldType: 'text',
+    },
+    billingAddressCountry: {
+      name: 'Billing Address Country',
+      column: 'billing_address_country',
+      fieldType: 'text',
+    },
+    billingAddressPostcode: {
+      name: 'Billing Address Postcode',
+      column: 'billing_address_postcode',
+      fieldType: 'text',
+    },
+    billingAddressState: {
+      name: 'Billing Address State',
+      column: 'billing_address_state',
+      fieldType: 'text',
+    },
+    billingAddressPhone: {
+      name: 'Billing Address Phone',
+      column: 'billing_address_phone',
+      fieldType: 'text',
+    },
+    // Shipping Address
+    shippingAddress1: {
+      name: 'Shipping Address 1',
+      column: 'shipping_address1',
+      fieldType: 'text',
+    },
+    shippingAddress2: {
+      name: 'Shipping Address 2',
+      column: 'shipping_address2',
+      fieldType: 'text',
+    },
+    shippingAddressCity: {
+      name: 'Shipping Address City',
+      column: 'shipping_address_city',
+      fieldType: 'text',
+    },
+    shippingAddressCountry: {
+      name: 'Shipping Address Country',
+      column: 'shipping_address_country',
+      fieldType: 'text',
+    },
+    shippingAddressPostcode: {
+      name: 'Shipping Address Postcode',
+      column: 'shipping_address_postcode',
+      fieldType: 'text',
+    },
+    shippingAddressPhone: {
+      name: 'Shipping Address Phone',
+      column: 'shipping_address_phone',
+      fieldType: 'text',
+    },
+    shippingAddressState: {
+      name: 'Shipping Address State',
+      column: 'shipping_address_state',
+      fieldType: 'text',
+    },
+  },
 };

 function statusFieldFilterQuery(query, role) {
--- a/packages/server/src/models/Expense.Settings.ts
+++ b/packages/server/src/models/Expense.Settings.ts
@@ -7,13 +7,14 @@ export default {
    sortOrder: 'DESC',
    sortField: 'name',
  },
+  importable: true,
  fields: {
-    'payment_date': {
+    payment_date: {
      name: 'expense.field.payment_date',
      column: 'payment_date',
      fieldType: 'date',
    },
-    'payment_account': {
+    payment_account: {
      name: 'expense.field.payment_account',
      column: 'payment_account_id',
      fieldType: 'relation',
@@ -24,27 +25,27 @@ export default {
      relationEntityLabel: 'name',
      relationEntityKey: 'slug',
    },
-    'amount': {
+    amount: {
      name: 'expense.field.amount',
      column: 'total_amount',
      fieldType: 'number',
    },
-    'reference_no': {
+    reference_no: {
      name: 'expense.field.reference_no',
      column: 'reference_no',
      fieldType: 'text',
    },
-    'description': {
+    description: {
      name: 'expense.field.description',
      column: 'description',
      fieldType: 'text',
    },
-    'published': {
+    published: {
      name: 'expense.field.published',
      column: 'published_at',
      fieldType: 'date',
    },
-    'status': {
+    status: {
      name: 'expense.field.status',
      fieldType: 'enumeration',
      options: [
@@ -54,12 +55,69 @@ export default {
      filterCustomQuery: StatusFieldFilterQuery,
      sortCustomQuery: StatusFieldSortQuery,
    },
-    'created_at': {
+    createdAt: {
      name: 'expense.field.created_at',
      column: 'created_at',
      fieldType: 'date',
    },
  },
+  fields2: {
+    paymentAccountId: {
+      name: 'expense.field.payment_account',
+      fieldType: 'relation',
+      relationModel: 'Account',
+      relationImportMatch: ['name', 'code'], 
+      required: true,
+    },
+    referenceNo: {
+      name: 'expense.field.reference_no',
+      fieldType: 'text',
+    },
+    paymentDate: {
+      name: 'expense.field.payment_date',
+      fieldType: 'date',
+      required: true,
+    },
+    currencyCode: {
+      name: 'expense.field.currency_code',
+      fieldType: 'text',
+    },
+    exchangeRate: {
+      name: 'expense.field.exchange_rate',
+      fieldType: 'number',
+    },
+    description: {
+      name: 'expense.field.description',
+      fieldType: 'text',
+    },
+    categories: {
+      name: 'expense.field.categories',
+      fieldType: 'collection',
+      collectionOf: 'object',
+      fields: {
+        expenseAccountId: {
+          name: 'expense.field.expense_account',
+          fieldType: 'relation',
+          relationModel: 'Account',
+          relationImportMatch: ['name', 'code'],
+          required: true,
+        },
+        amount: {
+          name: 'expense.field.amount',
+          fieldType: 'number',
+          required: true,
+        },
+        description: {
+          name: 'expense.field.line_description',
+          fieldType: 'text',
+        },
+      },
+    },
+    publish: {
+      name: 'expense.field.publish',
+      fieldType: 'boolean',
+    },
+  },
 };

 function StatusFieldFilterQuery(query, role) {
--- a/packages/server/src/models/Item.Settings.ts
+++ b/packages/server/src/models/Item.Settings.ts
@@ -5,6 +5,96 @@ export default {
    sortField: 'name',
    sortOrder: 'DESC',
  },
+  fields2: {
+    type: {
+      name: 'item.field.type',
+      fieldType: 'enumeration',
+      options: [
+        { key: 'inventory', label: 'item.field.type.inventory' },
+        { key: 'service', label: 'item.field.type.service' },
+        { key: 'non-inventory', label: 'item.field.type.non-inventory' },
+      ],
+      required: true,
+    },
+    name: {
+      name: 'item.field.name',
+      fieldType: 'text',
+      required: true,
+      unique: true,
+    },
+    code: {
+      name: 'item.field.code',
+      fieldType: 'text',
+      unique: true,
+    },
+    sellable: {
+      name: 'item.field.sellable',
+      fieldType: 'boolean',
+      required: true,
+    },
+    purchasable: {
+      name: 'item.field.purchasable',
+      fieldType: 'boolean',
+      required: true,
+    },
+    sellPrice: {
+      name: 'item.field.sell_price',
+      fieldType: 'number',
+      required: true,
+    },
+    costPrice: {
+      name: 'item.field.cost_price',
+      fieldType: 'number',
+      required: true,
+    },
+    costAccount: {
+      name: 'item.field.cost_account',
+      fieldType: 'relation',
+      relationModel: 'Account',
+      relationImportMatch: ['name', 'code'],
+      required: true,
+    },
+    sellAccount: {
+      name: 'item.field.sell_account',
+      fieldType: 'relation',
+      relationModel: 'Account',
+      relationImportMatch: ['name', 'code'],
+      required: true,
+    },
+    inventoryAccount: {
+      name: 'item.field.inventory_account',
+      fieldType: 'relation',
+      relationModel: 'Account',
+      relationImportMatch: ['name', 'code'],
+      required: true,
+    },
+    sellDescription: {
+      name: 'Sell description',
+      column: 'sell_description',
+      fieldType: 'text',
+    },
+    purchaseDescription: {
+      name: 'Purchase description',
+      column: 'purchase_description',
+      fieldType: 'text',
+      importable: true,
+    },
+    note: {
+      name: 'item.field.note',
+      fieldType: 'text',
+    },
+    category: {
+      name: 'item.field.category',
+      fieldType: 'relation',
+      relationModel: 'ItemCategory',
+      relationImportMatch: 'name',
+    },
+    active: {
+      name: 'item.field.active',
+      fieldType: 'boolean',
+      importable: true,
+    },
+  },
  fields: {
    type: {
      name: 'item.field.type',
@@ -31,7 +121,6 @@ export default {
      column: 'code',
      fieldType: 'text',
      importable: true,
-      
    },
    sellable: {
      name: 'item.field.sellable',
@@ -66,13 +155,11 @@ export default {
      column: 'cost_account_id',
      fieldType: 'relation',

-      relationType: 'enumeration',
      relationKey: 'costAccount',

      relationEntityLabel: 'name',
      relationEntityKey: 'slug',

-      dataTransferObjectKey: 'costAccountId',
      importableRelationLabel: ['name', 'code'],
      importable: true,
      required: true,
@@ -82,8 +169,8 @@ export default {
      column: 'sell_account_id',
      fieldType: 'relation',

-      relationType: 'enumeration',
      relationKey: 'sellAccount',
+      relationType: 'one-to-many',

      relationEntityLabel: 'name',
      relationEntityKey: 'slug',
@@ -98,7 +185,6 @@ export default {
      column: 'inventory_account_id',
      fieldType: 'relation',

-      relationType: 'enumeration',
      relationKey: 'inventoryAccount',

      relationEntityLabel: 'name',
@@ -137,7 +223,6 @@ export default {
      column: 'category_id',
      fieldType: 'relation',

-      relationType: 'enumeration',
      relationKey: 'category',

      relationEntityLabel: 'name',
--- a/packages/server/src/models/ItemCategory.Settings.ts
+++ b/packages/server/src/models/ItemCategory.Settings.ts
@@ -30,4 +30,16 @@ export default {
      columnType: 'date',
    },
  },
+  fields2: {
+    name: {
+      name: 'item_category.field.name',
+      column: 'name',
+      fieldType: 'text',
+    },
+    description: {
+      name: 'item_category.field.description',
+      column: 'description',
+      fieldType: 'text',
+    },
+  },
 };
--- a/packages/server/src/models/ModelSetting.ts
+++ b/packages/server/src/models/ModelSetting.ts
@@ -1,33 +1,54 @@
 import { get } from 'lodash';
-import { IModelMeta, IModelMetaField, IModelMetaDefaultSort } from '@/interfaces';
+import {
+  IModelMeta,
+  IModelMetaField,
+  IModelMetaDefaultSort,
+} from '@/interfaces';
+
+const defaultModelMeta = {
+  fields: {},
+  fields2: {},
+};

 export default (Model) =>
  class ModelSettings extends Model {
    /**
     *
+     * @returns {IModelMeta}
     */
    static get meta(): IModelMeta {
      throw new Error('');
    }

+    /**
+     * Parsed meta merged with default emta.
+     * @returns {IModelMeta}
+     */
+    static get parsedMeta(): IModelMeta {
+      return {
+        ...defaultModelMeta,
+        ...this.meta,
+      };
+    }
+
    /**
     * Retrieve specific model field meta of the given field key.
     * @param {string} key
     * @returns {IModelMetaField}
     */
-    public static getField(key: string, attribute?:string): IModelMetaField {
+    public static getField(key: string, attribute?: string): IModelMetaField {
      const field = get(this.meta.fields, key);

      return attribute ? get(field, attribute) : field;
    }

    /**
-     * Retrieve  the specific model meta.
+     * Retrieves the specific model meta.
     * @param {string} key
     * @returns
     */
    public static getMeta(key?: string) {
-      return key ? get(this.meta, key): this.meta; 
+      return key ? get(this.parsedMeta, key) : this.parsedMeta;
    }

    /**
--- a/packages/server/src/models/SaleEstimate.Settings.ts
+++ b/packages/server/src/models/SaleEstimate.Settings.ts
@@ -4,18 +4,22 @@ export default {
    sortOrder: 'DESC',
    sortField: 'estimate_date',
  },
+  importable: true,
+  importAggregator: 'group',
+  importAggregateOn: 'entries',
+  importAggregateBy: 'estimateNumber',
  fields: {
-    'amount': {
+    amount: {
      name: 'estimate.field.amount',
      column: 'amount',
      fieldType: 'number',
    },
-    'estimate_number': {
+    estimate_number: {
      name: 'estimate.field.estimate_number',
      column: 'estimate_number',
      fieldType: 'text',
    },
-    'customer': {
+    customer: {
      name: 'estimate.field.customer',
      column: 'customer_id',
      fieldType: 'relation',
@@ -26,32 +30,32 @@ export default {
      relationEntityLabel: 'display_name',
      relationEntityKey: 'id',
    },
-    'estimate_date': {
+    estimate_date: {
      name: 'estimate.field.estimate_date',
      column: 'estimate_date',
      fieldType: 'date',
    },
-    'expiration_date': {
+    expiration_date: {
      name: 'estimate.field.expiration_date',
      column: 'expiration_date',
      fieldType: 'date',
    },
-    'reference_no': {
+    reference_no: {
      name: 'estimate.field.reference_no',
      column: 'reference',
      fieldType: 'text',
    },
-    'note': {
+    note: {
      name: 'estimate.field.note',
      column: 'note',
      fieldType: 'text',
    },
-    'terms_conditions': {
+    terms_conditions: {
      name: 'estimate.field.terms_conditions',
      column: 'terms_conditions',
      fieldType: 'text',
    },
-    'status': {
+    status: {
      name: 'estimate.field.status',
      fieldType: 'enumeration',
      options: [
@@ -63,12 +67,89 @@ export default {
      filterCustomQuery: StatusFieldFilterQuery,
      sortCustomQuery: StatusFieldSortQuery,
    },
-    'created_at': {
+    created_at: {
      name: 'estimate.field.created_at',
      column: 'created_at',
      columnType: 'date',
    },
  },
+  fields2: {
+    customerId: {
+      name: 'Customer',
+      fieldType: 'relation',
+      relationModel: 'Contact',
+      relationImportMatch: ['displayName'],
+      required: true,
+    },
+    estimateDate: {
+      name: 'Estimate Date',
+      fieldType: 'date',
+      required: true,
+    },
+    expirationDate: {
+      name: 'Expiration Date',
+      fieldType: 'date',
+      required: true,
+    },
+    estimateNumber: {
+      name: 'Estimate No.',
+      fieldType: 'text',
+    },
+    reference: {
+      name: 'Reference No.',
+      fieldType: 'text',
+    },
+    exchangeRate: {
+      name: 'Exchange Rate',
+      fieldType: 'number',
+    },
+    currencyCode: {
+      name: 'Currency',
+      fieldType: 'text',
+    },
+    note: {
+      name: 'Note',
+      fieldType: 'text',
+    },
+    termsConditions: {
+      name: 'Terms & Conditions',
+      fieldType: 'text',
+    },
+    delivered: {
+      name: 'Delivered',
+      type: 'boolean',
+    },
+    entries: {
+      name: 'Entries',
+      fieldType: 'collection',
+      collectionOf: 'object',
+      collectionMinLength: 1,
+      required: true,
+      fields: {
+        itemId: {
+          name: 'invoice.field.item_name',
+          fieldType: 'relation',
+          relationModel: 'Item',
+          relationImportMatch: ['name', 'code'],
+          required: true,
+        },
+        rate: {
+          name: 'invoice.field.rate',
+          fieldType: 'number',
+          required: true,
+        },
+        quantity: {
+          name: 'invoice.field.quantity',
+          fieldType: 'number',
+          required: true,
+        },
+        description: {
+          name: 'Line Description',
+          fieldType: 'text',
+        },
+      },
+    },
+  },
 };

 function StatusFieldSortQuery(query, role) {
--- a/packages/server/src/models/SaleInvoice.Settings.ts
+++ b/packages/server/src/models/SaleInvoice.Settings.ts
@@ -2,8 +2,12 @@ export default {
  defaultFilterField: 'customer',
  defaultSort: {
    sortOrder: 'DESC',
-    sortField: 'created_at',
+    sortField: 'createdAt',
  },
+  importable: true,
+  importAggregator: 'group',
+  importAggregateOn: 'entries',
+  importAggregateBy: 'invoiceNo',
  fields: {
    customer: {
      name: 'invoice.field.customer',
@@ -77,12 +81,89 @@ export default {
      filterCustomQuery: StatusFieldFilterQuery,
      sortCustomQuery: StatusFieldSortQuery,
    },
-    created_at: {
+    createdAt: {
      name: 'invoice.field.created_at',
      column: 'created_at',
      fieldType: 'date',
    },
  },
+  fields2: {
+    invoiceDate: {
+      name: 'invoice.field.invoice_date',
+      fieldType: 'date',
+      required: true,
+    },
+    dueDate: {
+      name: 'invoice.field.due_date',
+      fieldType: 'date',
+      required: true,
+    },
+    referenceNo: {
+      name: 'invoice.field.reference_no',
+      fieldType: 'text',
+    },
+    invoiceNo: {
+      name: 'invoice.field.invoice_no',
+      fieldType: 'text',
+    },
+    customerId: {
+      name: 'invoice.field.customer',
+      fieldType: 'relation',
+      relationModel: 'Contact',
+      relationImportMatch: 'displayName',
+      required: true,
+    },
+    exchangeRate: {
+      name: 'invoice.field.exchange_rate',
+      fieldType: 'number',
+    },
+    currencyCode: {
+      name: 'invoice.field.currency',
+      fieldType: 'text',
+    },
+    invoiceMessage: {
+      name: 'invoice.field.invoice_message',
+      fieldType: 'text',
+    },
+    termsConditions: {
+      name: 'invoice.field.terms_conditions',
+      fieldType: 'text',
+    },
+    entries: {
+      name: 'invoice.field.entries',
+      fieldType: 'collection',
+      collectionOf: 'object',
+      collectionMinLength: 1,
+      required: true,
+      fields: {
+        itemId: {
+          name: 'invoice.field.item_name',
+          fieldType: 'relation',
+          relationModel: 'Item',
+          relationImportMatch: ['name', 'code'],
+          required: true,
+        },
+        rate: {
+          name: 'invoice.field.rate',
+          fieldType: 'number',
+          required: true,
+        },
+        quantity: {
+          name: 'invoice.field.quantity',
+          fieldType: 'number',
+          required: true,
+        },
+        description: {
+          name: 'invoice.field.description',
+          fieldType: 'text',
+        },
+      },
+    },
+    delivered: {
+      name: 'invoice.field.delivered',
+      fieldType: 'boolean',
+    },
+  },
 };

 /**
--- a/packages/server/src/models/UncategorizedCashflowTransaction.meta.ts
+++ b/packages/server/src/models/UncategorizedCashflowTransaction.meta.ts
@@ -51,4 +51,33 @@ export default {
      importable: false,
    },
  },
+  fields2: {
+    date: {
+      name: 'Date',
+      fieldType: 'date',
+      required: true,
+    },
+    payee: {
+      name: 'Payee',
+      column: 'payee',
+      fieldType: 'text',
+    },
+    description: {
+      name: 'Description',
+      column: 'description',
+      fieldType: 'text',
+    },
+    referenceNo: {
+      name: 'Reference No.',
+      column: 'reference_no',
+      fieldType: 'text',
+    },
+    amount: {
+      name: 'Amount',
+      column: 'Amount',
+      fieldType: 'numeric',
+      required: true,
+    },
+   
+  }
 };
--- a/packages/server/src/models/Vendor.Settings.ts
+++ b/packages/server/src/models/Vendor.Settings.ts
@@ -206,4 +206,149 @@ export default {
      fieldType: 'date',
    },
  },
+  fields2: {
+    firstName: {
+      name: 'vendor.field.first_name',
+      column: 'first_name',
+      fieldType: 'text',
+    },
+    lastName: {
+      name: 'vendor.field.last_name',
+      column: 'last_name',
+      fieldType: 'text',
+    },
+    displayName: {
+      name: 'vendor.field.display_name',
+      column: 'display_name',
+      fieldType: 'text',
+      required: true,
+    },
+    email: {
+      name: 'vendor.field.email',
+      column: 'email',
+      fieldType: 'text',
+    },
+    workPhone: {
+      name: 'vendor.field.work_phone',
+      column: 'work_phone',
+      fieldType: 'text',
+    },
+    personalPhone: {
+      name: 'vendor.field.personal_phone',
+      column: 'personal_phone',
+      fieldType: 'text',
+    },
+    companyName: {
+      name: 'vendor.field.company_name',
+      column: 'company_name',
+      fieldType: 'text',
+    },
+    website: {
+      name: 'vendor.field.website',
+      column: 'website',
+      fieldType: 'text',
+    },
+    openingBalance: {
+      name: 'vendor.field.opening_balance',
+      column: 'opening_balance',
+      fieldType: 'number',
+    },
+    openingBalanceAt: {
+      name: 'vendor.field.opening_balance_at',
+      column: 'opening_balance_at',
+      fieldType: 'date',
+    },
+    openingBalanceExchangeRate: {
+      name: 'Opening Balance Ex. Rate',
+      column: 'opening_balance_exchange_rate',
+      fieldType: 'number',
+    },
+    currencyCode: {
+      name: 'vendor.field.currency',
+      column: 'currency_code',
+      fieldType: 'text',
+    },
+    note: {
+      name: 'Note',
+      column: 'note',
+      fieldType: 'text',
+    },
+    active: {
+      name: 'Active',
+      column: 'active',
+      fieldType: 'boolean',
+    },
+    // Billing Address
+    billingAddress1: {
+      name: 'Billing Address 1',
+      column: 'billing_address1',
+      fieldType: 'text',
+    },
+    billingAddress2: {
+      name: 'Billing Address 2',
+      column: 'billing_address2',
+      fieldType: 'text',
+    },
+    billingAddressCity: {
+      name: 'Billing Address City',
+      column: 'billing_address_city',
+      fieldType: 'text',
+    },
+    billingAddressCountry: {
+      name: 'Billing Address Country',
+      column: 'billing_address_country',
+      fieldType: 'text',
+    },
+    billingAddressPostcode: {
+      name: 'Billing Address Postcode',
+      column: 'billing_address_postcode',
+      fieldType: 'text',
+    },
+    billingAddressState: {
+      name: 'Billing Address State',
+      column: 'billing_address_state',
+      fieldType: 'text',
+    },
+    billingAddressPhone: {
+      name: 'Billing Address Phone',
+      column: 'billing_address_phone',
+      fieldType: 'text',
+    },
+    // Shipping Address
+    shippingAddress1: {
+      name: 'Shipping Address 1',
+      column: 'shipping_address1',
+      fieldType: 'text',
+    },
+    shippingAddress2: {
+      name: 'Shipping Address 2',
+      column: 'shipping_address2',
+      fieldType: 'text',
+    },
+    shippingAddressCity: {
+      name: 'Shipping Address City',
+      column: 'shipping_address_city',
+      fieldType: 'text',
+    },
+    shippingAddressCountry: {
+      name: 'Shipping Address Country',
+      column: 'shipping_address_country',
+      fieldType: 'text',
+    },
+    shippingAddressPostcode: {
+      name: 'Shipping Address Postcode',
+      column: 'shipping_address_postcode',
+      fieldType: 'text',
+    },
+    shippingAddressState: {
+      name: 'Shipping Address State',
+      column: 'shipping_address_state',
+      fieldType: 'text',
+    },
+    shippingAddressPhone: {
+      name: 'Shipping Address Phone',
+      column: 'shipping_address_phone',
+      fieldType: 'text',
+    },
+  },
 };