diff --git a/src/components/RefundInvoiceForm.vue b/src/components/RefundInvoiceForm.vue
index 1b545103a..c21c892dd 100644
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@@ -33,6 +33,7 @@ const invoiceCorrectionTypesOptions = ref([]);
const refund = async () => {
const params = {
id: invoiceParams.id,
+ withWarehouse: invoiceParams.inheritWarehouse,
cplusRectificationTypeFk: invoiceParams.cplusRectificationTypeFk,
siiTypeInvoiceOutFk: invoiceParams.siiTypeInvoiceOutFk,
invoiceCorrectionTypeFk: invoiceParams.invoiceCorrectionTypeFk,
diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index c42de6690..68ff0e359 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -135,6 +135,7 @@ const columns = computed(() => [
field: 'hasFile',
label: t('globals.original'),
name: 'hasFile',
+ toolTip: t('The documentation is available in paper form'),
component: QCheckbox,
props: (prop) => ({
disable: true,
@@ -297,6 +298,14 @@ defineExpose({
row-key="clientFk"
:grid="$q.screen.lt.sm"
>
+
+
+
+ {{ col.toolTip }}{{ col.label }}
+
+
+
@@ -397,8 +406,10 @@ defineExpose({
en:
contentTypesInfo: Allowed file types {allowedContentTypes}
+ The documentation is available in paper form: The documentation is available in paper form
es:
contentTypesInfo: Tipos de archivo permitidos {allowedContentTypes}
Generate identifier for original file: Generar identificador para archivo original
Upload file: Subir fichero
+ the documentation is available in paper form: Se tiene la documentación en papel
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 548981de1..52fc73f2f 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -84,7 +84,7 @@ globals:
description: Description
id: Id
order: Order
- original: Original
+ original: Phys. Doc
file: File
selectFile: Select a file
copyClipboard: Copy on clipboard
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 697e6c38c..ad018b5cd 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -86,7 +86,7 @@ globals:
description: Descripción
id: Id
order: Orden
- original: Original
+ original: Doc. física
file: Fichero
selectFile: Seleccione un fichero
copyClipboard: Copiar en portapapeles
diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
index 4d3450665..057745831 100644
--- a/src/pages/Account/AccountConnections.vue
+++ b/src/pages/Account/AccountConnections.vue
@@ -27,15 +27,15 @@ const filter = {
order: 'created DESC',
};
-const urlPath = 'AccessTokens';
+const urlPath = 'VnTokens';
const refresh = () => paginateRef.value.fetch();
const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } });
-const killSession = async (id) => {
+const killSession = async ({ userId, created }) => {
try {
- await axios.delete(`${urlPath}/${id}`);
+ await axios.post(`${urlPath}/killSession`, { userId, created });
paginateRef.value.fetch();
notify(t('Session killed'), 'positive');
} catch (error) {
@@ -84,7 +84,7 @@ const killSession = async (id) => {
openConfirmationModal(
t('Session will be killed'),
t('Are you sure you want to continue?'),
- () => killSession(row.id)
+ () => killSession(row)
)
"
outline
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 8381f0624..baac0c608 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -10,8 +10,6 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
import VnConfirm from 'components/ui/VnConfirm.vue';
import RegularizeStockForm from 'components/RegularizeStockForm.vue';
import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
-
-import { useState } from 'src/composables/useState';
import useCardDescription from 'src/composables/useCardDescription';
import { getUrl } from 'src/composables/getUrl';
import axios from 'axios';
@@ -35,58 +33,69 @@ const $props = defineProps({
type: Number,
default: null,
},
+ warehouseFk: {
+ type: Number,
+ default: null,
+ },
});
const quasar = useQuasar();
const route = useRoute();
const router = useRouter();
const { t } = useI18n();
-const state = useState();
-const user = state.getUser();
-
+const warehouseConfig = ref(null);
const entityId = computed(() => {
return $props.id || route.params.id;
});
+
const regularizeStockFormDialog = ref(null);
const available = ref(null);
const visible = ref(null);
-const _warehouseFk = ref(null);
const salixUrl = ref();
-const warehouseFk = computed({
- get() {
- return _warehouseFk.value;
- },
- set(val) {
- _warehouseFk.value = val;
- if (val) updateStock();
- },
-});
onMounted(async () => {
- warehouseFk.value = user.value.warehouseFk;
salixUrl.value = await getUrl('');
+ await getItemConfigs();
+ await updateStock();
});
const data = ref(useCardDescription());
-const setData = (entity) => {
- if (!entity) return;
- data.value = useCardDescription(entity.name, entity.id);
+const setData = async (entity) => {
+ try {
+ if (!entity) return;
+ data.value = useCardDescription(entity.name, entity.id);
+ await updateStock();
+ } catch (err) {
+ console.error('Error item');
+ }
};
+const getItemConfigs = async () => {
+ try {
+ const { data } = await axios.get('ItemConfigs/findOne');
+ if (!data) return;
+ return (warehouseConfig.value = data.warehouseFk);
+ } catch (err) {
+ console.error('Error item');
+ }
+};
const updateStock = async () => {
try {
available.value = null;
visible.value = null;
const params = {
- warehouseFk: warehouseFk.value,
+ warehouseFk: $props.warehouseFk,
dated: $props.dated,
};
+ await getItemConfigs();
+ if (!params.warehouseFk) {
+ params.warehouseFk = warehouseConfig.value;
+ }
const { data } = await axios.get(`Items/${entityId.value}/getVisibleAvailable`, {
params,
});
-
available.value = data.available;
visible.value = data.visible;
} catch (err) {
diff --git a/src/pages/Item/Card/ItemDescriptorImage.vue b/src/pages/Item/Card/ItemDescriptorImage.vue
index d83f534b8..a4ef22ce3 100644
--- a/src/pages/Item/Card/ItemDescriptorImage.vue
+++ b/src/pages/Item/Card/ItemDescriptorImage.vue
@@ -47,8 +47,11 @@ const getWarehouseName = async (warehouseFk) => {
const filter = {
where: { id: warehouseFk },
};
-
- const { data } = await axios.get('Warehouses/findOne', { filter });
+ const { data } = await axios.get('Warehouses/findOne', {
+ params: {
+ filter: JSON.stringify(filter),
+ },
+ });
if (!data) return;
warehouseName.value = data.name;
};
diff --git a/src/pages/Item/Card/ItemDescriptorProxy.vue b/src/pages/Item/Card/ItemDescriptorProxy.vue
index 2b7b39a65..2ffc9080f 100644
--- a/src/pages/Item/Card/ItemDescriptorProxy.vue
+++ b/src/pages/Item/Card/ItemDescriptorProxy.vue
@@ -15,6 +15,10 @@ const $props = defineProps({
type: Number,
default: null,
},
+ warehouseFk: {
+ type: Number,
+ default: null,
+ },
});
@@ -26,6 +30,7 @@ const $props = defineProps({
:summary="ItemSummary"
:dated="dated"
:sale-fk="saleFk"
+ :warehouse-fk="warehouseFk"
/>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index bc160846a..3851bf5d6 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -383,7 +383,11 @@ async function changeState(value) {
{{ props.row.itemFk }}
-
+
{{ props.row.visible }}