feat: refs #8529 invoiceIn move deductible field from head to lines
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Carlos Andrés 2025-02-14 12:41:11 +01:00
parent 7f64fbb368
commit 658bd015ca
3 changed files with 20 additions and 27 deletions

View File

@ -143,20 +143,12 @@ function deleteFile(dmsFk) {
</VnRow> </VnRow>
<VnRow> <VnRow>
<VnSelect <VnSelect
:label="t('Undeductible VAT')" :label="t('invoiceIn.summary.sage')"
v-model="data.deductibleExpenseFk" v-model="data.withholdingSageFk"
:options="expenses" :options="sageWithholdings"
option-value="id" option-value="id"
option-label="id" option-label="withholding"
:filter-options="['id', 'name']" />
data-cy="UnDeductibleVatSelect"
>
<template #option="scope">
<QItem v-bind="scope.itemProps">
{{ `${scope.opt.id}: ${scope.opt.name}` }}
</QItem>
</template>
</VnSelect>
<div class="row no-wrap"> <div class="row no-wrap">
<VnInput <VnInput
@ -253,15 +245,6 @@ function deleteFile(dmsFk) {
option-label="code" option-label="code"
/> />
</VnRow> </VnRow>
<VnRow>
<VnSelect
:label="t('invoiceIn.summary.sage')"
v-model="data.withholdingSageFk"
:options="sageWithholdings"
option-value="id"
option-label="withholding"
/>
</VnRow>
</template> </template>
</FormModel> </FormModel>
<QDialog v-model="documentDialogRef.show"> <QDialog v-model="documentDialogRef.show">
@ -313,7 +296,6 @@ function deleteFile(dmsFk) {
supplierFk: Proveedor supplierFk: Proveedor
Expedition date: Fecha expedición Expedition date: Fecha expedición
Operation date: Fecha operación Operation date: Fecha operación
Undeductible VAT: Iva no deducible
Document: Documento Document: Documento
Download file: Descargar archivo Download file: Descargar archivo
Entry date: Fecha asiento Entry date: Fecha asiento

View File

@ -272,10 +272,6 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
:label="t('invoiceIn.summary.sage')" :label="t('invoiceIn.summary.sage')"
:value="entity.sageWithholding?.withholding" :value="entity.sageWithholding?.withholding"
/> />
<VnLv
:label="t('invoiceIn.summary.vat')"
:value="entity.expenseDeductible?.name"
/>
<VnLv <VnLv
:label="t('invoiceIn.card.company')" :label="t('invoiceIn.card.company')"
:value="entity.company?.code" :value="entity.company?.code"

View File

@ -53,6 +53,13 @@ const columns = computed(() => [
sortable: true, sortable: true,
align: 'left', align: 'left',
}, },
{
name: 'isDeductible',
label: t('Deductible'),
field: (row) => row.isDeductible,
model: 'isDeductible',
align: 'center',
},
{ {
name: 'sageiva', name: 'sageiva',
label: t('Sage iva'), label: t('Sage iva'),
@ -119,6 +126,7 @@ const filter = {
'foreignValue', 'foreignValue',
'taxTypeSageFk', 'taxTypeSageFk',
'transactionTypeSageFk', 'transactionTypeSageFk',
'isDeductible',
], ],
where: { where: {
invoiceInFk: route.params.id, invoiceInFk: route.params.id,
@ -227,6 +235,11 @@ function setCursor(ref) {
</VnSelectDialog> </VnSelectDialog>
</QTd> </QTd>
</template> </template>
<template #body-cell-isDeductible="{ row }">
<QTd align="center">
<QCheckbox v-model="row.isDeductible" />
</QTd>
</template>
<template #body-cell-taxablebase="{ row }"> <template #body-cell-taxablebase="{ row }">
<QTd shrink> <QTd shrink>
<VnInputNumber <VnInputNumber
@ -321,6 +334,7 @@ function setCursor(ref) {
</QTd> </QTd>
<QTd /> <QTd />
<QTd /> <QTd />
<QTd />
<QTd> <QTd>
{{ toCurrency(taxRateTotal) }} {{ toCurrency(taxRateTotal) }}
</QTd> </QTd>
@ -491,6 +505,7 @@ es:
Create a new expense: Crear nuevo gasto Create a new expense: Crear nuevo gasto
Add tax: Crear gasto Add tax: Crear gasto
Taxable base: Base imp. Taxable base: Base imp.
Deductible: Deducible
Sage tax: Sage iva Sage tax: Sage iva
Sage transaction: Sage transacción Sage transaction: Sage transacción
Rate: Tasa Rate: Tasa