Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
This commit is contained in:
commit
6ef3df2322
|
@ -219,6 +219,7 @@ function filterByRecord(modelLog) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function applyFilter(params = {}) {
|
async function applyFilter(params = {}) {
|
||||||
|
paginate.value.arrayData.resetPagination();
|
||||||
paginate.value.arrayData.applyFilter({
|
paginate.value.arrayData.applyFilter({
|
||||||
filter: {},
|
filter: {},
|
||||||
params: { originFk: route.params.id, ...params },
|
params: { originFk: route.params.id, ...params },
|
||||||
|
|
|
@ -6,7 +6,7 @@ import AccountSummary from './AccountSummary.vue';
|
||||||
<QPopupProxy style="max-width: 10px">
|
<QPopupProxy style="max-width: 10px">
|
||||||
<AccountDescriptor
|
<AccountDescriptor
|
||||||
v-if="$attrs.id"
|
v-if="$attrs.id"
|
||||||
v-bind="$attrs.id"
|
v-bind="$attrs"
|
||||||
:summary="AccountSummary"
|
:summary="AccountSummary"
|
||||||
:proxy-render="true"
|
:proxy-render="true"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -22,7 +22,7 @@ const routes = reactive({
|
||||||
getSupplier: (id) => {
|
getSupplier: (id) => {
|
||||||
return { name: 'SupplierCard', params: { id } };
|
return { name: 'SupplierCard', params: { id } };
|
||||||
},
|
},
|
||||||
getTickets: (id) => {
|
getInvoices: (id) => {
|
||||||
return {
|
return {
|
||||||
name: 'InvoiceInList',
|
name: 'InvoiceInList',
|
||||||
query: {
|
query: {
|
||||||
|
@ -131,11 +131,11 @@ async function setInvoiceCorrection(id) {
|
||||||
</QBtn>
|
</QBtn>
|
||||||
<QBtn
|
<QBtn
|
||||||
size="md"
|
size="md"
|
||||||
icon="vn:ticket"
|
icon="vn:invoice-in"
|
||||||
color="primary"
|
color="primary"
|
||||||
:to="routes.getTickets(entity.supplierFk)"
|
:to="routes.getInvoices(entity.supplierFk)"
|
||||||
>
|
>
|
||||||
<QTooltip>{{ t('globals.ticketList') }}</QTooltip>
|
<QTooltip>{{ t('invoiceIn.descriptor.invoices') }}</QTooltip>
|
||||||
</QBtn>
|
</QBtn>
|
||||||
<QBtn
|
<QBtn
|
||||||
v-if="
|
v-if="
|
||||||
|
|
|
@ -15,6 +15,7 @@ invoiceIn:
|
||||||
amount: Amount
|
amount: Amount
|
||||||
descriptor:
|
descriptor:
|
||||||
ticketList: Ticket list
|
ticketList: Ticket list
|
||||||
|
invoices: Supplier invoices
|
||||||
descriptorMenu:
|
descriptorMenu:
|
||||||
book: Book
|
book: Book
|
||||||
unbook: Unbook
|
unbook: Unbook
|
||||||
|
|
|
@ -14,7 +14,7 @@ invoiceIn:
|
||||||
awb: AWB
|
awb: AWB
|
||||||
amount: Importe
|
amount: Importe
|
||||||
descriptor:
|
descriptor:
|
||||||
ticketList: Listado de tickets
|
invoices: Facturas de proveedor
|
||||||
descriptorMenu:
|
descriptorMenu:
|
||||||
book: Contabilizar
|
book: Contabilizar
|
||||||
unbook: Descontabilizar
|
unbook: Descontabilizar
|
||||||
|
|
|
@ -198,7 +198,7 @@ const getLocale = (label) => {
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
dense
|
dense
|
||||||
rounded
|
filled
|
||||||
:label="t('globals.params.packing')"
|
:label="t('globals.params.packing')"
|
||||||
v-model="params.packing"
|
v-model="params.packing"
|
||||||
url="ItemPackingTypes"
|
url="ItemPackingTypes"
|
||||||
|
|
|
@ -91,7 +91,7 @@ onBeforeMount(async () => {
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
</div>
|
</div>
|
||||||
<div class="vn-card-content">
|
<div class="vn-card-content" v-if="advancedSummary">
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('worker.summary.fiDueDate')"
|
:label="t('worker.summary.fiDueDate')"
|
||||||
:value="toDate(advancedSummary.fiDueDate)"
|
:value="toDate(advancedSummary.fiDueDate)"
|
||||||
|
|
|
@ -13,7 +13,7 @@ describe('InvoiceInDescriptor', () => {
|
||||||
cy.validateCheckbox(checkbox, false);
|
cy.validateCheckbox(checkbox, false);
|
||||||
});
|
});
|
||||||
|
|
||||||
it.skip('should delete the invoice properly', () => {
|
it('should delete the invoice properly', () => {
|
||||||
cy.visit('/#/invoice-in/2/summary');
|
cy.visit('/#/invoice-in/2/summary');
|
||||||
cy.selectDescriptorOption(2);
|
cy.selectDescriptorOption(2);
|
||||||
cy.clickConfirm();
|
cy.clickConfirm();
|
||||||
|
|
Loading…
Reference in New Issue