diff --git a/src/components/11_credit-note/FormCredit.vue b/src/components/11_credit-note/FormCredit.vue
index d08c96dc..f104e91c 100644
--- a/src/components/11_credit-note/FormCredit.vue
+++ b/src/components/11_credit-note/FormCredit.vue
@@ -29,6 +29,7 @@ const quotationId = defineModel<string>('quotationId', {
     <section class="col-12 row q-col-gutter-sm">
       <SelectQuotation
         for="select-quotation"
+        required
         class="col"
         v-model:value="quotationId"
         :label="$t('general.select', { msg: $t('quotation.title') })"
diff --git a/src/components/12_debit-note/FormDebit.vue b/src/components/12_debit-note/FormDebit.vue
index 60bf596f..5303e666 100644
--- a/src/components/12_debit-note/FormDebit.vue
+++ b/src/components/12_debit-note/FormDebit.vue
@@ -29,6 +29,7 @@ const quotationId = defineModel<string>('quotationId', {
     <section class="col-12 row q-col-gutter-sm">
       <SelectQuotation
         for="select-quotation"
+        required
         class="col"
         v-model:value="quotationId"
         :label="$t('general.select', { msg: $t('quotation.title') })"
diff --git a/src/pages/11_credit-note/FormPage.vue b/src/pages/11_credit-note/FormPage.vue
index 3f1fe17c..14f40fcc 100644
--- a/src/pages/11_credit-note/FormPage.vue
+++ b/src/pages/11_credit-note/FormPage.vue
@@ -807,6 +807,7 @@ onMounted(async () => {
         <!-- @click="submit" -->
         <SaveButton
           v-if="!readonly"
+          :disabled="taskListGroup.length === 0"
           type="submit"
           @click.stop="(e) => refForm?.submit(e)"
           :label="$t('creditNote.label.submit')"
diff --git a/src/pages/11_credit-note/expansion/CreditNoteExpansion.vue b/src/pages/11_credit-note/expansion/CreditNoteExpansion.vue
index 0dca2631..201cce13 100644
--- a/src/pages/11_credit-note/expansion/CreditNoteExpansion.vue
+++ b/src/pages/11_credit-note/expansion/CreditNoteExpansion.vue
@@ -44,8 +44,8 @@ const detail = defineModel<string>('detail');
         outlined
         dense
         class="col"
-        v-model="detail"
-        :rules="[(val: string) => !!val || $t('form.error.required')]"
+        :model-value="readonly ? detail || '-' : detail"
+        @update:model-value="(v) => (detail = v?.toString())"
       ></q-input>
     </main>
   </q-expansion-item>
diff --git a/src/pages/12_debit-note/FormPage.vue b/src/pages/12_debit-note/FormPage.vue
index 946d6a91..e707379f 100644
--- a/src/pages/12_debit-note/FormPage.vue
+++ b/src/pages/12_debit-note/FormPage.vue
@@ -987,7 +987,6 @@ onMounted(async () => {
           />
 
           <!-- #TODO add  openProductDialog at @add-product-->
-
           <ProductExpansion
             v-if="view === null"
             :readonly
@@ -1179,6 +1178,9 @@ onMounted(async () => {
 
           <SaveButton
             v-if="!readonly && pageState.mode === 'create'"
+            :disabled="
+              selectedWorkerItem.length === 0 && productService.length === 0
+            "
             @click="submit"
             :label="true ? $t('debitNote.label.submit') : $t('general.save')"
             :icon="