From 2cb9899de14a5a9d1a3520c993dffc428b1cc0e6 Mon Sep 17 00:00:00 2001 From: jorgep Date: Mon, 23 Sep 2024 15:38:54 +0200 Subject: [PATCH 01/15] feat: refs #7207 show queue --- src/pages/Worker/Card/WorkerSummary.vue | 1 + src/pages/Worker/locale/en.yml | 1 + src/pages/Worker/locale/es.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue index 8fee52dd3..ed34e771d 100644 --- a/src/pages/Worker/Card/WorkerSummary.vue +++ b/src/pages/Worker/Card/WorkerSummary.vue @@ -139,6 +139,7 @@ onBeforeMount(async () => { + diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml index 96df37919..96764ffd1 100644 --- a/src/pages/Worker/locale/en.yml +++ b/src/pages/Worker/locale/en.yml @@ -4,3 +4,4 @@ tableColumns: name: Name department: Department email: Email +queue: Queue diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml index 41812345f..cf6bc3afe 100644 --- a/src/pages/Worker/locale/es.yml +++ b/src/pages/Worker/locale/es.yml @@ -9,3 +9,4 @@ tableColumns: name: Nombre department: Departamento email: Email +queue: Cola From b54d358617b3cfcd1f2e6c47c05696820af6ade4 Mon Sep 17 00:00:00 2001 From: jorgep Date: Wed, 25 Sep 2024 09:14:35 +0200 Subject: [PATCH 02/15] fix: refs #7207 use right locale --- src/pages/InvoiceIn/InvoiceInFilter.vue | 2 +- src/pages/InvoiceIn/locale/es.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue index bf4e023a9..b19e047fa 100644 --- a/src/pages/InvoiceIn/InvoiceInFilter.vue +++ b/src/pages/InvoiceIn/InvoiceInFilter.vue @@ -170,7 +170,7 @@ es: awb: AWB amount: Importe issued: Emitida - isBooked: Conciliada + isBooked: Contabilizada account: Cuenta contable created: Creada dued: Vencida diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml index 944708364..2d3b137f4 100644 --- a/src/pages/InvoiceIn/locale/es.yml +++ b/src/pages/InvoiceIn/locale/es.yml @@ -7,7 +7,7 @@ invoiceIn: shortIssued: F. emisión file: Fichero issued: Fecha emisión - isBooked: Conciliada + isBooked: Contabilizada awb: AWB amount: Importe card: From 45b3ed6e17ce1c3d6b70fea9a62d29cbd516776e Mon Sep 17 00:00:00 2001 From: jorgep Date: Wed, 25 Sep 2024 09:53:06 +0200 Subject: [PATCH 03/15] fix: refs #7207 te2e --- test/cypress/integration/ticket/ticketDescriptor.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js index 8192b7c7c..cc3a1d65a 100644 --- a/test/cypress/integration/ticket/ticketDescriptor.spec.js +++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js @@ -1,7 +1,7 @@ /// describe('Ticket descriptor', () => { - const toCloneOpt = '[role="menu"] .q-list > :nth-child(5)'; - const setWeightOpt = '[role="menu"] .q-list > :nth-child(6)'; + const toCloneOpt = '[role="menu"] .q-list > :nth-child(8)'; + const setWeightOpt = '[role="menu"] .q-list > :nth-child(13)'; const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span'; const summaryHeader = '.summaryHeader > div'; const weight = 25; From c64fe8c044cbb0b01a41792da03f0d5d9829eb4b Mon Sep 17 00:00:00 2001 From: jorgep Date: Thu, 3 Oct 2024 17:04:56 +0200 Subject: [PATCH 04/15] chore: refs #7207 refactor locale --- src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 5 +---- src/pages/InvoiceIn/InvoiceInFilter.vue | 2 +- src/pages/InvoiceIn/InvoiceInList.vue | 2 +- src/pages/InvoiceIn/locale/en.yml | 3 +-- src/pages/InvoiceIn/locale/es.yml | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue index bf2e7db48..801a04342 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue @@ -274,10 +274,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`; :label="t('invoiceIn.summary.company')" :value="entity.company?.code" /> - + diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue index b19e047fa..d1c0856b5 100644 --- a/src/pages/InvoiceIn/InvoiceInFilter.vue +++ b/src/pages/InvoiceIn/InvoiceInFilter.vue @@ -116,7 +116,7 @@ const activities = ref([]); [ { align: 'left', name: 'isBooked', - label: t('invoiceIn.list.isBooked'), + label: t('invoiceIn.isBooked'), columnFilter: false, }, { diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml index 824fd6e12..b09340c81 100644 --- a/src/pages/InvoiceIn/locale/en.yml +++ b/src/pages/InvoiceIn/locale/en.yml @@ -1,5 +1,6 @@ invoiceIn: serial: Serial + isBooked: Is booked list: ref: Reference supplier: Supplier @@ -7,7 +8,6 @@ invoiceIn: serial: Serial file: File issued: Issued - isBooked: Is booked awb: AWB amount: Amount card: @@ -31,7 +31,6 @@ invoiceIn: sage: Sage withholding vat: Undeductible VAT company: Company - booked: Booked expense: Expense taxableBase: Taxable base rate: Rate diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml index 2d3b137f4..31d41fc97 100644 --- a/src/pages/InvoiceIn/locale/es.yml +++ b/src/pages/InvoiceIn/locale/es.yml @@ -1,5 +1,6 @@ invoiceIn: serial: Serie + isBooked: Contabilizada list: ref: Referencia supplier: Proveedor @@ -7,7 +8,6 @@ invoiceIn: shortIssued: F. emisión file: Fichero issued: Fecha emisión - isBooked: Contabilizada awb: AWB amount: Importe card: @@ -31,7 +31,6 @@ invoiceIn: sage: Retención sage vat: Iva no deducible company: Empresa - booked: Contabilizada expense: Gasto taxableBase: Base imp. rate: Tasa From 34a40dd87c9c24d71f90e94d892678fca5fe4259 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 7 Oct 2024 08:24:53 +0200 Subject: [PATCH 05/15] fix(VnPaginate): use default value --- src/components/ui/VnPaginate.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue index c6f57b479..80c607214 100644 --- a/src/components/ui/VnPaginate.vue +++ b/src/components/ui/VnPaginate.vue @@ -56,7 +56,7 @@ const props = defineProps({ }, offset: { type: Number, - default: 0, + default: undefined, }, skeleton: { type: Boolean, From 5d65d3e20cfbe5f96e42978a17f9b9e7d4df2883 Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 7 Oct 2024 09:48:57 +0200 Subject: [PATCH 06/15] refs #6898 hotfix agency --- src/pages/Supplier/Card/SupplierAgencyTermCreate.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue index a87ea502b..515d157e5 100644 --- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue +++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue @@ -15,12 +15,12 @@ const route = useRoute(); const agenciesOptions = ref(null); const newAgencyTermForm = reactive({ agencyFk: null, - minimumM3: null, - packagePrice: null, - kmPrice: null, - m3Price: null, - routePrice: null, - minimumKm: null, + minimumM3: 0, + packagePrice: 0, + kmPrice: 0, + m3Price: 0, + routePrice: 0, + minimumKm: 0, supplierFk: route.params.id, }); From e396cd0cac48bf8bf5761d575758489e69a93102 Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 7 Oct 2024 12:16:32 +0200 Subject: [PATCH 07/15] hotfix: routePrice null --- src/pages/Supplier/Card/SupplierAgencyTermCreate.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue index 515d157e5..038eaa356 100644 --- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue +++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue @@ -19,7 +19,7 @@ const newAgencyTermForm = reactive({ packagePrice: 0, kmPrice: 0, m3Price: 0, - routePrice: 0, + routePrice: null, minimumKm: 0, supplierFk: route.params.id, }); From 0ed9fdd55da1c3939848129bc0c7b72daa3660b8 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Mon, 7 Oct 2024 13:02:40 +0200 Subject: [PATCH 08/15] fix: refs VnImg zoom resolution missing property --- src/components/ui/CatalogItem.vue | 2 +- src/pages/Item/ItemList.vue | 3 +-- src/pages/Order/Card/OrderLines.vue | 6 +++++- src/pages/Ticket/Card/TicketSale.vue | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue index 545bfbbb4..7dca19770 100644 --- a/src/components/ui/CatalogItem.vue +++ b/src/components/ui/CatalogItem.vue @@ -31,7 +31,7 @@ const dialog = ref(null);
- +
(stateStore.rightDrawer = false)); diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue index 17a157797..0223aa9c6 100644 --- a/src/pages/Order/Card/OrderLines.vue +++ b/src/pages/Order/Card/OrderLines.vue @@ -278,7 +278,11 @@ watch( >