From 4b3df372cdeb7dc66bc66db7277858b935a762ca Mon Sep 17 00:00:00 2001 From: jcasado Date: Thu, 25 Apr 2024 08:49:40 +0200 Subject: [PATCH] refs: #6764 fixConflicts --- src/components/ItemsFilterPanel.vue | 359 ++++++++++++++ src/components/common/VnCard.vue | 78 +++ src/pages/Claim/locale/es.yml | 2 + src/pages/InvoiceIn/locale/es.yml | 2 + src/pages/InvoiceOut/locale/es.yml | 2 + src/pages/Item/ItemFixedPrice.vue | 605 ++++++++++++++++++++++++ src/pages/Item/ItemFixedPriceFilter.vue | 108 +++++ src/pages/Supplier/locale/es.yml | 1 + src/pages/Ticket/locale/es.yml | 2 + src/pages/Worker/locale/es.yml | 2 + 10 files changed, 1161 insertions(+) create mode 100644 src/components/ItemsFilterPanel.vue create mode 100644 src/components/common/VnCard.vue create mode 100644 src/pages/Claim/locale/es.yml create mode 100644 src/pages/InvoiceIn/locale/es.yml create mode 100644 src/pages/InvoiceOut/locale/es.yml create mode 100644 src/pages/Item/ItemFixedPrice.vue create mode 100644 src/pages/Item/ItemFixedPriceFilter.vue create mode 100644 src/pages/Supplier/locale/es.yml create mode 100644 src/pages/Ticket/locale/es.yml create mode 100644 src/pages/Worker/locale/es.yml diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue new file mode 100644 index 000000000..f7f07a5b0 --- /dev/null +++ b/src/components/ItemsFilterPanel.vue @@ -0,0 +1,359 @@ + + + + + + + +en: + params: + supplier: Supplier + from: From + to: To + active: Is active + visible: Is visible + floramondo: Is floramondo + salesPersonFk: Buyer + categoryFk: Category + +es: + params: + supplier: Proveedor + from: Desde + to: Hasta + active: Activo + visible: Visible + floramondo: Floramondo + salesPersonFk: Comprador + categoryFk: Categoría + diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue new file mode 100644 index 000000000..6d0badffb --- /dev/null +++ b/src/components/common/VnCard.vue @@ -0,0 +1,78 @@ + + diff --git a/src/pages/Claim/locale/es.yml b/src/pages/Claim/locale/es.yml new file mode 100644 index 000000000..710d3485d --- /dev/null +++ b/src/pages/Claim/locale/es.yml @@ -0,0 +1,2 @@ +Search claim: Buscar reclamación +You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml new file mode 100644 index 000000000..d7e38d7fa --- /dev/null +++ b/src/pages/InvoiceIn/locale/es.yml @@ -0,0 +1,2 @@ +Search invoice: Buscar factura recibida +You can search by invoice reference: Puedes buscar por referencia de la factura diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml new file mode 100644 index 000000000..b936c7b7e --- /dev/null +++ b/src/pages/InvoiceOut/locale/es.yml @@ -0,0 +1,2 @@ +Search invoice: Buscar factura emitida +You can search by invoice reference: Puedes buscar por referencia de la factura diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue new file mode 100644 index 000000000..0dd7ca07d --- /dev/null +++ b/src/pages/Item/ItemFixedPrice.vue @@ -0,0 +1,605 @@ + + + + + +es: + Add fixed price: Añadir precio fijado + Edit fixed price(s): Editar precio(s) fijado(s) + This row will be removed: Esta linea se eliminará + Are you sure you want to continue?: ¿Seguro que quieres continuar? + Delete: Eliminar + diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue new file mode 100644 index 000000000..cd86b5f71 --- /dev/null +++ b/src/pages/Item/ItemFixedPriceFilter.vue @@ -0,0 +1,108 @@ + + + diff --git a/src/pages/Supplier/locale/es.yml b/src/pages/Supplier/locale/es.yml new file mode 100644 index 000000000..e7e484f6a --- /dev/null +++ b/src/pages/Supplier/locale/es.yml @@ -0,0 +1 @@ +Search suppliers: Buscar proveedores diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml new file mode 100644 index 000000000..5348b29b9 --- /dev/null +++ b/src/pages/Ticket/locale/es.yml @@ -0,0 +1,2 @@ +Search ticket: Buscar ticket +You can search by ticket id or alias: Puedes buscar por id o alias del ticket diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml new file mode 100644 index 000000000..86dd9d0d9 --- /dev/null +++ b/src/pages/Worker/locale/es.yml @@ -0,0 +1,2 @@ +Search worker: Buscar trabajador +You can search by worker id or name: Puedes buscar por id o nombre del trabajador