From 252d9e3a5069664860bc8d9c5ae61cc6bb2f87aa Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 12 Mar 2024 10:22:40 +0100
Subject: [PATCH] fix: refs #6942 table bottom highlight & drop isBooked field

---
 src/i18n/es/index.js                                    | 2 +-
 src/pages/InvoiceIn/Card/InvoiceInBasicData.vue         | 6 ------
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue            | 6 +++++-
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue           | 9 +++++++--
 src/pages/InvoiceIn/Card/InvoiceInVat.vue               | 8 ++++++--
 test/cypress/integration/invoiceIn/invoiceInVat.spec.js | 4 ++--
 6 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 69d5a64a3..08d904ccd 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -795,7 +795,7 @@ export default {
             expense: 'Gasto',
             taxableBase: 'Base imp.',
             rate: 'Tasa',
-            sageTransaction: 'Sage transación',
+            sageTransaction: 'Sage transacción',
             dueDay: 'Fecha',
             bank: 'Caja',
             amount: 'Importe',
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 4e87c2acd..9adf723b9 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -316,12 +316,6 @@ async function upsert() {
                     option-value="id"
                     option-label="withholding"
                 />
-                <span>
-                    <QCheckbox
-                        :label="t('invoiceIn.summary.booked')"
-                        v-model="data.isBooked"
-                    />
-                </span>
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index d6f7c18ec..1b712aec8 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -308,7 +308,11 @@ const getTotalAmount = (rows) => rows.reduce((acc, cur) => acc + cur.amount, 0);
         <QBtn color="primary" icon="add" size="lg" round @click="insert" />
     </QPageSticky>
 </template>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.bg {
+    background-color: var(--vn-light-gray);
+}
+</style>
 <i18n>
     es:
         Date: Fecha
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 083822dc3..cedba4e33 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -54,7 +54,9 @@ const vatColumns = ref([
     {
         name: 'vat',
         label: 'invoiceIn.summary.sageVat',
-        field: (row) => row.taxTypeSage?.vat,
+        field: (row) => {
+            if (row.taxTypeSage) return `${row.taxTypeSage.id}:${row.taxTypeSage.vat}`;
+        },
         format: (value) => value,
         sortable: true,
         align: 'left',
@@ -62,7 +64,10 @@ const vatColumns = ref([
     {
         name: 'transaction',
         label: 'invoiceIn.summary.sageTransaction',
-        field: (row) => row.transactionTypeSage?.transaction,
+        field: (row) => {
+            if (row.transactionTypeSage)
+                return `${row.transactionTypeSage.id}:${row.transactionTypeSage?.transaction}`;
+        },
         format: (value) => value,
         sortable: true,
         align: 'left',
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 298e47727..5ab022b36 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -62,7 +62,7 @@ const columns = computed(() => [
         options: sageTaxTypes.value,
         model: 'taxTypeSageFk',
         optionValue: 'id',
-        optionLabel: 'vat',
+        optionLabel: 'id',
         sortable: true,
         tabindex: 3,
         align: 'left',
@@ -74,7 +74,7 @@ const columns = computed(() => [
         options: sageTransactionTypes.value,
         model: 'transactionTypeSageFk',
         optionValue: 'id',
-        optionLabel: 'transaction',
+        optionLabel: 'id',
         sortable: true,
         tabIndex: 4,
         align: 'left',
@@ -471,6 +471,10 @@ const getTotalRate = (rows) => rows.reduce((acc, cur) => acc + taxRate(cur), 0);
     </QPageSticky>
 </template>
 <style lang="scss" scoped>
+.bg {
+    background-color: var(--vn-light-gray);
+}
+
 @media (max-width: $breakpoint-xs) {
     .q-dialog {
         .q-card {
diff --git a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
index 811374b98..4183a283f 100644
--- a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
@@ -16,12 +16,12 @@ describe('InvoiceInVat', () => {
     it('should edit the first line', () => {
         cy.get(inputBtns).eq(1).click();
         cy.get(inputs).eq(2).type(23);
-        cy.selectOption(firstLineVat, 'H.P. IVA 21% CEE');
+        cy.selectOption(firstLineVat, '8');
 
         cy.saveCard();
         cy.visit(`/#/invoice-in/1/vat`);
 
-        cy.getValue(firstLineVat).should('equal', 'H.P. IVA 21% CEE');
+        cy.getValue(firstLineVat).should('equal', '8');
     });
 
     it('should add a new row', () => {