Merge branch 'dev' into fix_customerConsumption_filter

src/components/ui/CardDescriptor.vue

@@ -57,7 +57,7 @@ defineExpose({ getData });
 onBeforeMount(async () => {
     arrayData = useArrayData($props.dataKey, {
         url: $props.url,
-        filter: $props.filter,
+        userFilter: $props.filter,
         skip: 0,
         oneRecord: true,
     });

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`"
     />
     <div class="full-width flex justify-center">
@@ -189,11 +189,11 @@ const toCustomerAddressEdit = (addressId) => {
 
                     <QSeparator
                         class="q-mx-lg"
-                        v-if="item.observations.length"
+                        v-if="item?.observations?.length"
                         vertical
                     />
 
-                    <div v-if="item.observations.length">
+                    <div v-if="item?.observations?.length">
                         <div
                             :key="obIndex"
                             class="flex q-mb-sm"

src/pages/Entry/Card/EntryDescriptorMenu.vue

@@ -54,8 +54,8 @@ const transferEntry = async () => {
 <i18n>
 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
 </i18n>

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' },
+        attrs: {
-        columnField: { component: null },
+            url: 'Companies',
+            optionLabel: 'code',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.companyCode),
     },
     {
         align: 'left',