verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 85 Releases Wiki Activity

#7936 improve InvoiceIn #1004

Merged
jorgep merged 55 commits from 7936-improveInvoiceIn into dev 2024-12-18 09:22:09 +00:00
Conversation 0 Commits 55 Files Changed 36 +10 -4
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 799c78cdff - Show all commits

4
src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
View File

@ -165,7 +165,9 @@ const columns = computed(() => [
v-model="props.row['intrastatFk']" v-model="props.row['intrastatFk']"
:options="intrastats" :options="intrastats"
option-value="id" option-value="id"
option-label="description" :option-label="
(row) => `${row.id}:${row.description}`
"
:filter-options="['id', 'description']" :filter-options="['id', 'description']"
> >
<template #option="scope"> <template #option="scope">

10
src/pages/InvoiceIn/Card/InvoiceInVat.vue
View File

@ -118,6 +118,8 @@ function taxRate(invoiceInTax) {
return ((taxTypeSage / 100) * taxableBase).toFixed(2); return ((taxTypeSage / 100) * taxableBase).toFixed(2);
} }
const formatLabel = (row, prop) => `${row.id}: ${row[prop]}`;
</script> </script>
<template> <template>
<FetchData <FetchData
@ -296,7 +298,7 @@ function taxRate(invoiceInTax) {
v-model="props.row['expenseFk']" v-model="props.row['expenseFk']"
:options="expenses" :options="expenses"
option-value="id" option-value="id"
option-label="name" :option-label="(row) => `${row.id}:${row.name}`"
:filter-options="['id', 'name']" :filter-options="['id', 'name']"
:tooltip="t('Create a new expense')" :tooltip="t('Create a new expense')"
> >
@ -330,7 +332,7 @@ function taxRate(invoiceInTax) {
v-model="props.row['taxTypeSageFk']" v-model="props.row['taxTypeSageFk']"
:options="sageTaxTypes" :options="sageTaxTypes"
option-value="id" option-value="id"
option-label="vat" :option-label="(row) => `${row.id}:${row.vat}`"
:filter-options="['id', 'vat']" :filter-options="['id', 'vat']"
> >
<template #option="scope"> <template #option="scope">
@ -353,7 +355,9 @@ function taxRate(invoiceInTax) {
v-model="props.row['transactionTypeSageFk']" v-model="props.row['transactionTypeSageFk']"
:options="sageTransactionTypes" :options="sageTransactionTypes"
option-value="id" option-value="id"
option-label="transaction" :option-label="
(row) => `${row.id}:${row.transaction}`
"
:filter-options="['id', 'transaction']" :filter-options="['id', 'transaction']"
> >
<template #option="scope"> <template #option="scope">