forked from verdnatura/salix-front
fix: refs #6942 table bottom highlight & drop isBooked field
This commit is contained in:
parent
de6f85eba7
commit
252d9e3a50
|
@ -795,7 +795,7 @@ export default {
|
|||
expense: 'Gasto',
|
||||
taxableBase: 'Base imp.',
|
||||
rate: 'Tasa',
|
||||
sageTransaction: 'Sage transación',
|
||||
sageTransaction: 'Sage transacción',
|
||||
dueDay: 'Fecha',
|
||||
bank: 'Caja',
|
||||
amount: 'Importe',
|
||||
|
|
|
@ -316,12 +316,6 @@ async function upsert() {
|
|||
option-value="id"
|
||||
option-label="withholding"
|
||||
/>
|
||||
<span>
|
||||
<QCheckbox
|
||||
:label="t('invoiceIn.summary.booked')"
|
||||
v-model="data.isBooked"
|
||||
/>
|
||||
</span>
|
||||
</VnRow>
|
||||
</template>
|
||||
</FormModel>
|
||||
|
|
|
@ -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" />
|
||||
</QPageSticky>
|
||||
</template>
|
||||
<style lang="scss" scoped></style>
|
||||
<style lang="scss" scoped>
|
||||
.bg {
|
||||
background-color: var(--vn-light-gray);
|
||||
}
|
||||
</style>
|
||||
<i18n>
|
||||
es:
|
||||
Date: Fecha
|
||||
|
|
|
@ -54,7 +54,9 @@ const vatColumns = ref([
|
|||
{
|
||||
name: 'vat',
|
||||
label: 'invoiceIn.summary.sageVat',
|
||||
field: (row) => row.taxTypeSage?.vat,
|
||||
field: (row) => {
|
||||
if (row.taxTypeSage) return `${row.taxTypeSage.id}:${row.taxTypeSage.vat}`;
|
||||
},
|
||||
format: (value) => value,
|
||||
sortable: true,
|
||||
align: 'left',
|
||||
|
@ -62,7 +64,10 @@ const vatColumns = ref([
|
|||
{
|
||||
name: 'transaction',
|
||||
label: 'invoiceIn.summary.sageTransaction',
|
||||
field: (row) => row.transactionTypeSage?.transaction,
|
||||
field: (row) => {
|
||||
if (row.transactionTypeSage)
|
||||
return `${row.transactionTypeSage.id}:${row.transactionTypeSage?.transaction}`;
|
||||
},
|
||||
format: (value) => value,
|
||||
sortable: true,
|
||||
align: 'left',
|
||||
|
|
|
@ -62,7 +62,7 @@ const columns = computed(() => [
|
|||
options: sageTaxTypes.value,
|
||||
model: 'taxTypeSageFk',
|
||||
optionValue: 'id',
|
||||
optionLabel: 'vat',
|
||||
optionLabel: 'id',
|
||||
sortable: true,
|
||||
tabindex: 3,
|
||||
align: 'left',
|
||||
|
@ -74,7 +74,7 @@ const columns = computed(() => [
|
|||
options: sageTransactionTypes.value,
|
||||
model: 'transactionTypeSageFk',
|
||||
optionValue: 'id',
|
||||
optionLabel: 'transaction',
|
||||
optionLabel: 'id',
|
||||
sortable: true,
|
||||
tabIndex: 4,
|
||||
align: 'left',
|
||||
|
@ -471,6 +471,10 @@ const getTotalRate = (rows) => rows.reduce((acc, cur) => acc + taxRate(cur), 0);
|
|||
</QPageSticky>
|
||||
</template>
|
||||
<style lang="scss" scoped>
|
||||
.bg {
|
||||
background-color: var(--vn-light-gray);
|
||||
}
|
||||
|
||||
@media (max-width: $breakpoint-xs) {
|
||||
.q-dialog {
|
||||
.q-card {
|
||||
|
|
|
@ -16,12 +16,12 @@ describe('InvoiceInVat', () => {
|
|||
it('should edit the first line', () => {
|
||||
cy.get(inputBtns).eq(1).click();
|
||||
cy.get(inputs).eq(2).type(23);
|
||||
cy.selectOption(firstLineVat, 'H.P. IVA 21% CEE');
|
||||
cy.selectOption(firstLineVat, '8');
|
||||
|
||||
cy.saveCard();
|
||||
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', () => {
|
||||
|
|
Loading…
Reference in New Issue