0
0
Fork 0

fix: refs #6942 table bottom highlight & drop isBooked field

This commit is contained in:
Jorge Penadés 2024-03-12 10:22:40 +01:00
parent de6f85eba7
commit 252d9e3a50
6 changed files with 21 additions and 14 deletions

View File

@ -795,7 +795,7 @@ export default {
expense: 'Gasto', expense: 'Gasto',
taxableBase: 'Base imp.', taxableBase: 'Base imp.',
rate: 'Tasa', rate: 'Tasa',
sageTransaction: 'Sage transación', sageTransaction: 'Sage transacción',
dueDay: 'Fecha', dueDay: 'Fecha',
bank: 'Caja', bank: 'Caja',
amount: 'Importe', amount: 'Importe',

View File

@ -316,12 +316,6 @@ async function upsert() {
option-value="id" option-value="id"
option-label="withholding" option-label="withholding"
/> />
<span>
<QCheckbox
:label="t('invoiceIn.summary.booked')"
v-model="data.isBooked"
/>
</span>
</VnRow> </VnRow>
</template> </template>
</FormModel> </FormModel>

View File

@ -308,7 +308,11 @@ const getTotalAmount = (rows) => rows.reduce((acc, cur) => acc + cur.amount, 0);
<QBtn color="primary" icon="add" size="lg" round @click="insert" /> <QBtn color="primary" icon="add" size="lg" round @click="insert" />
</QPageSticky> </QPageSticky>
</template> </template>
<style lang="scss" scoped></style> <style lang="scss" scoped>
.bg {
background-color: var(--vn-light-gray);
}
</style>
<i18n> <i18n>
es: es:
Date: Fecha Date: Fecha

View File

@ -54,7 +54,9 @@ const vatColumns = ref([
{ {
name: 'vat', name: 'vat',
label: 'invoiceIn.summary.sageVat', label: 'invoiceIn.summary.sageVat',
field: (row) => row.taxTypeSage?.vat, field: (row) => {
if (row.taxTypeSage) return `${row.taxTypeSage.id}:${row.taxTypeSage.vat}`;
},
format: (value) => value, format: (value) => value,
sortable: true, sortable: true,
align: 'left', align: 'left',
@ -62,7 +64,10 @@ const vatColumns = ref([
{ {
name: 'transaction', name: 'transaction',
label: 'invoiceIn.summary.sageTransaction', label: 'invoiceIn.summary.sageTransaction',
field: (row) => row.transactionTypeSage?.transaction, field: (row) => {
if (row.transactionTypeSage)
return `${row.transactionTypeSage.id}:${row.transactionTypeSage?.transaction}`;
},
format: (value) => value, format: (value) => value,
sortable: true, sortable: true,
align: 'left', align: 'left',

View File

@ -62,7 +62,7 @@ const columns = computed(() => [
options: sageTaxTypes.value, options: sageTaxTypes.value,
model: 'taxTypeSageFk', model: 'taxTypeSageFk',
optionValue: 'id', optionValue: 'id',
optionLabel: 'vat', optionLabel: 'id',
sortable: true, sortable: true,
tabindex: 3, tabindex: 3,
align: 'left', align: 'left',
@ -74,7 +74,7 @@ const columns = computed(() => [
options: sageTransactionTypes.value, options: sageTransactionTypes.value,
model: 'transactionTypeSageFk', model: 'transactionTypeSageFk',
optionValue: 'id', optionValue: 'id',
optionLabel: 'transaction', optionLabel: 'id',
sortable: true, sortable: true,
tabIndex: 4, tabIndex: 4,
align: 'left', align: 'left',
@ -471,6 +471,10 @@ const getTotalRate = (rows) => rows.reduce((acc, cur) => acc + taxRate(cur), 0);
</QPageSticky> </QPageSticky>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.bg {
background-color: var(--vn-light-gray);
}
@media (max-width: $breakpoint-xs) { @media (max-width: $breakpoint-xs) {
.q-dialog { .q-dialog {
.q-card { .q-card {

View File

@ -16,12 +16,12 @@ describe('InvoiceInVat', () => {
it('should edit the first line', () => { it('should edit the first line', () => {
cy.get(inputBtns).eq(1).click(); cy.get(inputBtns).eq(1).click();
cy.get(inputs).eq(2).type(23); cy.get(inputs).eq(2).type(23);
cy.selectOption(firstLineVat, 'H.P. IVA 21% CEE'); cy.selectOption(firstLineVat, '8');
cy.saveCard(); cy.saveCard();
cy.visit(`/#/invoice-in/1/vat`); cy.visit(`/#/invoice-in/1/vat`);
cy.getValue(firstLineVat).should('equal', 'H.P. IVA 21% CEE'); cy.getValue(firstLineVat).should('equal', '8');
}); });
it('should add a new row', () => { it('should add a new row', () => {