diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js index 0bf1f9795..fc7852369 100644 --- a/src/boot/qformMixin.js +++ b/src/boot/qformMixin.js @@ -1,28 +1,11 @@ import { getCurrentInstance } from 'vue'; -const filterAvailableInput = (element) => { - return element.classList.contains('q-field__native') && !element.disabled; -}; -const filterAvailableText = (element) => { - return ( - element.__vueParentComponent.type.name === 'QInput' && - element.__vueParentComponent?.attrs?.class !== 'vn-input-date' - ); -}; - export default { mounted: function () { const vm = getCurrentInstance(); if (vm.type.name === 'QForm') { if (!['searchbarForm', 'filterPanelForm'].includes(this.$el?.id)) { - // AUTOFOCUS - const elementsArray = Array.from(this.$el.elements); - const availableInputs = elementsArray.filter(filterAvailableInput); - const firstInputElement = availableInputs.find(filterAvailableText); - - if (firstInputElement) { - firstInputElement.focus(); - } + // TODO: AUTOFOCUS IS NOT FOCUSING const that = this; this.$el.addEventListener('keyup', function (evt) { if (evt.key === 'Enter') { diff --git a/src/components/RegularizeStockForm.vue b/src/components/RegularizeStockForm.vue index a28e9cbef..f34386fc4 100644 --- a/src/components/RegularizeStockForm.vue +++ b/src/components/RegularizeStockForm.vue @@ -15,7 +15,7 @@ const props = defineProps({ default: null, }, warehouseFk: { - type: Boolean, + type: Number, default: null, }, }); @@ -23,7 +23,7 @@ const props = defineProps({ const { t } = useI18n(); const regularizeFormData = reactive({ - itemFk: props.itemFk, + itemFk: Number(props.itemFk), warehouseFk: props.warehouseFk, quantity: null, }); @@ -53,6 +53,7 @@ const onDataSaved = (data) => { @@ -60,7 +61,7 @@ const onDataSaved = (data) => {
- diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue index e3bb52637..6d9fd2c33 100644 --- a/src/components/VnTable/VnVisibleColumn.vue +++ b/src/components/VnTable/VnVisibleColumn.vue @@ -81,7 +81,7 @@ async function fetchViewConfigData() { return; } } catch (err) { - console.err('Error fetching config view data', err); + console.error('Error fetching config view data', err); } } diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue index a4e4afafe..9a6c70ef0 100644 --- a/src/components/common/TableVisibleColumns.vue +++ b/src/components/common/TableVisibleColumns.vue @@ -84,7 +84,7 @@ const fetchViewConfigData = async () => { setUserConfigViewData(defaultColumns); } } catch (err) { - console.err('Error fetching config view data', err); + console.error('Error fetching config view data', err); } }; diff --git a/src/css/app.scss b/src/css/app.scss index 69861a80c..e607431f7 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -209,27 +209,29 @@ input::-webkit-inner-spin-button { max-width: 100%; } -/* ===== Scrollbar CSS ===== / -/ Firefox */ +.q-table__container { + /* ===== Scrollbar CSS ===== / + / Firefox */ -* { - scrollbar-width: auto; - scrollbar-color: var(--vn-label-color) transparent; -} + * { + scrollbar-width: auto; + scrollbar-color: var(--vn-label-color) transparent; + } -/* Chrome, Edge, and Safari */ -*::-webkit-scrollbar { - width: 10px; - height: 10px; -} + /* Chrome, Edge, and Safari */ + *::-webkit-scrollbar { + width: 10px; + height: 10px; + } -*::-webkit-scrollbar-thumb { - background-color: var(--vn-label-color); - border-radius: 10px; -} + *::-webkit-scrollbar-thumb { + background-color: var(--vn-label-color); + border-radius: 10px; + } -*::-webkit-scrollbar-track { - background: transparent; + *::-webkit-scrollbar-track { + background: transparent; + } } .q-table { diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue index 45990235d..e6974a04b 100644 --- a/src/pages/Entry/MyEntries.vue +++ b/src/pages/Entry/MyEntries.vue @@ -1,71 +1,89 @@ diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml index 677c3c055..df78b17c9 100644 --- a/src/pages/Entry/locale/en.yml +++ b/src/pages/Entry/locale/en.yml @@ -8,4 +8,6 @@ entryFilter: reference: Reference landed: Landed shipped: Shipped +fromShipped: Shipped(from) +toShipped: Shipped(to) printBuys: Print buys diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml index 10b77c2ee..4308722fb 100644 --- a/src/pages/Entry/locale/es.yml +++ b/src/pages/Entry/locale/es.yml @@ -12,4 +12,6 @@ entryFilter: landed: F. llegada shipped: F. salida +fromShipped: F. salida(desde) +toShipped: F. salida(hasta) Print buys: Imprimir etiquetas diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue index 68dc5be4b..0d279de06 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue @@ -207,8 +207,14 @@ async function cloneInvoice() { const isAdministrative = () => hasAny(['administrative']); -const isAgricultural = () => - invoiceIn.value?.supplier?.sageWithholdingFk === config.value[0]?.sageWithholdingFk; +const isAgricultural = () => { + console.error(config); + if (!config.value) return false; + return ( + invoiceIn.value?.supplier?.sageFarmerWithholdingFk === + config?.value[0]?.sageWithholdingFk + ); +}; function showPdfInvoice() { if (isAgricultural()) openReport(`InvoiceIns/${entityId.value}/invoice-in-pdf`); diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue index 4c0959153..bd60745cd 100644 --- a/src/pages/Item/Card/ItemDiary.vue +++ b/src/pages/Item/Card/ItemDiary.vue @@ -1,5 +1,5 @@