Merge branch 'master' into Hotfix-CustomerDescriptorIcons

src/i18n/locale/en.yml

@@ -773,6 +773,7 @@ travel:
             totalEntries: Total entries
             totalEntriesTooltip: Total entries
             daysOnward: Landed days onwards
+            awb: AWB
     summary:
         entryId: Entry Id
         freight: Freight

src/i18n/locale/es.yml

@@ -774,6 +774,7 @@ travel:
             totalEntries: ∑
             totalEntriesTooltip: Entradas totales
             daysOnward: Días de llegada en adelante
+            awb: AWB
     summary:
         entryId: Id entrada
         freight: Porte

src/pages/Customer/Card/CustomerBillingData.vue

@@ -38,7 +38,7 @@ const getBankEntities = (data, formData) => {
                     hide-selected
                     option-label="name"
                     option-value="id"
-                    v-model="data.payMethod"
+                    v-model="data.payMethodFk"
                 />
                 <VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
             </VnRow>

src/pages/Customer/Card/CustomerCredits.vue

@@ -59,6 +59,7 @@ const columns = computed(() => [
 </script>
 <template>
     <VnTable
+        :user-filter="{ include: filter.include }"
         ref="tableRef"
         data-key="ClientCredit"
         url="ClientCredits"

src/pages/Travel/TravelList.vue

@@ -79,6 +79,13 @@ const columns = computed(() => [
         cardVisible: true,
         create: true,
     },
+    {
+        align: 'left',
+        name: 'awb',
+        label: t('travel.travelList.tableVisibleColumns.awb'),
+        columnFilter: false,
+        format: (row) => row.awbCode,
+    },
     {
         align: 'left',
         name: 'warehouseInFk',

src/stores/invoiceOutGlobal.js

@@ -7,7 +7,14 @@ import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 
 const { notify } = useNotify();
-
+const initInvoicing = {
+    invoicing: false,
+    nRequests: 0,
+    nPdfs: 0,
+    totalPdfs: 0,
+    addressIndex: 0,
+    errors: [],
+};
 export const useInvoiceOutGlobalStore = defineStore({
     id: 'invoiceOutGlobal',
     state: () => ({
@@ -23,16 +30,11 @@ export const useInvoiceOutGlobalStore = defineStore({
         addresses: [],
         minInvoicingDate: null,
         parallelism: null,
-        invoicing: false,
-        isInvoicing: false,
         status: null,
-        addressIndex: 0,
+
-        errors: [],
         printer: null,
-        nRequests: 0,
-        nPdfs: 0,
-        totalPdfs: 0,
         formData: null,
+        ...initInvoicing,
     }),
     actions: {
         async init() {
@@ -117,12 +119,13 @@ export const useInvoiceOutGlobalStore = defineStore({
                     );
                     throw new Error("There aren't addresses to invoice");
                 }
-                this.invoicing = false;
-                this.status = 'invoicing';
                 this.formData = formData;
-                this.addressIndex = 0;
+                this.status = 'invoicing';
-                this.errors = [];
+                //reset data
-                await this.invoiceClient();
+                for (const key in initInvoicing) {
+                    this[key] = initInvoicing[key];
+                }
+                this.invoiceClient();
             } catch (err) {
                 this.handleError(err);
             }
@@ -184,7 +187,6 @@ export const useInvoiceOutGlobalStore = defineStore({
         async invoiceClient() {
             if (this.invoicing || this.nRequests >= this.parallelism) return;
             const address = this.addresses[this.addressIndex];
-
             if (!address || !this.status || this.status == 'stopping') {
                 this.status = 'stopping';
                 this.invoicing = false;
@@ -192,6 +194,7 @@ export const useInvoiceOutGlobalStore = defineStore({
             }
             try {
                 this.invoicing = true;
+                this.nRequests++;
                 const params = {
                     clientId: address.clientId,
                     addressId: address.id,
@@ -215,6 +218,7 @@ export const useInvoiceOutGlobalStore = defineStore({
                 }
             } finally {
                 this.invoicing = false;
+                this.nRequests--;
                 this.addressIndex++;
                 this.invoiceClient();
             }