public/appupdate.js

@@ -188,7 +188,10 @@ const parseMacInstallerProgress = (output) => {
     } else if (line.startsWith('installer:%')) {
       const value = Number.parseFloat(line.slice('installer:%'.length))
       if (Number.isFinite(value)) {
-        percent = Math.min(100, Math.round(value <= 1 ? value * 100 : value))
+        percent = Math.min(
+          100,
+          Math.round(value <= 1 ? value * 100 : value)
+        )
       }
     } else if (
       line.startsWith('installer: ') &&
@@ -256,7 +259,8 @@ const launchMacInstaller = (app, installerPath, webContents) => {
   sendProgress(webContents, {
     phase: 'installing',
     percent: 0,
-    message: 'Enter your Mac password when prompted.'
+    message:
+      'Installing update. Enter your Mac password when prompted, then Farm Control will restart automatically.'
   })
 
   app.focus({ steal: true })

src/components/Dashboard/Finance/Invoices/NewInvoice.jsx

@@ -34,8 +34,6 @@ const NewInvoice = ({ onOk, reset, defaultValues }) => {
                   order: true,
                   to: true,
                   from: true,
-                  toType: true,
-                  fromType: true,
                   issuedAt: true,
                   dueAt: true
                 }}
@@ -66,9 +64,7 @@ const NewInvoice = ({ onOk, reset, defaultValues }) => {
                   sentAt: false,
                   paidAt: false,
                   cancelledAt: false,
-                  overdueAt: false,
+                  overdueAt: false
-                  acknowledgedAt: false,
-                  postedAt: false
                 }}
                 isEditing={false}
                 objectData={objectData}

src/database/models/Invoice.js

@@ -233,21 +233,23 @@ export const Invoice = {
       columnWidth: 175
     },
     {
-      name: 'fromType',
+      name: 'from',
-      label: 'From Type',
+      label: 'From',
-      type: 'objectType',
+      required: true,
+      type: 'object',
+      objectType: 'vendor',
+      showHyperlink: true,
+      readOnly: true,
+      columnWidth: 200,
       value: (objectData) => {
-        return objectData?.orderType == 'purchaseOrder'
+        if (objectData?.orderType == 'purchaseOrder') {
-          ? 'vendor'
+          return objectData?.order?.vendor
-          : objectData?.fromType
+        } else {
-      },
+          return null
-      masterFilter: ['client', 'vendor'],
+        }
-      readOnly: (objectData) => {
+      }
-        return objectData?.orderType == 'purchaseOrder' ? true : false
-      },
-      columnWidth: 150,
-      required: true
     },
+
     {
       name: 'acknowledgedAt',
       label: 'Acknowledged At',
@@ -255,74 +257,31 @@ export const Invoice = {
       readOnly: true,
       columnWidth: 175
     },
-    {
-      name: 'from',
-      label: 'From',
-      required: true,
-      type: 'object',
-      objectType: (objectData) => {
-        return objectData?.fromType
-      },
-      showHyperlink: true,
-      readOnly: (objectData) => {
-        return objectData?.orderType == 'purchaseOrder' ? true : false
-      },
-      columnWidth: 200,
-      value: (objectData) => {
-        if (objectData?.orderType == 'purchaseOrder') {
-          return objectData?.order?.vendor
-        } else {
-          return objectData?.from
-        }
-      }
-    },
-
-    {
-      name: 'cancelledAt',
-      label: 'Cancelled At',
-      type: 'dateTime',
-      readOnly: true,
-      columnWidth: 175
-    },
-
-    {
-      name: 'toType',
-      label: 'To Type',
-      type: 'objectType',
-      masterFilter: ['vendor', 'client'],
-      value: (objectData) => {
-        return objectData?.orderType == 'salesOrder'
-          ? 'client'
-          : objectData?.toType
-      },
-      readOnly: (objectData) => {
-        return objectData?.orderType == 'salesOrder' ? true : false
-      },
-      columnWidth: 150,
-      required: true
-    },
 
     {
       name: 'to',
       label: 'To',
       required: true,
       type: 'object',
-      objectType: (objectData) => {
+      objectType: 'client',
-        return objectData?.toType
-      },
       showHyperlink: true,
-      readOnly: (objectData) => {
+      readOnly: true,
-        return objectData?.orderType == 'salesOrder' ? true : false
-      },
       columnWidth: 200,
       value: (objectData) => {
         if (objectData?.orderType == 'salesOrder') {
-          return objectData?.order?.client
-        } else {
           return objectData?.to
+        } else {
+          return null
         }
       }
     },
+    {
+      name: 'cancelledAt',
+      label: 'Cancelled At',
+      type: 'dateTime',
+      readOnly: true,
+      columnWidth: 175
+    },
 
     {
       name: 'totalTaxAmount',
@@ -444,7 +403,9 @@ export const Invoice = {
                 ) || 0
               )
             } else if (objectData?.taxRate?.rateType == 'amount') {
-              return (invoiceAmount + objectData?.taxRate?.rate).toFixed(2) || 0
+              return (
+                (invoiceAmount + objectData?.taxRate?.rate).toFixed(2) || 0
+              )
             }
             return invoiceAmount
           }
@@ -551,7 +512,9 @@ export const Invoice = {
                 ) || 0
               )
             } else if (objectData?.taxRate?.rateType == 'amount') {
-              return (invoiceAmount + objectData?.taxRate?.rate).toFixed(2) || 0
+              return (
+                (invoiceAmount + objectData?.taxRate?.rate).toFixed(2) || 0
+              )
             }
             return invoiceAmount
           }