Merge remote-tracking branch 'origin/master' into frontend-performance-improvements

resources/scripts/admin/views/estimates/create/EstimateCreate.vue

@@ -250,6 +250,14 @@ customFieldStore.resetCustomFields()
 v$.value.$reset
 estimateStore.fetchEstimateInitialSettings(isEdit.value)
 
+watch(
+  () => companyStore.selectedCompanySettings?.tax_included_by_default,
+  (newVal) => {
+    estimateStore.newEstimate.tax_included = newVal === 'YES'
+  },
+  {immediate: true}
+)
+
 async function submitForm() {
   v$.value.$touch()