feat: refs #8529 add isDeductible column and localization for InvoiceIn summary
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
parent
34abab09bb
commit
535fe011f6
|
@ -40,6 +40,13 @@ const vatColumns = ref([
|
||||||
sortable: true,
|
sortable: true,
|
||||||
align: 'left',
|
align: 'left',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: 'isDeductible',
|
||||||
|
label: 'invoiceIn.isDeductible',
|
||||||
|
field: (row) => row.isDeductible,
|
||||||
|
sortable: true,
|
||||||
|
align: 'center',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: 'vat',
|
name: 'vat',
|
||||||
label: 'invoiceIn.summary.sageVat',
|
label: 'invoiceIn.summary.sageVat',
|
||||||
|
@ -331,6 +338,15 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
|
||||||
</QTh>
|
</QTh>
|
||||||
</QTr>
|
</QTr>
|
||||||
</template>
|
</template>
|
||||||
|
<template #body-cell-isDeductible="{ row }">
|
||||||
|
<QTd align="center">
|
||||||
|
<QCheckbox
|
||||||
|
v-model="row.isDeductible"
|
||||||
|
disable
|
||||||
|
data-cy="isDeductible_checkbox"
|
||||||
|
/>
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
<template #body-cell-vat="{ value: vatCell }">
|
<template #body-cell-vat="{ value: vatCell }">
|
||||||
<QTd :title="vatCell" shrink>
|
<QTd :title="vatCell" shrink>
|
||||||
{{ vatCell }}
|
{{ vatCell }}
|
||||||
|
|
|
@ -55,7 +55,7 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'isDeductible',
|
name: 'isDeductible',
|
||||||
label: t('Deductible'),
|
label: t('invoiceIn.isDeductible'),
|
||||||
field: (row) => row.isDeductible,
|
field: (row) => row.isDeductible,
|
||||||
model: 'isDeductible',
|
model: 'isDeductible',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
|
@ -511,7 +511,6 @@ 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
|
||||||
|
|
|
@ -4,6 +4,7 @@ invoiceIn:
|
||||||
serial: Serial
|
serial: Serial
|
||||||
isBooked: Is booked
|
isBooked: Is booked
|
||||||
supplierRef: Invoice nº
|
supplierRef: Invoice nº
|
||||||
|
isDeductible: Deductible
|
||||||
list:
|
list:
|
||||||
ref: Reference
|
ref: Reference
|
||||||
supplier: Supplier
|
supplier: Supplier
|
||||||
|
|
|
@ -4,6 +4,7 @@ invoiceIn:
|
||||||
serial: Serie
|
serial: Serie
|
||||||
isBooked: Contabilizada
|
isBooked: Contabilizada
|
||||||
supplierRef: Nº factura
|
supplierRef: Nº factura
|
||||||
|
isDeductible: Deducible
|
||||||
list:
|
list:
|
||||||
ref: Referencia
|
ref: Referencia
|
||||||
supplier: Proveedor
|
supplier: Proveedor
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
describe('InvoiceInDescriptor', () => {
|
describe('InvoiceInDescriptor', () => {
|
||||||
const book = '.summaryHeader > .no-wrap > .q-btn';
|
|
||||||
const firstDescritorOpt = '.q-menu > .q-list > :nth-child(4) > .q-item__section';
|
|
||||||
const checkbox = ':nth-child(4) > .q-checkbox';
|
|
||||||
beforeEach(() => cy.login('administrative'));
|
beforeEach(() => cy.login('administrative'));
|
||||||
|
|
||||||
describe('more options', () => {
|
describe('more options', () => {
|
||||||
|
|
Loading…
Reference in New Issue