diff --git a/public/main.profile.dart.js b/public/main.profile.dart.js
index c3aa1eff0569..2ed9a58ac46e 100644
--- a/public/main.profile.dart.js
+++ b/public/main.profile.dart.js
@@ -84344,7 +84344,7 @@
     BaseRequest_closure0: function BaseRequest_closure0() {
     },
     SettingsEntity_SettingsEntity: function(clientSettings, companySettings, groupSettings) {
-      var t3, t4, t5, t6, t7, t8, t9, t10, t11, _null = null,
+      var t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, _null = null,
         t1 = clientSettings == null,
         t2 = t1 ? _null : clientSettings.defaultInvoiceDesignId;
       if (t2 == null)
@@ -84371,37 +84371,57 @@
         t6 = groupSettings == null ? _null : groupSettings.defaultInvoiceFooter;
       if (t6 == null)
         t6 = companySettings == null ? _null : companySettings.defaultInvoiceFooter;
-      t7 = t1 ? _null : clientSettings.lockInvoices;
+      t7 = t1 ? _null : clientSettings.defaultQuoteTerms;
       if (t7 == null)
-        t7 = groupSettings == null ? _null : groupSettings.lockInvoices;
+        t7 = groupSettings == null ? _null : groupSettings.defaultQuoteTerms;
       if (t7 == null)
-        t7 = companySettings == null ? _null : companySettings.lockInvoices;
-      t8 = t1 ? _null : clientSettings.emailSubjectCustom1;
+        t7 = companySettings == null ? _null : companySettings.defaultQuoteTerms;
+      t8 = t1 ? _null : clientSettings.defaultQuoteFooter;
       if (t8 == null)
-        t8 = groupSettings == null ? _null : groupSettings.emailSubjectCustom1;
+        t8 = groupSettings == null ? _null : groupSettings.defaultQuoteFooter;
       if (t8 == null)
-        t8 = companySettings == null ? _null : companySettings.emailSubjectCustom1;
-      t9 = t1 ? _null : clientSettings.emailSubjectCustom2;
+        t8 = companySettings == null ? _null : companySettings.defaultQuoteFooter;
+      t9 = t1 ? _null : clientSettings.defaultCreditTerms;
       if (t9 == null)
-        t9 = groupSettings == null ? _null : groupSettings.emailSubjectCustom2;
+        t9 = groupSettings == null ? _null : groupSettings.defaultCreditTerms;
       if (t9 == null)
-        t9 = companySettings == null ? _null : companySettings.emailSubjectCustom2;
-      t10 = t1 ? _null : clientSettings.emailSubjectCustom3;
+        t9 = companySettings == null ? _null : companySettings.defaultCreditTerms;
+      t10 = t1 ? _null : clientSettings.defaultCreditFooter;
       if (t10 == null)
-        t10 = groupSettings == null ? _null : groupSettings.emailSubjectCustom3;
+        t10 = groupSettings == null ? _null : groupSettings.defaultCreditFooter;
       if (t10 == null)
-        t10 = companySettings == null ? _null : companySettings.emailSubjectCustom3;
-      t11 = t1 ? _null : clientSettings.defaultPaymentTerms;
+        t10 = companySettings == null ? _null : companySettings.defaultCreditFooter;
+      t11 = t1 ? _null : clientSettings.lockInvoices;
       if (t11 == null)
-        t11 = groupSettings == null ? _null : groupSettings.defaultPaymentTerms;
+        t11 = groupSettings == null ? _null : groupSettings.lockInvoices;
       if (t11 == null)
-        t11 = companySettings == null ? _null : companySettings.defaultPaymentTerms;
+        t11 = companySettings == null ? _null : companySettings.lockInvoices;
+      t12 = t1 ? _null : clientSettings.emailSubjectCustom1;
+      if (t12 == null)
+        t12 = groupSettings == null ? _null : groupSettings.emailSubjectCustom1;
+      if (t12 == null)
+        t12 = companySettings == null ? _null : companySettings.emailSubjectCustom1;
+      t13 = t1 ? _null : clientSettings.emailSubjectCustom2;
+      if (t13 == null)
+        t13 = groupSettings == null ? _null : groupSettings.emailSubjectCustom2;
+      if (t13 == null)
+        t13 = companySettings == null ? _null : companySettings.emailSubjectCustom2;
+      t14 = t1 ? _null : clientSettings.emailSubjectCustom3;
+      if (t14 == null)
+        t14 = groupSettings == null ? _null : groupSettings.emailSubjectCustom3;
+      if (t14 == null)
+        t14 = companySettings == null ? _null : companySettings.emailSubjectCustom3;
+      t15 = t1 ? _null : clientSettings.defaultPaymentTerms;
+      if (t15 == null)
+        t15 = groupSettings == null ? _null : groupSettings.defaultPaymentTerms;
+      if (t15 == null)
+        t15 = companySettings == null ? _null : companySettings.defaultPaymentTerms;
       t1 = t1 ? _null : clientSettings.defaultValidUntil;
       if (t1 == null)
         t1 = groupSettings == null ? _null : groupSettings.defaultValidUntil;
       if (t1 == null)
         t1 = companySettings == null ? _null : companySettings.defaultValidUntil;
-      return G._$SettingsEntity$_(_null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, t4, _null, _null, t2, t6, t5, t11, _null, t3, _null, _null, _null, _null, _null, _null, _null, _null, _null, t1, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, t8, t9, t10, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, t7, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null);
+      return G._$SettingsEntity$_(_null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, t4, t10, t9, t2, t6, t5, t15, _null, t3, t8, t7, _null, _null, _null, _null, _null, _null, _null, t1, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, t12, t13, t14, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, t11, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null);
     },
     _$SettingsEntity$_: function(address1, address2, allPagesFooter, allPagesHeader, autoArchiveInvoice, autoArchiveQuote, autoBill, autoBillDate, autoConvertQuote, autoEmailInvoice, bccEmail, city, clientManualPaymentNotification, clientNumberCounter, clientNumberPattern, clientOnlinePaymentNotification, clientPortalAllowOverPayment, clientPortalAllowUnderPayment, clientPortalCustomCss, clientPortalCustomFooter, clientPortalCustomHeader, clientPortalCustomJs, clientPortalPrivacy, clientPortalTasks, clientPortalTerms, clientPortalUnderPaymentMinimum, companyGatewayIds, companyLogo, counterNumberApplied, counterPadding, countryId, creditNumberCounter, creditNumberPattern, currencyId, customMessageDashboard, customMessagePaidInvoice, customMessageUnapprovedQuote, customMessageUnpaidInvoice, customValue1, customValue2, customValue3, customValue4, dateFormatId, defaultCreditDesignId, defaultCreditFooter, defaultCreditTerms, defaultInvoiceDesignId, defaultInvoiceFooter, defaultInvoiceTerms, defaultPaymentTerms, defaultPaymentTypeId, defaultQuoteDesignId, defaultQuoteFooter, defaultQuoteTerms, defaultTaskRate, defaultTaxName1, defaultTaxName2, defaultTaxName3, defaultTaxRate1, defaultTaxRate2, defaultTaxRate3, defaultValidUntil, documentEmailAttachment, email, emailBodyCredit, emailBodyCustom1, emailBodyCustom2, emailBodyCustom3, emailBodyInvoice, emailBodyPayment, emailBodyPaymentPartial, emailBodyQuote, emailBodyReminder1, emailBodyReminder2, emailBodyReminder3, emailBodyReminderEndless, emailBodyStatement, emailFromName, emailSendingMethod, emailSignature, emailStyle, emailStyleCustom, emailSubjectCredit, emailSubjectCustom1, emailSubjectCustom2, emailSubjectCustom3, emailSubjectInvoice, emailSubjectPayment, emailSubjectPaymentPartial, emailSubjectQuote, emailSubjectReminder1, emailSubjectReminder2, emailSubjectReminder3, emailSubjectReminderEndless, emailSubjectStatement, embedDocuments, enableEmailMarkup, enableInclusiveTaxes, enableMilitaryTime, enablePortal, enablePortalDashboard, enablePortalPassword, enablePortalTasks, enablePortalUploads, enableReminder1, enableReminder2, enableReminder3, enableReminderEndless, endlessReminderFrequencyId, entitySendTime, expenseNumberCounter, expenseNumberPattern, fontSize, gmailSendingUserId, hideEmptyColumnsOnPdf, hidePaidToDate, idNumber, invoiceNumberCounter, invoiceNumberPattern, languageId, lateFeeAmount1, lateFeeAmount2, lateFeeAmount3, lateFeeAmountEndless, lateFeePercent1, lateFeePercent2, lateFeePercent3, lateFeePercentEndless, lockInvoices, $name, numDaysReminder1, numDaysReminder2, numDaysReminder3, pageLayout, pageSize, paymentNumberCounter, paymentNumberPattern, pdfEmailAttachment, pdfVariables, phone, postalCode, primaryColor, primaryFont, projectNumberCounter, projectNumberPattern, quoteNumberCounter, quoteNumberPattern, recurringExpenseNumberCounter, recurringExpenseNumberPattern, recurringInvoiceNumberCounter, recurringInvoiceNumberPattern, recurringNumberPrefix, replyToEmail, replyToName, requireInvoiceSignature, requireQuoteSignature, resetCounterDate, resetCounterFrequencyId, scheduleReminder1, scheduleReminder2, scheduleReminder3, secondaryColor, secondaryFont, sendReminders, sharedInvoiceCreditCounter, sharedInvoiceQuoteCounter, showAcceptInvoiceTerms, showAcceptQuoteTerms, showCurrencyCode, signatureOnPdf, state, taskNumberCounter, taskNumberPattern, ticketNumberCounter, ticketNumberPattern, timezoneId, translations, ublEmailAttachment, useCreditsPayment, vatNumber, vendorNumberCounter, vendorNumberPattern, website) {
       return new G._$SettingsEntity(timezoneId, dateFormatId, enableMilitaryTime, languageId, showCurrencyCode, currencyId, customValue1, customValue2, customValue3, customValue4, defaultPaymentTerms, defaultValidUntil, companyGatewayIds, defaultTaskRate, sendReminders, enablePortal, enablePortalDashboard, enablePortalTasks, enablePortalUploads, emailStyle, replyToEmail, replyToName, emailFromName, bccEmail, pdfEmailAttachment, ublEmailAttachment, documentEmailAttachment, emailStyleCustom, customMessageDashboard, customMessageUnpaidInvoice, customMessagePaidInvoice, customMessageUnapprovedQuote, autoArchiveInvoice, autoArchiveQuote, autoEmailInvoice, autoConvertQuote, enableInclusiveTaxes, translations, taskNumberPattern, taskNumberCounter, expenseNumberPattern, expenseNumberCounter, recurringExpenseNumberPattern, recurringExpenseNumberCounter, vendorNumberPattern, vendorNumberCounter, ticketNumberPattern, ticketNumberCounter, paymentNumberPattern, paymentNumberCounter, projectNumberPattern, projectNumberCounter, invoiceNumberPattern, invoiceNumberCounter, recurringInvoiceNumberPattern, recurringInvoiceNumberCounter, quoteNumberPattern, quoteNumberCounter, clientNumberPattern, clientNumberCounter, creditNumberPattern, creditNumberCounter, recurringNumberPrefix, resetCounterFrequencyId, resetCounterDate, counterPadding, sharedInvoiceQuoteCounter, sharedInvoiceCreditCounter, defaultInvoiceTerms, defaultQuoteTerms, defaultQuoteFooter, defaultCreditTerms, defaultCreditFooter, defaultInvoiceDesignId, defaultQuoteDesignId, defaultCreditDesignId, defaultInvoiceFooter, defaultTaxName1, defaultTaxRate1, defaultTaxName2, defaultTaxRate2, defaultTaxName3, defaultTaxRate3, defaultPaymentTypeId, pdfVariables, emailSignature, emailSubjectInvoice, emailSubjectQuote, emailSubjectCredit, emailSubjectPayment, emailSubjectPaymentPartial, emailBodyInvoice, emailBodyQuote, emailBodyCredit, emailBodyPayment, emailBodyPaymentPartial, emailSubjectReminder1, emailSubjectReminder2, emailSubjectReminder3, emailBodyReminder1, emailBodyReminder2, emailBodyReminder3, emailSubjectCustom1, emailBodyCustom1, emailSubjectCustom2, emailBodyCustom2, emailSubjectCustom3, emailBodyCustom3, emailSubjectStatement, emailBodyStatement, enablePortalPassword, signatureOnPdf, enableEmailMarkup, showAcceptInvoiceTerms, showAcceptQuoteTerms, requireInvoiceSignature, requireQuoteSignature, $name, companyLogo, website, address1, address2, city, state, postalCode, phone, email, countryId, vatNumber, idNumber, pageSize, pageLayout, fontSize, primaryColor, secondaryColor, primaryFont, secondaryFont, hidePaidToDate, embedDocuments, allPagesHeader, allPagesFooter, enableReminder1, enableReminder2, enableReminder3, enableReminderEndless, numDaysReminder1, numDaysReminder2, numDaysReminder3, scheduleReminder1, scheduleReminder2, scheduleReminder3, endlessReminderFrequencyId, lateFeeAmount1, lateFeeAmount2, lateFeeAmount3, lateFeeAmountEndless, lateFeePercent1, lateFeePercent2, lateFeePercent3, lateFeePercentEndless, emailSubjectReminderEndless, emailBodyReminderEndless, clientOnlinePaymentNotification, clientManualPaymentNotification, counterNumberApplied, emailSendingMethod, gmailSendingUserId, clientPortalTerms, clientPortalPrivacy, lockInvoices, autoBill, clientPortalAllowUnderPayment, clientPortalAllowOverPayment, autoBillDate, clientPortalUnderPaymentMinimum, useCreditsPayment, clientPortalCustomHeader, clientPortalCustomCss, clientPortalCustomFooter, clientPortalCustomJs, hideEmptyColumnsOnPdf, entitySendTime, clientPortalTasks);
@@ -359811,7 +359831,7 @@
       _this._widget.toString;
       t4 = _this._variables$_controller;
       t5 = type$.JSArray_legacy_String;
-      t6 = H.setRuntimeTypeInfo(["view_button", "view_url", "created_by_user", "assigned_to_user"], t5);
+      t6 = H.setRuntimeTypeInfo(["view_button", "view_url", "payment_button", "payment_url", "created_by_user", "assigned_to_user"], t5);
       if (_this._widget.showInvoiceAsQuote)
         C.JSArray_methods.addAll$1(t6, H.setRuntimeTypeInfo(["amount", "discount", "date", "valid_until", "po_number", "public_notes", "exchange_rate", "number", "terms", "footer"], t5));
       else