diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue index d8a1543cd..f1799d0cc 100644 --- a/src/pages/Customer/Card/CustomerAddress.vue +++ b/src/pages/Customer/Card/CustomerAddress.vue @@ -117,7 +117,7 @@ const toCustomerAddressEdit = (addressId) => { data-key="CustomerAddresses" order="id DESC" ref="vnPaginateRef" - :user-filter="addressFilter" + :filter="addressFilter" :url="`Clients/${route.params.id}/addresses`" />
@@ -189,11 +189,11 @@ const toCustomerAddressEdit = (addressId) => { -
+
{ en: transferEntryDialog: The entries will be transferred to the next day - transferEntry: Transfer Entry + transferEntry: Partial delay es: transferEntryDialog: Se van a transferir las compras al dia siguiente - transferEntry: Transferir Entrada + transferEntry: Retraso parcial diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index 9398ded64..c7d7ba9f4 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -97,12 +97,19 @@ const columns = computed(() => [ }, { align: 'left', - name: 'companyCode', + name: 'companyFk', label: t('globals.company'), cardVisible: true, component: 'select', - attrs: { url: 'Companies', optionLabel: 'code', optionValue: 'id' }, - columnField: { component: null }, + attrs: { + url: 'Companies', + optionLabel: 'code', + optionValue: 'id', + }, + columnField: { + component: null, + }, + format: (row, dashIfEmpty) => dashIfEmpty(row.companyCode), }, { align: 'left',