fix: remove relation bind knex.

server/src/models/Account.js

@@ -63,7 +63,7 @@ export default class Account extends TenantModel {
        */
       type: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(AccountType.default),
+        modelClass: AccountType.default,
         join: {
           from: 'accounts.accountTypeId',
           to: 'account_types.id',
@@ -75,7 +75,7 @@ export default class Account extends TenantModel {
        */
       transactions: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(AccountTransaction.default),
+        modelClass: AccountTransaction.default,
         join: {
           from: 'accounts.id',
           to: 'accounts_transactions.accountId',

server/src/models/AccountTransaction.js

@@ -88,7 +88,7 @@ export default class AccountTransaction extends TenantModel {
     return {
       account: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Account.default),
+        modelClass: Account.default,
         join: {
           from: 'accounts_transactions.accountId',
           to: 'accounts.id',

server/src/models/AccountType.js

@@ -22,7 +22,7 @@ export default class AccountType extends TenantModel {
        */
       accounts: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(Account.default),
+        modelClass: Account.default,
         join: {
           from: 'account_types.id',
           to: 'accounts.accountTypeId',

server/src/models/Bill.js

@@ -42,7 +42,7 @@ export default class Bill extends TenantModel {
     return {
       vendor: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Vendor.default),
+        modelClass: Vendor.default,
         join: {
           from: 'bills.vendorId',
           to: 'vendors.id',
@@ -51,7 +51,7 @@ export default class Bill extends TenantModel {
 
       entries: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(ItemEntry.default),
+        modelClass: ItemEntry.default,
         join: {
           from: 'bills.id',
           to: 'items_entries.referenceId',

server/src/models/BillPayment.js

@@ -28,7 +28,7 @@ export default class BillPayment extends TenantModel {
     return {
       entries: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(BillPaymentEntry.default),
+        modelClass: BillPaymentEntry.default,
         join: {
           from: 'bills_payments.id',
           to: 'bills_payments_entries.billPaymentId',
@@ -37,7 +37,7 @@ export default class BillPayment extends TenantModel {
 
       vendor: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Vendor.default),
+        modelClass: Vendor.default,
         join: {
           from: 'bills_payments.vendorId',
           to: 'vendors.id',
@@ -46,7 +46,7 @@ export default class BillPayment extends TenantModel {
 
       paymentAccount: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Account.default),
+        modelClass: Account.default,
         join: {
           from: 'bills_payments.paymentAccountId',
           to: 'accounts.id',
@@ -55,7 +55,7 @@ export default class BillPayment extends TenantModel {
 
       transactions: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(AccountTransaction.default),
+        modelClass: AccountTransaction.default,
         join: {
           from: 'bills_payments.id',
           to: 'accounts_transactions.referenceId'

server/src/models/Contact.js

@@ -45,7 +45,7 @@ export default class Contact extends TenantModel {
     return {
       salesInvoices: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(SaleInvoice.default),
+        modelClass: SaleInvoice.default,
         join: {
           from: 'contacts.id',
           to: 'sales_invoices.customerId',
@@ -54,7 +54,7 @@ export default class Contact extends TenantModel {
 
       bills: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(Bill.default),
+        modelClass: Bill.default,
         join: {
           from: 'contacts.id',
           to: 'bills.vendorId',

server/src/models/Expense.js

@@ -72,11 +72,12 @@ export default class Expense extends TenantModel {
   static get relationMappings() {
     const Account = require('models/Account');
     const ExpenseCategory = require('models/ExpenseCategory');
-    
+    const SystemUser = require('system/models/SystemUser');
+
     return {
       paymentAccount: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Account.default),
+        modelClass: Account.default,
         join: {
           from: 'expenses_transactions.paymentAccountId',
           to: 'accounts.id',
@@ -84,12 +85,20 @@ export default class Expense extends TenantModel {
       },
       categories: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(ExpenseCategory.default),
+        modelClass: ExpenseCategory.default,
         join: {
           from: 'expenses_transactions.id',
           to: 'expense_transaction_categories.expenseId',
         },
       },
+      user: {
+        relation: Model.BelongsToOneRelation,
+        modelClass: SystemUser.default,
+        join: {
+          from: 'expenses_transactions.userId',
+          to: 'users.id',
+        }
+      }
     };
   }
 }

server/src/models/ExpenseCategory.js

@@ -18,7 +18,7 @@ export default class ExpenseCategory extends TenantModel {
     return {
       expenseAccount: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Account.default),
+        modelClass: Account.default,
         join: {
           from: 'expense_transaction_categories.expenseAccountId',
           to: 'accounts.id',

server/src/models/InventoryCostLotTracker.js

@@ -57,7 +57,7 @@ export default class InventoryCostLotTracker extends TenantModel {
     return {
       item: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Item.default),
+        modelClass: Item.default,
         join: {
           from: 'inventory_cost_lot_tracker.itemId',
           to: 'items.id',

server/src/models/InventoryTransaction.js

@@ -46,7 +46,7 @@ export default class InventoryTransaction extends TenantModel {
     return {
       item: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Item.default),
+        modelClass: Item.default,
         join: {
           from: 'inventory_transactions.itemId',
           to: 'items.id',

server/src/models/Item.js

@@ -49,7 +49,7 @@ export default class Item extends TenantModel {
        */
       category: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(ItemCategory.default),
+        modelClass: ItemCategory.default,
         join: {
           from: 'items.categoryId',
           to: 'items_categories.id',
@@ -58,7 +58,7 @@ export default class Item extends TenantModel {
 
       costAccount: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Account.default),
+        modelClass: Account.default,
         join: {
           from: 'items.costAccountId',
           to: 'accounts.id',
@@ -67,7 +67,7 @@ export default class Item extends TenantModel {
 
       sellAccount: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Account.default),
+        modelClass: Account.default,
         join: {
           from: 'items.sellAccountId',
           to: 'accounts.id',
@@ -76,7 +76,7 @@ export default class Item extends TenantModel {
 
       inventoryAccount: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Account.default),
+        modelClass: Account.default,
         join: {
           from: 'items.inventoryAccountId',
           to: 'accounts.id',
@@ -85,7 +85,7 @@ export default class Item extends TenantModel {
 
       media: {
         relation: Model.ManyToManyRelation,
-        modelClass: this.relationBindKnex(Media.default),
+        modelClass: Media.default,
         join: {
           from: 'items.id',
           through: {

server/src/models/ItemCategory.js

@@ -22,7 +22,7 @@ export default class ItemCategory extends TenantModel {
        */
       items: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(Item.default),
+        modelClass: Item.default,
         join: {
           from: 'items_categories.id',
           to: 'items.categoryId',

server/src/models/ItemEntry.js

@@ -38,7 +38,7 @@ export default class ItemEntry extends TenantModel {
     return {
       item: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Item.default),
+        modelClass: Item.default,
         join: {
           from: 'items_entries.itemId',
           to: 'items.id',

server/src/models/ManualJournal.js

@@ -27,7 +27,7 @@ export default class ManualJournal extends TenantModel {
     return {
       entries: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(AccountTransaction.default),
+        modelClass: AccountTransaction.default,
         join: {
           from: 'manual_journals.id',
           to: 'accounts_transactions.referenceId',
@@ -38,7 +38,7 @@ export default class ManualJournal extends TenantModel {
       },
       media: {
         relation: Model.ManyToManyRelation,
-        modelClass: this.relationBindKnex(Media.default),
+        modelClass: Media.default,
         join: {
           from: 'manual_journals.id',
           through: {

server/src/models/PaymentReceive.js

@@ -28,7 +28,7 @@ export default class PaymentReceive extends TenantModel {
     return {
       customer: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Customer.default),
+        modelClass: Customer.default,
         join: {
           from: 'payment_receives.customerId',
           to: 'customers.id',
@@ -37,7 +37,7 @@ export default class PaymentReceive extends TenantModel {
 
       depositAccount: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Account.default),
+        modelClass: Account.default,
         join: {
           from: 'payment_receives.depositAccountId',
           to: 'accounts.id',
@@ -46,7 +46,7 @@ export default class PaymentReceive extends TenantModel {
 
       entries: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(PaymentReceiveEntry.default),
+        modelClass: PaymentReceiveEntry.default,
         join: {
           from: 'payment_receives.id',
           to: 'payment_receives_entries.paymentReceiveId',
@@ -55,7 +55,7 @@ export default class PaymentReceive extends TenantModel {
 
       transactions: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(AccountTransaction.default),
+        modelClass: AccountTransaction.default,
         join: {
           from: 'payment_receives.id',
           to: 'accounts_transactions.referenceId'

server/src/models/PaymentReceiveEntry.js

@@ -28,7 +28,7 @@ export default class PaymentReceiveEntry extends TenantModel {
        */
       entries: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(PaymentReceive.default),
+        modelClass: PaymentReceive.default,
         join: {
           from: 'payment_receives_entries.payment_receive_id',
           to: 'payment_receives.id',
@@ -40,7 +40,7 @@ export default class PaymentReceiveEntry extends TenantModel {
        */
       invoice: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(SaleInvoice.default),
+        modelClass: SaleInvoice.default,
         join: {
           from: 'payment_receives_entries.invoiceId',
           to: 'sales_invoices.id',

server/src/models/SaleEstimate.js

@@ -26,7 +26,7 @@ export default class SaleEstimate extends TenantModel {
     return {
       customer: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Customer.default),
+        modelClass: Customer.default,
         join: {
           from: 'sales_estimates.customerId',
           to: 'customers.id',
@@ -35,7 +35,7 @@ export default class SaleEstimate extends TenantModel {
 
       entries: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(ItemEntry.default),
+        modelClass: ItemEntry.default,
         join: {
           from: 'sales_estimates.id',
           to: 'items_entries.referenceId',

server/src/models/SaleEstimateEntry.js

@@ -19,7 +19,7 @@ export default class SaleEstimateEntry extends TenantModel {
     return {
       estimate: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(SaleEstimate.default),
+        modelClass: SaleEstimate.default,
         join: {
           from: 'sales_estimates.id',
           to: 'sales_estimate_entries.estimate_id',

server/src/models/SaleInvoice.js

@@ -63,7 +63,7 @@ export default class SaleInvoice extends TenantModel {
     return {
       entries: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(ItemEntry.default),
+        modelClass: ItemEntry.default,
         join: {
           from: 'sales_invoices.id',
           to: 'items_entries.referenceId',
@@ -75,7 +75,7 @@ export default class SaleInvoice extends TenantModel {
 
       customer: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Customer.default),
+        modelClass: Customer.default,
         join: {
           from: 'sales_invoices.customerId',
           to: 'customers.id',
@@ -84,7 +84,7 @@ export default class SaleInvoice extends TenantModel {
 
       transactions: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(AccountTransaction.default),
+        modelClass: AccountTransaction.default,
         join: {
           from: 'sales_invoices.id',
           to: 'accounts_transactions.referenceId'
@@ -96,7 +96,7 @@ export default class SaleInvoice extends TenantModel {
 
       costTransactions: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(InventoryCostLotTracker.default),
+        modelClass: InventoryCostLotTracker.default,
         join: {
           from: 'sales_invoices.id',
           to: 'inventory_cost_lot_tracker.transactionId'

server/src/models/SaleInvoiceEntry.js

@@ -18,7 +18,7 @@ export default class SaleInvoiceEntry extends TenantModel {
     return {
       saleInvoice: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(SaleInvoice.default),
+        modelClass: SaleInvoice.default,
         join: {
           from: 'sales_invoices_entries.sale_invoice_id',
           to: 'sales_invoices.id',

server/src/models/SaleReceipt.js

@@ -28,7 +28,7 @@ export default class SaleReceipt extends TenantModel {
     return {
       customer: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Customer.default),
+        modelClass: Customer.default,
         join: {
           from: 'sales_receipts.customerId',
           to: 'customers.id',
@@ -37,7 +37,7 @@ export default class SaleReceipt extends TenantModel {
 
       depositAccount: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Account.default),
+        modelClass: Account.default,
         join: {
           from: 'sales_receipts.depositAccountId',
           to: 'accounts.id',
@@ -46,7 +46,7 @@ export default class SaleReceipt extends TenantModel {
 
       entries: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(ItemEntry.default),
+        modelClass: ItemEntry.default,
         join: {
           from: 'sales_receipts.id',
           to: 'items_entries.referenceId',
@@ -58,7 +58,7 @@ export default class SaleReceipt extends TenantModel {
 
       transactions: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(AccountTransaction.default),
+        modelClass: AccountTransaction.default,
         join: {
           from: 'sales_receipts.id',
           to: 'accounts_transactions.referenceId'

server/src/models/SaleReceiptEntry.js

@@ -18,7 +18,7 @@ export default class SaleReceiptEntry extends TenantModel {
     return {
       saleReceipt: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(SaleReceipt.default),
+        modelClass: SaleReceipt.default,
         join: {
           from: 'sales_receipt_entries.sale_receipt_id',
           to: 'sales_receipts.id',

server/src/models/View.js

@@ -49,7 +49,7 @@ export default class View extends TenantModel {
        */
       columns: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(ViewColumn.default),
+        modelClass: ViewColumn.default,
         join: {
           from: 'views.id',
           to: 'view_has_columns.viewId',
@@ -61,7 +61,7 @@ export default class View extends TenantModel {
        */
       roles: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(ViewRole.default),
+        modelClass: ViewRole.default,
         join: {
           from: 'views.id',
           to: 'view_roles.viewId',

server/src/models/ViewRole.js

@@ -35,7 +35,7 @@ export default class ViewRole extends TenantModel {
        */
       view: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(View.default),
+        modelClass: View.default,
         join: {
           from: 'view_roles.viewId',
           to: 'views.id',

server/src/system/models/Subscriptions/PlanSubscription.js

@@ -76,7 +76,7 @@ export default class PlanSubscription extends mixin(SystemModel) {
        */
       tenant: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Tenant.default),
+        modelClass: Tenant.default,
         join: {
           from: 'subscription_plan_subscriptions.tenantId',
           to: 'tenants.id'
@@ -88,7 +88,7 @@ export default class PlanSubscription extends mixin(SystemModel) {
        */
       plan: {
         relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(Plan.default),
+        modelClass: Plan.default,
         join: {
           from: 'subscription_plan_subscriptions.planId',
           to: 'subscription_plans.id',

server/src/system/models/Tenant.js

@@ -37,7 +37,7 @@ export default class Tenant extends BaseModel {
     return {
       subscriptions: {
         relation: Model.HasManyRelation,
-        modelClass: this.relationBindKnex(PlanSubscription.default),
+        modelClass: PlanSubscription.default,
         join: {
           from: 'tenants.id',
           to: 'subscription_plan_subscriptions.tenantId',