Compare commits

..

No commits in common. "1ff7d55644b7e9d53bdd3b9b4845f1e918e89121" and "e6756aebee9b7f34fe4179eb2e085499958ef0e7" have entirely different histories.

15 changed files with 45 additions and 21 deletions

View File

@ -1,4 +0,0 @@
import { QInput } from 'quasar';
import setDefault from './setDefault';
setDefault(QInput, 'dense', true);

View File

@ -1,4 +0,0 @@
import { QSelect } from 'quasar';
import setDefault from './setDefault';
setDefault(QSelect, 'dense', true);

View File

@ -1,3 +1 @@
export * from './defaults/qTable';
export * from './defaults/qInput';
export * from './defaults/qSelect';

View File

@ -130,4 +130,24 @@ const mixinRules = [
.q-field__append {
padding-inline: 0;
}
.q-field__append.q-field__marginal.row.no-wrap.items-center.row {
height: 20px;
}
.q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
height: auto;
}
.q-field__control {
height: unset;
}
.q-field--labeled {
.q-field__native,
.q-field__prefix,
.q-field__suffix,
.q-field__input {
padding-bottom: 0;
min-height: 15px;
}
}
</style>

View File

@ -283,4 +283,15 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
.q-field--outlined {
max-width: 100%;
}
.q-field__inner {
.q-field__control {
min-height: auto !important;
display: flex;
align-items: flex-end;
.q-field__native.row {
min-height: auto !important;
}
}
}
</style>

View File

@ -9,6 +9,7 @@ defineProps({ wrap: { type: Boolean, default: false } });
<style lang="scss" scoped>
.vn-row {
display: flex;
align-items: flex-end;
> :deep(*) {
flex: 1;
}

View File

@ -274,7 +274,10 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
:label="t('invoiceIn.summary.company')"
:value="entity.company?.code"
/>
<VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
<VnLv
:label="t('invoiceIn.summary.booked')"
:value="invoiceIn?.isBooked"
/>
</QCard>
<QCard class="vn-one">
<QCardSection class="q-pa-none">

View File

@ -116,7 +116,7 @@ const activities = ref([]);
<QItem>
<QItemSection>
<QCheckbox
:label="t('invoiceIn.isBooked')"
:label="t('params.isBooked')"
v-model="params.isBooked"
@update:model-value="searchFn()"
toggle-indeterminate
@ -170,7 +170,7 @@ es:
awb: AWB
amount: Importe
issued: Emitida
isBooked: Contabilizada
isBooked: Conciliada
account: Cuenta contable
created: Creada
dued: Vencida

View File

@ -65,7 +65,7 @@ const cols = computed(() => [
{
align: 'left',
name: 'isBooked',
label: t('invoiceIn.isBooked'),
label: t('invoiceIn.list.isBooked'),
columnFilter: false,
cardVisible: true,
},

View File

@ -1,6 +1,5 @@
invoiceIn:
serial: Serial
isBooked: Is booked
list:
ref: Reference
supplier: Supplier
@ -8,6 +7,7 @@ invoiceIn:
serial: Serial
file: File
issued: Issued
isBooked: Is booked
awb: AWB
amount: Amount
card:
@ -31,6 +31,7 @@ invoiceIn:
sage: Sage withholding
vat: Undeductible VAT
company: Company
booked: Booked
expense: Expense
taxableBase: Taxable base
rate: Rate

View File

@ -1,6 +1,5 @@
invoiceIn:
serial: Serie
isBooked: Contabilizada
list:
ref: Referencia
supplier: Proveedor
@ -8,6 +7,7 @@ invoiceIn:
shortIssued: F. emisión
file: Fichero
issued: Fecha emisión
isBooked: Conciliada
awb: AWB
amount: Importe
card:
@ -31,6 +31,7 @@ invoiceIn:
sage: Retención sage
vat: Iva no deducible
company: Empresa
booked: Contabilizada
expense: Gasto
taxableBase: Base imp.
rate: Tasa

View File

@ -139,7 +139,6 @@ onBeforeMount(async () => {
<VnLinkPhone :phone-number="worker?.sip?.extension" />
</template>
</VnLv>
<VnLv :label="t('queue')" :value="worker.sip?.queueMember?.queue" />
</QCard>
</template>
</CardSummary>

View File

@ -9,4 +9,3 @@ tableColumns:
fi: FI
SSN: SSN
extension: Extension
queue: Queue

View File

@ -14,4 +14,3 @@ tableColumns:
fi: NIF
SSN: NSS
extension: Extensión
queue: Cola

View File

@ -1,7 +1,7 @@
/// <reference types="cypress" />
describe('Ticket descriptor', () => {
const toCloneOpt = '[role="menu"] .q-list > :nth-child(8)';
const setWeightOpt = '[role="menu"] .q-list > :nth-child(13)';
const toCloneOpt = '[role="menu"] .q-list > :nth-child(5)';
const setWeightOpt = '[role="menu"] .q-list > :nth-child(6)';
const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
const summaryHeader = '.summaryHeader > div';
const weight = 25;