cypress.config.js

@@ -11,22 +11,12 @@ module.exports = defineConfig({
         video: false,
         specPattern: 'test/cypress/integration/**/*.spec.js',
         experimentalRunAllSpecs: true,
-        watchForFileChanges: true,
-        reporter: 'cypress-mochawesome-reporter',
-        reporterOptions: {
-            charts: true,
-            reportPageTitle: 'Cypress Inline Reporter',
-            embeddedScreenshots: true,
-            reportDir: 'test/cypress/reports',
-            inlineAssets: true,
-        },
         component: {
             componentFolder: 'src',
             testFiles: '**/*.spec.js',
             supportFile: 'test/cypress/support/unit.js',
         },
         setupNodeEvents(on, config) {
-            require('cypress-mochawesome-reporter/plugin')(on);
             // implement node event listeners here
         },
     },

package.json

@@ -1,17 +1,16 @@
 {
     "name": "salix-front",
-    "version": "24.50.0",
+    "version": "24.44.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
     "private": true,
     "packageManager": "pnpm@8.15.1",
     "scripts": {
-        "resetDatabase": "cd ../salix && gulp docker",
         "lint": "eslint --ext .js,.vue ./",
         "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
         "test:e2e": "cypress open",
-        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
+        "test:e2e:ci": "cd ../salix && gulp docker && cd ../salix-front && cypress run",
         "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
         "test:unit": "vitest",
         "test:unit:ci": "vitest run",
@@ -43,7 +42,6 @@
         "@vue/test-utils": "^2.4.4",
         "autoprefixer": "^10.4.14",
         "cypress": "^13.6.6",
-        "cypress-mochawesome-reporter": "^3.8.2",
         "eslint": "^8.41.0",
         "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-cypress": "^2.13.3",

pnpm-lock.yaml

@@ -70,9 +70,6 @@ devDependencies:
   cypress:
     specifier: ^13.6.6
     version: 13.6.6
-  cypress-mochawesome-reporter:
-    specifier: ^3.8.2
-    version: 3.8.2(cypress@13.6.6)(mocha@10.7.3)
   eslint:
     specifier: ^8.41.0
     version: 8.56.0
@@ -832,8 +829,8 @@ packages:
       vue-i18n:
         optional: true
     dependencies:
-      '@intlify/message-compiler': 10.0.0
+      '@intlify/message-compiler': 10.0.0-beta.5
-      '@intlify/shared': 10.0.0
+      '@intlify/shared': 10.0.0-beta.5
       jsonc-eslint-parser: 1.4.1
       source-map: 0.6.1
       vue-i18n: 9.9.1(vue@3.4.19)
@@ -847,11 +844,11 @@ packages:
       '@intlify/message-compiler': 9.9.1
       '@intlify/shared': 9.9.1
 
-  /@intlify/message-compiler@10.0.0:
+  /@intlify/message-compiler@10.0.0-beta.5:
-    resolution: {integrity: sha512-OcaWc63NC/9p1cMdgoNKBj4d61BH8sUW1Hfs6YijTd9656ZR4rNqXAlRnBrfS5ABq0vjQjpa8VnyvH9hK49yBw==}
+    resolution: {integrity: sha512-hLLchnM1dmtSEruerkzvU9vePsLqBXz3RU85SCx/Vd12fFQiymP+/5Rn9MJ8MyfLmIOLDEx4PRh+/GkIQP6oog==}
     engines: {node: '>= 16'}
     dependencies:
-      '@intlify/shared': 10.0.0
+      '@intlify/shared': 10.0.0-beta.5
       source-map-js: 1.0.2
     dev: true
 
@@ -862,8 +859,8 @@ packages:
       '@intlify/shared': 9.9.1
       source-map-js: 1.0.2
 
-  /@intlify/shared@10.0.0:
+  /@intlify/shared@10.0.0-beta.5:
-    resolution: {integrity: sha512-6ngLfI7DOTew2dcF9WMJx+NnMWghMBhIiHbGg+wRvngpzD5KZJZiJVuzMsUQE1a5YebEmtpTEfUrDp/NqVGdiw==}
+    resolution: {integrity: sha512-g9bq5Y1bOcC9qxtNk4UWtF3sXm6Wh0fGISb7vD5aLyF7yQv7ZFjxQjJzBP2GqG/9+PAGYutqjP1GGadNqFtyAQ==}
     engines: {node: '>= 16'}
     dev: true
 
@@ -887,7 +884,7 @@ packages:
         optional: true
     dependencies:
       '@intlify/bundle-utils': 4.0.0(vue-i18n@9.9.1)
-      '@intlify/shared': 10.0.0
+      '@intlify/shared': 10.0.0-beta.5
       '@rollup/pluginutils': 4.2.1
       '@vue/compiler-sfc': 3.4.19
       debug: 4.3.4(supports-color@8.1.1)
@@ -2002,10 +1999,6 @@ packages:
     dependencies:
       fill-range: 7.0.1
 
-  /browser-stdout@1.3.1:
-    resolution: {integrity: sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==}
-    dev: true
-
   /browserslist@4.23.0:
     resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
@@ -2113,16 +2106,6 @@ packages:
       upper-case: 1.1.3
     dev: true
 
-  /camelcase@5.3.1:
-    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /camelcase@6.3.0:
-    resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
-    engines: {node: '>=10'}
-    dev: true
-
   /camelcase@7.0.1:
     resolution: {integrity: sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==}
     engines: {node: '>=14.16'}
@@ -2272,22 +2255,6 @@ packages:
     engines: {node: '>= 10'}
     dev: true
 
-  /cliui@6.0.0:
-    resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
-    dependencies:
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wrap-ansi: 6.2.0
-    dev: true
-
-  /cliui@7.0.4:
-    resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
-    dependencies:
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wrap-ansi: 7.0.0
-    dev: true
-
   /cliui@8.0.1:
     resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
     engines: {node: '>=12'}
@@ -2591,23 +2558,6 @@ packages:
   /csstype@3.1.3:
     resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
 
-  /cypress-mochawesome-reporter@3.8.2(cypress@13.6.6)(mocha@10.7.3):
-    resolution: {integrity: sha512-oJZkNzhNmN9ZD+LmZyFuPb8aWaIijyHyqYh52YOBvR6B6ckfJNCHP3A98a+/nG0H4t46CKTNwo+wNpMa4d2kjA==}
-    engines: {node: '>=14'}
-    hasBin: true
-    peerDependencies:
-      cypress: '>=6.2.0'
-    dependencies:
-      commander: 10.0.1
-      cypress: 13.6.6
-      fs-extra: 10.1.0
-      mochawesome: 7.1.3(mocha@10.7.3)
-      mochawesome-merge: 4.3.0
-      mochawesome-report-generator: 6.2.0
-    transitivePeerDependencies:
-      - mocha
-    dev: true
-
   /cypress@13.6.6:
     resolution: {integrity: sha512-S+2S9S94611hXimH9a3EAYt81QM913ZVA03pUmGDfLTFa5gyp85NJ8dJGSlEAEmyRsYkioS1TtnWtbv/Fzt11A==}
     engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}
@@ -2677,10 +2627,6 @@ packages:
       time-zone: 1.0.0
     dev: true
 
-  /dateformat@4.6.3:
-    resolution: {integrity: sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==}
-    dev: true
-
   /dayjs@1.11.10:
     resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==}
     dev: true
@@ -2730,29 +2676,6 @@ packages:
       ms: 2.1.2
       supports-color: 8.1.1
 
-  /debug@4.3.7(supports-color@8.1.1):
-    resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.3
-      supports-color: 8.1.1
-    dev: true
-
-  /decamelize@1.2.0:
-    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /decamelize@4.0.0:
-    resolution: {integrity: sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==}
-    engines: {node: '>=10'}
-    dev: true
-
   /decompress-response@6.0.0:
     resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
     engines: {node: '>=10'}
@@ -2835,11 +2758,6 @@ packages:
     resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==}
     engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
 
-  /diff@5.2.0:
-    resolution: {integrity: sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==}
-    engines: {node: '>=0.3.1'}
-    dev: true
-
   /doctrine@3.0.0:
     resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
     engines: {node: '>=6.0.0'}
@@ -3632,14 +3550,6 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /find-up@4.1.0:
-    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
-    engines: {node: '>=8'}
-    dependencies:
-      locate-path: 5.0.0
-      path-exists: 4.0.0
-    dev: true
-
   /find-up@5.0.0:
     resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
     engines: {node: '>=10'}
@@ -3736,15 +3646,6 @@ packages:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
     dev: true
 
-  /fs-extra@10.1.0:
-    resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
-    engines: {node: '>=12'}
-    dependencies:
-      graceful-fs: 4.2.11
-      jsonfile: 6.1.0
-      universalify: 2.0.1
-    dev: true
-
   /fs-extra@11.2.0:
     resolution: {integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==}
     engines: {node: '>=14.14'}
@@ -3753,15 +3654,6 @@ packages:
       jsonfile: 6.1.0
       universalify: 2.0.1
 
-  /fs-extra@7.0.1:
-    resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
-    engines: {node: '>=6 <7 || >=8'}
-    dependencies:
-      graceful-fs: 4.2.11
-      jsonfile: 4.0.0
-      universalify: 0.1.2
-    dev: true
-
   /fs-extra@9.1.0:
     resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
     engines: {node: '>=10'}
@@ -3783,10 +3675,6 @@ packages:
     dev: true
     optional: true
 
-  /fsu@1.1.1:
-    resolution: {integrity: sha512-xQVsnjJ/5pQtcKh+KjUoZGzVWn4uNkchxTF6Lwjr4Gf7nQr8fmUfhKJ62zE77+xQg9xnxi5KUps7XGs+VC986A==}
-    dev: true
-
   /function-bind@1.1.2:
     resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
 
@@ -3887,18 +3775,6 @@ packages:
       once: 1.4.0
       path-is-absolute: 1.0.1
 
-  /glob@8.1.0:
-    resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
-    engines: {node: '>=12'}
-    deprecated: Glob versions prior to v9 are no longer supported
-    dependencies:
-      fs.realpath: 1.0.0
-      inflight: 1.0.6
-      inherits: 2.0.4
-      minimatch: 5.1.6
-      once: 1.4.0
-    dev: true
-
   /global-directory@4.0.1:
     resolution: {integrity: sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==}
     engines: {node: '>=18'}
@@ -4313,11 +4189,6 @@ packages:
     resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
     engines: {node: '>=8'}
 
-  /is-plain-obj@2.1.0:
-    resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==}
-    engines: {node: '>=8'}
-    dev: true
-
   /is-plain-obj@3.0.0:
     resolution: {integrity: sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==}
     engines: {node: '>=10'}
@@ -4490,12 +4361,6 @@ packages:
     resolution: {integrity: sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==}
     dev: true
 
-  /jsonfile@4.0.0:
-    resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
-    optionalDependencies:
-      graceful-fs: 4.2.11
-    dev: true
-
   /jsonfile@6.1.0:
     resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
     dependencies:
@@ -4587,13 +4452,6 @@ packages:
     engines: {node: '>=14'}
     dev: true
 
-  /locate-path@5.0.0:
-    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
-    engines: {node: '>=8'}
-    dependencies:
-      p-locate: 4.1.0
-    dev: true
-
   /locate-path@6.0.0:
     resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
     engines: {node: '>=10'}
@@ -4628,26 +4486,10 @@ packages:
     resolution: {integrity: sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==}
     dev: true
 
-  /lodash.isempty@4.4.0:
-    resolution: {integrity: sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg==}
-    dev: true
-
-  /lodash.isfunction@3.0.9:
-    resolution: {integrity: sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==}
-    dev: true
-
-  /lodash.isobject@3.0.2:
-    resolution: {integrity: sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==}
-    dev: true
-
   /lodash.isplainobject@4.0.6:
     resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
     dev: true
 
-  /lodash.isstring@4.0.1:
-    resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}
-    dev: true
-
   /lodash.kebabcase@4.1.1:
     resolution: {integrity: sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==}
     dev: true
@@ -4710,13 +4552,6 @@ packages:
       wrap-ansi: 6.2.0
     dev: true
 
-  /loose-envify@1.4.0:
-    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
-    hasBin: true
-    dependencies:
-      js-tokens: 4.0.0
-    dev: true
-
   /loupe@2.3.7:
     resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}
     dependencies:
@@ -4887,79 +4722,6 @@ packages:
       ufo: 1.4.0
     dev: true
 
-  /mocha@10.7.3:
-    resolution: {integrity: sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==}
-    engines: {node: '>= 14.0.0'}
-    hasBin: true
-    dependencies:
-      ansi-colors: 4.1.3
-      browser-stdout: 1.3.1
-      chokidar: 3.6.0
-      debug: 4.3.7(supports-color@8.1.1)
-      diff: 5.2.0
-      escape-string-regexp: 4.0.0
-      find-up: 5.0.0
-      glob: 8.1.0
-      he: 1.2.0
-      js-yaml: 4.1.0
-      log-symbols: 4.1.0
-      minimatch: 5.1.6
-      ms: 2.1.3
-      serialize-javascript: 6.0.2
-      strip-json-comments: 3.1.1
-      supports-color: 8.1.1
-      workerpool: 6.5.1
-      yargs: 16.2.0
-      yargs-parser: 20.2.9
-      yargs-unparser: 2.0.0
-    dev: true
-
-  /mochawesome-merge@4.3.0:
-    resolution: {integrity: sha512-1roR6g+VUlfdaRmL8dCiVpKiaUhbPVm1ZQYUM6zHX46mWk+tpsKVZR6ba98k2zc8nlPvYd71yn5gyH970pKBSw==}
-    engines: {node: '>=10.0.0'}
-    hasBin: true
-    dependencies:
-      fs-extra: 7.0.1
-      glob: 7.2.3
-      yargs: 15.4.1
-    dev: true
-
-  /mochawesome-report-generator@6.2.0:
-    resolution: {integrity: sha512-Ghw8JhQFizF0Vjbtp9B0i//+BOkV5OWcQCPpbO0NGOoxV33o+gKDYU0Pr2pGxkIHnqZ+g5mYiXF7GMNgAcDpSg==}
-    hasBin: true
-    dependencies:
-      chalk: 4.1.2
-      dateformat: 4.6.3
-      escape-html: 1.0.3
-      fs-extra: 10.1.0
-      fsu: 1.1.1
-      lodash.isfunction: 3.0.9
-      opener: 1.5.2
-      prop-types: 15.8.1
-      tcomb: 3.2.29
-      tcomb-validation: 3.4.1
-      validator: 13.11.0
-      yargs: 17.7.2
-    dev: true
-
-  /mochawesome@7.1.3(mocha@10.7.3):
-    resolution: {integrity: sha512-Vkb3jR5GZ1cXohMQQ73H3cZz7RoxGjjUo0G5hu0jLaW+0FdUxUwg3Cj29bqQdh0rFcnyV06pWmqmi5eBPnEuNQ==}
-    peerDependencies:
-      mocha: '>=7'
-    dependencies:
-      chalk: 4.1.2
-      diff: 5.2.0
-      json-stringify-safe: 5.0.1
-      lodash.isempty: 4.4.0
-      lodash.isfunction: 3.0.9
-      lodash.isobject: 3.0.2
-      lodash.isstring: 4.0.1
-      mocha: 10.7.3
-      mochawesome-report-generator: 6.2.0
-      strip-ansi: 6.0.1
-      uuid: 8.3.2
-    dev: true
-
   /ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
 
@@ -5108,11 +4870,6 @@ packages:
       is-wsl: 2.2.0
     dev: false
 
-  /opener@1.5.2:
-    resolution: {integrity: sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==}
-    hasBin: true
-    dev: true
-
   /optionator@0.9.3:
     resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
     engines: {node: '>= 0.8.0'}
@@ -5158,13 +4915,6 @@ packages:
     engines: {node: '>=12.20'}
     dev: false
 
-  /p-limit@2.3.0:
-    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
-    engines: {node: '>=6'}
-    dependencies:
-      p-try: 2.2.0
-    dev: true
-
   /p-limit@3.1.0:
     resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
     engines: {node: '>=10'}
@@ -5179,13 +4929,6 @@ packages:
       yocto-queue: 1.0.0
     dev: true
 
-  /p-locate@4.1.0:
-    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
-    engines: {node: '>=8'}
-    dependencies:
-      p-limit: 2.3.0
-    dev: true
-
   /p-locate@5.0.0:
     resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
     engines: {node: '>=10'}
@@ -5207,11 +4950,6 @@ packages:
       aggregate-error: 3.1.0
     dev: true
 
-  /p-try@2.2.0:
-    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
-    engines: {node: '>=6'}
-    dev: true
-
   /package-json@8.1.1:
     resolution: {integrity: sha512-cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA==}
     engines: {node: '>=14.16'}
@@ -5401,14 +5139,6 @@ packages:
     engines: {node: '>=0.4.0'}
     dev: false
 
-  /prop-types@15.8.1:
-    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
-    dependencies:
-      loose-envify: 1.4.0
-      object-assign: 4.1.1
-      react-is: 16.13.1
-    dev: true
-
   /proto-list@1.2.4:
     resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
 
@@ -5512,10 +5242,6 @@ packages:
       strip-json-comments: 2.0.1
     dev: false
 
-  /react-is@16.13.1:
-    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
-    dev: true
-
   /react-is@17.0.2:
     resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
     dev: true
@@ -5602,10 +5328,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /require-main-filename@2.0.0:
-    resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
-    dev: true
-
   /requires-port@1.0.0:
     resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
 
@@ -5851,10 +5573,6 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /set-blocking@2.0.0:
-    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
-    dev: true
-
   /set-function-length@1.2.1:
     resolution: {integrity: sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==}
     engines: {node: '>= 0.4'}
@@ -6111,16 +5829,6 @@ packages:
       readable-stream: 3.6.2
     dev: true
 
-  /tcomb-validation@3.4.1:
-    resolution: {integrity: sha512-urVVMQOma4RXwiVCa2nM2eqrAomHROHvWPuj6UkDGz/eb5kcy0x6P0dVt6kzpUZtYMNoAqJLWmz1BPtxrtjtrA==}
-    dependencies:
-      tcomb: 3.2.29
-    dev: true
-
-  /tcomb@3.2.29:
-    resolution: {integrity: sha512-di2Hd1DB2Zfw6StGv861JoAF5h/uQVu/QJp2g8KVbtfKnoHdBQl5M32YWq6mnSYBQ1vFFrns5B1haWJL7rKaOQ==}
-    dev: true
-
   /text-extensions@2.4.0:
     resolution: {integrity: sha512-te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g==}
     engines: {node: '>=8'}
@@ -6340,11 +6048,6 @@ packages:
       crypto-random-string: 4.0.0
     dev: false
 
-  /universalify@0.1.2:
-    resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
-    engines: {node: '>= 4.0.0'}
-    dev: true
-
   /universalify@0.2.0:
     resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
     engines: {node: '>= 4.0.0'}
@@ -6434,6 +6137,7 @@ packages:
   /validator@13.11.0:
     resolution: {integrity: sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==}
     engines: {node: '>= 0.10'}
+    dev: false
 
   /vary@1.1.2:
     resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
@@ -6780,10 +6484,6 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
-  /which-module@2.0.1:
-    resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==}
-    dev: true
-
   /which@2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
     engines: {node: '>= 8'}
@@ -6811,10 +6511,6 @@ packages:
     resolution: {integrity: sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==}
     dev: true
 
-  /workerpool@6.5.1:
-    resolution: {integrity: sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==}
-    dev: true
-
   /wrap-ansi@6.2.0:
     resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
     engines: {node: '>=8'}
@@ -6863,10 +6559,6 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
-  /y18n@4.0.3:
-    resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
-    dev: true
-
   /y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
@@ -6892,64 +6584,11 @@ packages:
     engines: {node: '>= 6'}
     dev: true
 
-  /yargs-parser@18.1.3:
-    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
-    engines: {node: '>=6'}
-    dependencies:
-      camelcase: 5.3.1
-      decamelize: 1.2.0
-    dev: true
-
-  /yargs-parser@20.2.9:
-    resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
-    engines: {node: '>=10'}
-    dev: true
-
   /yargs-parser@21.1.1:
     resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
     engines: {node: '>=12'}
     dev: true
 
-  /yargs-unparser@2.0.0:
-    resolution: {integrity: sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==}
-    engines: {node: '>=10'}
-    dependencies:
-      camelcase: 6.3.0
-      decamelize: 4.0.0
-      flat: 5.0.2
-      is-plain-obj: 2.1.0
-    dev: true
-
-  /yargs@15.4.1:
-    resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
-    engines: {node: '>=8'}
-    dependencies:
-      cliui: 6.0.0
-      decamelize: 1.2.0
-      find-up: 4.1.0
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      require-main-filename: 2.0.0
-      set-blocking: 2.0.0
-      string-width: 4.2.3
-      which-module: 2.0.1
-      y18n: 4.0.3
-      yargs-parser: 18.1.3
-    dev: true
-
-  /yargs@16.2.0:
-    resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
-    engines: {node: '>=10'}
-    dependencies:
-      cliui: 7.0.4
-      escalade: 3.1.2
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      string-width: 4.2.3
-      y18n: 5.0.8
-      yargs-parser: 20.2.9
-    dev: true
-
   /yargs@17.7.2:
     resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
     engines: {node: '>=12'}

src/components/CreateBankEntityForm.vue

@@ -9,6 +9,8 @@ import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
 import { useState } from 'src/composables/useState';
 
+defineProps({ showEntityField: { type: Boolean, default: true } });
+
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
 const bicInputRef = ref(null);
@@ -16,16 +18,17 @@ const state = useState();
 
 const customer = computed(() => state.get('customer'));
 
-const countriesFilter = {
-    fields: ['id', 'name', 'code'],
-};
-
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
     countryFk: customer.value?.countryFk,
+    id: null,
 });
 
+const countriesFilter = {
+    fields: ['id', 'name', 'code'],
+};
+
 const countriesOptions = ref([]);
 
 const onDataSaved = (...args) => {
@@ -41,6 +44,7 @@ onMounted(async () => {
 <template>
     <FetchData
         url="Countries"
+        :filter="countriesFilter"
         auto-load
         @on-fetch="(data) => (countriesOptions = data)"
     />
@@ -50,7 +54,6 @@ onMounted(async () => {
         :title="t('title')"
         :subtitle="t('subtitle')"
         :form-initial-data="bankEntityFormData"
-        :filter="countriesFilter"
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">
@@ -82,13 +85,7 @@ onMounted(async () => {
                         :rules="validate('bankEntity.countryFk')"
                     />
                 </div>
-                <div
+                <div v-if="showEntityField" class="col">
-                    v-if="
-                        countriesOptions.find((c) => c.id === data.countryFk)?.code ==
-                        'ES'
-                    "
-                    class="col"
-                >
                     <VnInput
                         :label="t('id')"
                         v-model="data.id"

src/components/CreateManualInvoiceForm.vue

@@ -0,0 +1,155 @@
+<script setup>
+import { reactive, ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModelPopup from './FormModelPopup.vue';
+import VnInputDate from './common/VnInputDate.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+const router = useRouter();
+
+const manualInvoiceFormData = reactive({
+    maxShipped: Date.vnNew(),
+});
+
+const formModelPopupRef = ref();
+const invoiceOutSerialsOptions = ref([]);
+const taxAreasOptions = ref([]);
+const ticketsOptions = ref([]);
+const clientsOptions = ref([]);
+const isLoading = computed(() => formModelPopupRef.value?.isLoading);
+
+const onDataSaved = async (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
+    if (requestResponse && requestResponse.id)
+        router.push({ name: 'InvoiceOutSummary', params: { id: requestResponse.id } });
+};
+</script>
+
+<template>
+    <FetchData
+        url="InvoiceOutSerials"
+        :filter="{ where: { code: { neq: 'R' } }, order: ['code'] }"
+        @on-fetch="(data) => (invoiceOutSerialsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="TaxAreas"
+        :filter="{ order: ['code'] }"
+        @on-fetch="(data) => (taxAreasOptions = data)"
+        auto-load
+    />
+    <FormModelPopup
+        ref="formModelPopupRef"
+        :title="t('Create manual invoice')"
+        url-create="InvoiceOuts/createManualInvoice"
+        model="invoiceOut"
+        :form-initial-data="manualInvoiceFormData"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data }">
+            <span v-if="isLoading" class="text-primary invoicing-text">
+                <QIcon name="warning" class="fill-icon q-mr-sm" size="md" />
+                {{ t('Invoicing in progress...') }}
+            </span>
+            <VnRow>
+                <VnSelect
+                    :label="t('Ticket')"
+                    :options="ticketsOptions"
+                    hide-selected
+                    option-label="id"
+                    option-value="id"
+                    v-model="data.ticketFk"
+                    @update:model-value="data.clientFk = null"
+                    url="Tickets"
+                    :where="{ refFk: null }"
+                    :fields="['id', 'nickname']"
+                    :filter-options="{ order: 'shipped DESC' }"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <span class="row items-center" style="max-width: max-content">{{
+                    t('Or')
+                }}</span>
+                <VnSelect
+                    :label="t('Client')"
+                    :options="clientsOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.clientFk"
+                    @update:model-value="data.ticketFk = null"
+                    url="Clients"
+                    :fields="['id', 'name']"
+                    :filter-options="{ order: 'name ASC' }"
+                />
+                <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
+            </VnRow>
+            <VnRow>
+                <VnSelect
+                    :label="t('Serial')"
+                    :options="invoiceOutSerialsOptions"
+                    hide-selected
+                    option-label="description"
+                    option-value="code"
+                    v-model="data.serial"
+                />
+                <VnSelect
+                    :label="t('Area')"
+                    :options="taxAreasOptions"
+                    hide-selected
+                    option-label="code"
+                    option-value="code"
+                    v-model="data.taxArea"
+                />
+            </VnRow>
+            <VnRow>
+                <VnInput
+                    :label="t('Reference')"
+                    type="textarea"
+                    v-model="data.reference"
+                    fill-input
+                    autogrow
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<style lang="scss" scoped>
+.invoicing-text {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: $primary;
+    font-size: 24px;
+    margin-bottom: 8px;
+}
+</style>
+
+<i18n>
+es:
+    Create manual invoice: Crear factura manual
+    Ticket: Ticket
+    Client: Cliente
+    Max date: Fecha límite
+    Serial: Serie
+    Area: Area
+    Reference: Referencia
+    Or: O
+    Invoicing in progress...: Facturación en progreso...
+</i18n>

src/components/CreateThermographForm.vue

@@ -38,7 +38,7 @@ const onDataSaved = (dataSaved) => {
         @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
         url="Warehouses"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
     />
     <FetchData
         @on-fetch="(data) => (temperaturesOptions = data)"

src/components/CrudModel.vue

@@ -77,7 +77,7 @@ const isLoading = ref(false);
 const hasChanges = ref(false);
 const originalData = ref();
 const vnPaginateRef = ref();
-const formData = ref([]);
+const formData = ref();
 const saveButtonRef = ref(null);
 const watchChanges = ref();
 const formUrl = computed(() => $props.url);
@@ -394,7 +394,6 @@ watch(formUrl, async () => {
                 @click="onSubmit"
                 :disable="!hasChanges"
                 :title="t('globals.save')"
-                data-cy="crudModelDefaultSaveBtn"
             />
             <slot name="moreAfterActions" />
         </QBtnGroup>

src/components/FilterItemForm.vue

@@ -50,25 +50,25 @@ const loading = ref(false);
 
 const tableColumns = computed(() => [
     {
-        label: t('globals.id'),
+        label: t('entry.buys.id'),
         name: 'id',
         field: 'id',
         align: 'left',
     },
     {
-        label: t('globals.name'),
+        label: t('entry.buys.name'),
         name: 'name',
         field: 'name',
         align: 'left',
     },
     {
-        label: t('globals.size'),
+        label: t('entry.buys.size'),
         name: 'size',
         field: 'size',
         align: 'left',
     },
     {
-        label: t('globals.producer'),
+        label: t('entry.buys.producer'),
         name: 'producerName',
         field: 'producer',
         align: 'left',
@@ -152,10 +152,10 @@ const selectItem = ({ id }) => {
             </span>
             <h1 class="title">{{ t('Filter item') }}</h1>
             <VnRow>
-                <VnInput :label="t('globals.name')" v-model="itemFilterParams.name" />
+                <VnInput :label="t('entry.buys.name')" v-model="itemFilterParams.name" />
                 <VnInput :label="t('entry.buys.size')" v-model="itemFilterParams.size" />
                 <VnSelect
-                    :label="t('globals.producer')"
+                    :label="t('entry.buys.producer')"
                     :options="producersOptions"
                     hide-selected
                     option-label="name"
@@ -163,7 +163,7 @@ const selectItem = ({ id }) => {
                     v-model="itemFilterParams.producerFk"
                 />
                 <VnSelect
-                    :label="t('globals.type')"
+                    :label="t('entry.buys.type')"
                     :options="ItemTypesOptions"
                     hide-selected
                     option-label="name"

src/components/FilterTravelForm.vue

@@ -48,13 +48,13 @@ const loading = ref(false);
 
 const tableColumns = computed(() => [
     {
-        label: t('globals.id'),
+        label: t('entry.basicData.id'),
         name: 'id',
         field: 'id',
         align: 'left',
     },
     {
-        label: t('globals.warehouseOut'),
+        label: t('entry.basicData.warehouseOut'),
         name: 'warehouseOutFk',
         field: 'warehouseOutFk',
         align: 'left',
@@ -62,7 +62,7 @@ const tableColumns = computed(() => [
             warehousesOptions.value.find((warehouse) => warehouse.id === val).name,
     },
     {
-        label: t('globals.warehouseIn'),
+        label: t('entry.basicData.warehouseIn'),
         name: 'warehouseInFk',
         field: 'warehouseInFk',
         align: 'left',
@@ -70,14 +70,14 @@ const tableColumns = computed(() => [
             warehousesOptions.value.find((warehouse) => warehouse.id === val).name,
     },
     {
-        label: t('globals.shipped'),
+        label: t('entry.basicData.shipped'),
         name: 'shipped',
         field: 'shipped',
         align: 'left',
         format: (val) => toDate(val),
     },
     {
-        label: t('globals.landed'),
+        label: t('entry.basicData.landed'),
         name: 'landed',
         field: 'landed',
         align: 'left',
@@ -146,7 +146,7 @@ const selectTravel = ({ id }) => {
             <h1 class="title">{{ t('Filter travels') }}</h1>
             <VnRow>
                 <VnSelect
-                    :label="t('globals.agency')"
+                    :label="t('entry.basicData.agency')"
                     :options="agenciesOptions"
                     hide-selected
                     option-label="name"
@@ -154,7 +154,7 @@ const selectTravel = ({ id }) => {
                     v-model="travelFilterParams.agencyModeFk"
                 />
                 <VnSelect
-                    :label="t('globals.warehouseOut')"
+                    :label="t('entry.basicData.warehouseOut')"
                     :options="warehousesOptions"
                     hide-selected
                     option-label="name"
@@ -162,7 +162,7 @@ const selectTravel = ({ id }) => {
                     v-model="travelFilterParams.warehouseOutFk"
                 />
                 <VnSelect
-                    :label="t('globals.warehouseIn')"
+                    :label="t('entry.basicData.warehouseIn')"
                     :options="warehousesOptions"
                     hide-selected
                     option-label="name"
@@ -170,11 +170,11 @@ const selectTravel = ({ id }) => {
                     v-model="travelFilterParams.warehouseInFk"
                 />
                 <VnInputDate
-                    :label="t('globals.shipped')"
+                    :label="t('entry.basicData.shipped')"
                     v-model="travelFilterParams.shipped"
                 />
                 <VnInputDate
-                    :label="t('globals.landed')"
+                    :label="t('entry.basicData.landed')"
                     v-model="travelFilterParams.landed"
                 />
             </VnRow>

src/components/FormModel.vue

@@ -272,7 +272,6 @@ defineExpose({
     hasChanges,
     reset,
     fetch,
-    formData,
 });
 </script>
 <template>

src/components/ItemsFilterPanel.vue

@@ -248,7 +248,7 @@ const removeTag = (index, params, search) => {
             >
                 <QItemSection class="col">
                     <VnSelect
-                        :label="t('globals.tag')"
+                        :label="t('components.itemsFilterPanel.tag')"
                         v-model="value.selectedTag"
                         :options="tagOptions"
                         option-label="name"

src/components/LeftMenu.vue

@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, watch, ref, reactive, computed } from 'vue';
+import { onMounted, watch, ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { QSeparator, useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
@@ -9,7 +9,6 @@ import { toLowerCamel } from 'src/filters';
 import routes from 'src/router/modules';
 import LeftMenuItem from './LeftMenuItem.vue';
 import LeftMenuItemGroup from './LeftMenuItemGroup.vue';
-import VnInput from './common/VnInput.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -22,52 +21,17 @@ const props = defineProps({
         default: 'main',
     },
 });
-const initialized = ref(false);
+
-const items = ref([]);
 const expansionItemElements = reactive({});
-const pinnedModules = computed(() => {
-    const map = new Map();
-    items.value.forEach((item) => item.isPinned && map.set(item.name, item));
-    return map;
-});
-const search = ref(null);
-
-const filteredItems = computed(() => {
-    if (!search.value) return items.value;
-    const normalizedSearch = normalize(search.value);
-    return items.value.filter((item) => {
-        const locale = normalize(t(item.title));
-        return locale.includes(normalizedSearch);
-    });
-});
-
-const filteredPinnedModules = computed(() => {
-    if (!search.value) return pinnedModules.value;
-    const normalizedSearch = search.value
-        .normalize('NFD')
-        .replace(/[\u0300-\u036f]/g, '')
-        .toLowerCase();
-    const map = new Map();
-    for (const [key, pinnedModule] of pinnedModules.value) {
-        const locale = t(pinnedModule.title)
-            .normalize('NFD')
-            .replace(/[\u0300-\u036f]/g, '')
-            .toLowerCase();
-        if (locale.includes(normalizedSearch)) map.set(key, pinnedModule);
-    }
-    return map;
-});
 
 onMounted(async () => {
     await navigation.fetchPinned();
     getRoutes();
-    initialized.value = true;
 });
 
 watch(
     () => route.matched,
     () => {
-        if (!initialized.value) return;
         items.value = [];
         getRoutes();
     },
@@ -102,6 +66,8 @@ function addChildren(module, route, parent) {
     }
 }
 
+const items = ref([]);
+
 function getRoutes() {
     if (props.source === 'main') {
         const modules = Object.assign([], navigation.getModules().value);
@@ -157,57 +123,21 @@ async function togglePinned(item, event) {
 const handleItemExpansion = (itemName) => {
     expansionItemElements[itemName].scrollToLastElement();
 };
-
-function normalize(text) {
-    return text
-        .normalize('NFD')
-        .replace(/[\u0300-\u036f]/g, '')
-        .toLowerCase();
-}
 </script>
 
 <template>
     <QList padding class="column-max-width">
         <template v-if="$props.source === 'main'">
             <template v-if="$route?.matched[1]?.name === 'Dashboard'">
-                <QItem class="q-pb-md">
+                <QItem class="header">
-                    <VnInput
+                    <QItemSection avatar>
-                        v-model="search"
+                        <QIcon name="view_module" />
-                        :label="t('Search modules')"
+                    </QItemSection>
-                        class="full-width"
+                    <QItemSection> {{ t('globals.modules') }}</QItemSection>
-                        filled
-                        dense
-                    />
                 </QItem>
                 <QSeparator />
-                <template v-if="filteredPinnedModules.size">
+                <template v-for="item in items" :key="item.name">
-                    <LeftMenuItem
+                    <template v-if="item.children">
-                        v-for="[key, pinnedModule] of filteredPinnedModules"
-                        :key="key"
-                        :item="pinnedModule"
-                        group="modules"
-                    >
-                        <template #side>
-                            <QBtn
-                                v-if="pinnedModule.isPinned === true"
-                                @click="togglePinned(pinnedModule, $event)"
-                                icon="remove_circle"
-                                size="xs"
-                                flat
-                                round
-                            >
-                                <QTooltip>
-                                    {{ t('components.leftMenu.removeFromPinned') }}
-                                </QTooltip>
-                            </QBtn>
-                        </template>
-                    </LeftMenuItem>
-                    <QSeparator />
-                </template>
-                <template v-for="item in filteredItems" :key="item.name">
-                    <template
-                        v-if="item.children && !filteredPinnedModules.has(item.name)"
-                    >
                         <LeftMenuItem :item="item" group="modules">
                             <template #side>
                                 <QBtn
@@ -326,7 +256,3 @@ function normalize(text) {
     color: var(--vn-label-color);
 }
 </style>
-<i18n>
-    es:
-        Search modules: Buscar módulos
-</i18n>

src/components/TicketProblems.vue

@@ -1,40 +0,0 @@
-<script setup>
-defineProps({ row: { type: Object, required: true } });
-</script>
-<template>
-    <span>
-        <QIcon
-            v-if="row.isTaxDataChecked === 0"
-            name="vn:no036"
-            color="primary"
-            size="xs"
-        >
-            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.hasTicketRequest" name="vn:buyrequest" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.itemShortage" name="vn:unavailable" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.isFreezed" name="vn:frozen" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="row.risk"
-            name="vn:risk"
-            :color="row.hasHighRisk ? 'negative' : 'primary'"
-            size="xs"
-        >
-            <QTooltip>
-                {{ $t('salesTicketsTable.risk') }}: {{ row.risk - row.credit }}
-            </QTooltip>
-        </QIcon>
-        <QIcon v-if="row.hasComponentLack" name="vn:components" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
-        </QIcon>
-    </span>
-</template>

src/components/VnTable/VnFilter.vue

@@ -25,7 +25,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'table',
+        default: 'params',
     },
 });
 
@@ -143,10 +143,6 @@ function alignRow() {
 const showFilter = computed(
     () => $props.column?.columnFilter !== false && $props.column.name != 'tableActions'
 );
-
-const onTabPressed = async () => {
-    if (model.value) enterEvent['keyup.enter']();
-};
 </script>
 <template>
     <div
@@ -161,7 +157,6 @@ const onTabPressed = async () => {
             v-model="model"
             :components="components"
             component-prop="columnFilter"
-            @keydown.tab="onTabPressed"
         />
     </div>
 </template>

src/components/VnTable/VnOrder.vue

@@ -17,7 +17,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'table',
+        default: 'params',
     },
     vertical: {
         type: Boolean,

src/components/VnTable/VnTable.vue

@@ -62,7 +62,7 @@ const $props = defineProps({
         default: 'flex-one',
     },
     searchUrl: {
-        type: [String, Boolean],
+        type: String,
         default: 'table',
     },
     isEditable: {
@@ -162,7 +162,9 @@ onMounted(() => {
             : $props.defaultMode;
     stateStore.rightDrawer = quasar.screen.gt.xs;
     columnsVisibilitySkipped.value = [
-        ...splittedColumns.value.columns.filter((c) => !c.visible).map((c) => c.name),
+        ...splittedColumns.value.columns
+            .filter((c) => c.visible == false)
+            .map((c) => c.name),
         ...['tableActions'],
     ];
     createForm.value = $props.create;
@@ -235,7 +237,7 @@ function splitColumns(columns) {
         if (col.create) splittedColumns.value.create.push(col);
         if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
         if ($props.isEditable && col.disable == null) col.disable = false;
-        if ($props.useModel && col.columnFilter !== false)
+        if ($props.useModel && col.columnFilter != false)
             col.columnFilter = { inWhere: true, ...col.columnFilter };
         splittedColumns.value.columns.push(col);
     }
@@ -324,27 +326,11 @@ function handleOnDataSaved(_) {
 }
 
 function handleScroll() {
-    if ($props.crudModel.disableInfiniteScroll) return;
-
     const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
     const { scrollHeight, scrollTop, clientHeight } = tMiddle;
     const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
     if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
 }
-
-function handleSelection({ evt, added, rows: selectedRows }, rows) {
-    if (evt?.shiftKey && added) {
-        const rowIndex = selectedRows[0].$index;
-        const selectedIndexes = new Set(selected.value.map((row) => row.$index));
-        for (const row of rows) {
-            if (row.$index == rowIndex) break;
-            if (!selectedIndexes.has(row.$index)) {
-                selected.value.push(row);
-                selectedIndexes.add(row.$index);
-            }
-        }
-    }
-}
 </script>
 <template>
     <QDrawer
@@ -394,7 +380,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                             :name="col.orderBy ?? col.name"
                             :data-key="$attrs['data-key']"
                             :search-url="searchUrl"
-                            :vertical="false"
+                            :vertical="true"
                         />
                     </div>
                     <slot
@@ -445,7 +431,6 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                 @virtual-scroll="handleScroll"
                 @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
                 @update:selected="emit('update:selected', $event)"
-                @selection="(details) => handleSelection(details, rows)"
             >
                 <template #top-left v-if="!$props.withoutHeader">
                     <slot name="top-left"></slot>
@@ -737,7 +722,6 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
             fab
             icon="add"
             shortcut="+"
-            data-cy="vnTableCreateBtn"
         />
         <QTooltip self="top right">
             {{ createForm?.title }}

src/components/common/VnDms.vue

@@ -31,10 +31,6 @@ const $props = defineProps({
         type: String,
         default: null,
     },
-    description: {
-        type: String,
-        default: null,
-    },
 });
 
 const warehouses = ref();
@@ -47,8 +43,7 @@ const dms = ref({});
 onMounted(() => {
     defaultData();
     if (!$props.formInitialData)
-        dms.value.description =
+        dms.value.description = t($props.model + 'Description', dms.value);
-            $props.description ?? t($props.model + 'Description', dms.value);
 });
 function onFileChange(files) {
     dms.value.hasFileAttached = !!files;
@@ -59,6 +54,7 @@ function mapperDms(data) {
     const formData = new FormData();
     const { files } = data;
     if (files) formData.append(files?.name, files);
+    delete data.files;
 
     const dms = {
         hasFile: !!data.hasFile,
@@ -82,7 +78,6 @@ async function save() {
     const body = mapperDms(dms.value);
     const response = await axios.post(getUrl(), body[0], body[1]);
     emit('onDataSaved', body[1].params, response);
-    delete dms.value.files;
     return response;
 }
 
@@ -163,14 +158,13 @@ function addDefaultData(data) {
                 />
                 <QFile
                     ref="inputFileRef"
-                    :label="t('globals.file')"
+                    :label="t('entry.buys.file')"
                     v-model="dms.files"
                     :multiple="false"
                     :accept="allowedContentTypes"
                     @update:model-value="onFileChange(dms.files)"
                     class="required"
                     :display-value="dms.file"
-                    data-cy="VnDms_inputFile"
                 >
                     <template #append>
                         <QIcon

src/components/common/VnInput.vue

@@ -1,11 +1,8 @@
 <script setup>
-import { computed, ref, useAttrs } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRequired } from 'src/composables/useRequired';
+import { useValidator } from 'src/composables/useValidator';
 
-const $attrs = useAttrs();
-const { isRequired, requiredFieldRule } = useRequired($attrs);
-const { t } = useI18n();
 const emit = defineEmits([
     'update:modelValue',
     'update:options',
@@ -30,11 +27,11 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
-    emptyToNull: {
-        type: Boolean,
-        default: true,
-    },
 });
+const { validations } = useValidator();
+
+const { t } = useI18n();
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
 
 const vnInputRef = ref(null);
 const value = computed({
@@ -42,7 +39,6 @@ const value = computed({
         return $props.modelValue;
     },
     set(value) {
-        if ($props.emptyToNull && value === '') value = null;
         emit('update:modelValue', value);
     },
 });
@@ -64,6 +60,8 @@ const focus = () => {
 defineExpose({
     focus,
 });
+import { useAttrs } from 'vue';
+const $attrs = useAttrs();
 
 const mixinRules = [
     requiredFieldRule,
@@ -87,7 +85,7 @@ const mixinRules = [
             v-model="value"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :type="$attrs.type"
-            :class="{ required: isRequired }"
+            :class="{ required: $attrs.required }"
             @keyup.enter="emit('keyup.enter')"
             :clearable="false"
             :rules="mixinRules"
@@ -101,13 +99,7 @@ const mixinRules = [
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="
+                    v-if="hover && value && !$attrs.disabled && $props.clearable"
-                        hover &&
-                        value &&
-                        !$attrs.disabled &&
-                        !$attrs.readonly &&
-                        $props.clearable
-                    "
                     @click="
                         () => {
                             value = null;

src/components/common/VnInputDate.vue

@@ -1,15 +1,11 @@
 <script setup>
-import { onMounted, watch, computed, ref, useAttrs } from 'vue';
+import { onMounted, watch, computed, ref } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import { useAttrs } from 'vue';
 import VnDate from './VnDate.vue';
-import { useRequired } from 'src/composables/useRequired';
 
-const $attrs = useAttrs();
-const { isRequired, requiredFieldRule } = useRequired($attrs);
 const model = defineModel({ type: [String, Date] });
-const { t } = useI18n();
-
 const $props = defineProps({
     isOutlined: {
         type: Boolean,
@@ -20,13 +16,18 @@ const $props = defineProps({
         default: true,
     },
 });
+import { useValidator } from 'src/composables/useValidator';
+const { validations } = useValidator();
 
+const { t } = useI18n();
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
 const vnInputDateRef = ref(null);
 
 const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref();
 const hover = ref();
 const mask = ref();
+const $attrs = useAttrs();
 
 const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 
@@ -103,7 +104,7 @@ const manageDate = (date) => {
             :mask="mask"
             placeholder="dd/mm/aaaa"
             v-bind="{ ...$attrs, ...styleAttrs }"
-            :class="{ required: isRequired }"
+            :class="{ required: $attrs.required }"
             :rules="mixinRules"
             :clearable="false"
             @click="isPopupOpen = true"

src/components/common/VnInputNumber.vue

@@ -1,13 +1,8 @@
 <script setup>
 import VnInput from 'src/components/common/VnInput.vue';
-import { ref } from 'vue';
-import { useAttrs } from 'vue';
-
 const model = defineModel({ type: [Number, String] });
-const $attrs = useAttrs();
-const step = ref($attrs.step || 0.01);
 </script>
 
 <template>
-    <VnInput v-bind="$attrs" v-model.number="model" type="number" :step="step" />
+    <VnInput v-bind="$attrs" v-model.number="model" type="number" />
 </template>

src/components/common/VnInputTime.vue

@@ -2,12 +2,11 @@
 import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
+import { useValidator } from 'src/composables/useValidator';
 import VnTime from './VnTime.vue';
-import { useRequired } from 'src/composables/useRequired';
 
+const { validations } = useValidator();
 const $attrs = useAttrs();
-const { isRequired, requiredFieldRule } = useRequired($attrs);
-const { t } = useI18n();
 const model = defineModel({ type: String });
 const props = defineProps({
     timeOnly: {
@@ -21,6 +20,8 @@ const props = defineProps({
 });
 const vnInputTimeRef = ref(null);
 const initialDate = ref(model.value ?? Date.vnNew());
+const { t } = useI18n();
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
 const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 const dateFormat = 'HH:mm';
 const isPopupOpen = ref();
@@ -77,7 +78,7 @@ function dateToTime(newDate) {
             placeholder="--:--"
             v-model="formattedTime"
             v-bind="{ ...$attrs, ...styleAttrs }"
-            :class="{ required: isRequired }"
+            :class="{ required: $attrs.required }"
             style="min-width: 100px"
             :rules="mixinRules"
             @click="isPopupOpen = false"

src/components/common/VnLocation.vue

@@ -3,12 +3,9 @@ import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import { useI18n } from 'vue-i18n';
 import { ref } from 'vue';
-import { useAttrs } from 'vue';
-import { useRequired } from 'src/composables/useRequired';
 const { t } = useI18n();
 const emit = defineEmits(['update:model-value', 'update:options']);
-const $attrs = useAttrs();
+
-const { isRequired, requiredFieldRule } = useRequired($attrs);
 const props = defineProps({
     location: {
         type: Object,
@@ -16,7 +13,6 @@ const props = defineProps({
     },
 });
 
-const mixinRules = [requiredFieldRule];
 const locationProperties = [
     'postcode',
     (obj) =>
@@ -73,13 +69,11 @@ const handleModelValue = (data) => {
         :label="t('Location')"
         :placeholder="t('search_by_postalcode')"
         :input-debounce="300"
-        :class="{ required: isRequired }"
+        :class="{ required: $attrs.required }"
         v-bind="$attrs"
         clearable
         :emit-value="false"
         :tooltip="t('Create new location')"
-        :rules="mixinRules"
-        :lazy-rules="true"
     >
         <template #form>
             <CreateNewPostcode

src/components/common/VnRadio.vue

@@ -2,12 +2,5 @@
 const model = defineModel({ type: Boolean, required: true });
 </script>
 <template>
-    <QRadio
+    <QRadio v-model="model" v-bind="$attrs" dense :dark="true" class="q-mr-sm" />
-        v-model="model"
-        v-bind="$attrs"
-        dense
-        :dark="true"
-        class="q-mr-sm"
-        size="xs"
-    />
 </template>

src/components/common/VnSelect.vue

@@ -1,14 +1,10 @@
 <script setup>
 import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useArrayData } from 'src/composables/useArrayData';
+import FetchData from 'src/components/FetchData.vue';
-import { useRequired } from 'src/composables/useRequired';
+import { useValidator } from 'src/composables/useValidator';
-import dataByOrder from 'src/utils/dataByOrder';
-
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
-const $attrs = useAttrs();
+
-const { t } = useI18n();
-const { isRequired, requiredFieldRule } = useRequired($attrs);
 const $props = defineProps({
     modelValue: {
         type: [String, Number, Object],
@@ -90,26 +86,25 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-    dataKey: {
-        type: String,
-        default: null,
-    },
 });
-
+const { validations } = useValidator();
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
+const $attrs = useAttrs();
+const { t } = useI18n();
 const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 const { optionLabel, optionValue, optionFilter, optionFilterValue, options, modelValue } =
     toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
+const dataRef = ref();
 const lastVal = ref();
 const noOneText = t('globals.noOne');
 const noOneOpt = ref({
     [optionValue.value]: false,
     [optionLabel.value]: noOneText,
 });
-const isLoading = ref(false);
+
-const useURL = computed(() => $props.url);
 const value = computed({
     get() {
         return $props.modelValue;
@@ -125,7 +120,7 @@ watch(options, (newValue) => {
 });
 
 watch(modelValue, async (newValue) => {
-    if (!myOptions?.value?.some((option) => option[optionValue.value] == newValue))
+    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
         await fetchFilter(newValue);
 
     if ($props.noOne) myOptions.value.unshift(noOneOpt.value);
@@ -133,23 +128,17 @@ watch(modelValue, async (newValue) => {
 
 onMounted(() => {
     setOptions(options.value);
-    if (useURL.value && $props.modelValue && !findKeyInOptions())
+    if ($props.url && $props.modelValue && !findKeyInOptions())
         fetchFilter($props.modelValue);
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
 
-const arrayDataKey =
-    $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
-
-const arrayData = useArrayData(arrayDataKey, { url: $props.url, searchUrl: false });
-
 function findKeyInOptions() {
     if (!$props.options) return;
     return filter($props.modelValue, $props.options)?.length;
 }
 
 function setOptions(data) {
-    data = dataByOrder(data, $props.sortBy);
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
     emit('update:options', data);
@@ -177,7 +166,7 @@ function filter(val, options) {
 }
 
 async function fetchFilter(val) {
-    if (!$props.url) return;
+    if (!$props.url || !dataRef.value) return;
 
     const { fields, include, sortBy, limit } = $props;
     const key =
@@ -199,11 +188,8 @@ async function fetchFilter(val) {
     const fetchOptions = { where, include, limit };
     if (fields) fetchOptions.fields = fields;
     if (sortBy) fetchOptions.order = sortBy;
-    arrayData.reset(['skip', 'filter.skip', 'page']);
 
-    const { data } = await arrayData.applyFilter({ filter: fetchOptions });
+    return dataRef.value.fetch(fetchOptions);
-    setOptions(data);
-    return data;
 }
 
 async function filterHandler(val, update) {
@@ -243,47 +229,20 @@ function nullishToTrue(value) {
 
 const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 
-async function onScroll({ to, direction, from, index }) {
-    const lastIndex = myOptions.value.length - 1;
-
-    if (from === 0 && index === 0) return;
-    if (!useURL.value && !$props.fetchRef) return;
-    if (direction === 'decrease') return;
-    if (to === lastIndex && arrayData.store.hasMoreData && !isLoading.value) {
-        isLoading.value = true;
-        await arrayData.loadMore();
-        setOptions(arrayData.store.data);
-        vnSelectRef.value.scrollTo(lastIndex);
-        isLoading.value = false;
-    }
-}
-
 defineExpose({ opts: myOptions });
-
-function handleKeyDown(event) {
-    if (event.key === 'Tab') {
-        event.preventDefault();
-
-        const inputValue = vnSelectRef.value?.inputValue;
-
-        if (inputValue) {
-            const matchingOption = myOptions.value.find(
-                (option) =>
-                    option[optionLabel.value].toLowerCase() === inputValue.toLowerCase()
-            );
-
-            if (matchingOption) {
-                emit('update:modelValue', matchingOption[optionValue.value]);
-            } else {
-                emit('update:modelValue', inputValue);
-            }
-            vnSelectRef.value?.hidePopup();
-        }
-    }
-}
 </script>
 
 <template>
+    <FetchData
+        ref="dataRef"
+        :url="$props.url"
+        @on-fetch="(data) => setOptions(data)"
+        :where="where || { [optionValue]: value }"
+        :limit="limit"
+        :sort-by="sortBy"
+        :fields="fields"
+        :params="params"
+    />
     <QSelect
         v-model="value"
         :options="myOptions"
@@ -291,7 +250,6 @@ function handleKeyDown(event) {
         :option-value="optionValue"
         v-bind="$attrs"
         @filter="filterHandler"
-        @keydown="handleKeyDown"
         :emit-value="nullishToTrue($attrs['emit-value'])"
         :map-options="nullishToTrue($attrs['map-options'])"
         :use-input="nullishToTrue($attrs['use-input'])"
@@ -299,13 +257,10 @@ function handleKeyDown(event) {
         :fill-input="nullishToTrue($attrs['fill-input'])"
         ref="vnSelectRef"
         lazy-rules
-        :class="{ required: isRequired }"
+        :class="{ required: $attrs.required }"
         :rules="mixinRules"
         virtual-scroll-slice-size="options.length"
         hide-bottom-space
-        :input-debounce="useURL ? '300' : '0'"
-        :loading="isLoading"
-        @virtual-scroll="onScroll"
     >
         <template v-if="isClearable" #append>
             <QIcon

src/components/common/VnSmsDialog.vue

@@ -86,7 +86,7 @@ async function send() {
 </script>
 
 <template>
-    <QDialog ref="dialogRef" data-cy="vnSmsDialog">
+    <QDialog ref="dialogRef">
         <QCard class="q-pa-sm">
             <QCardSection class="row items-center q-pb-none">
                 <span class="text-h6 text-grey">
@@ -161,7 +161,6 @@ async function send() {
                     :loading="isLoading"
                     color="primary"
                     unelevated
-                    data-cy="sendSmsBtn"
                 />
             </QCardActions>
         </QCard>

src/components/common/VnTitle.vue

@@ -8,7 +8,7 @@ defineProps({
 <template>
     <div :class="$q.screen.gt.md ? 'q-pb-lg' : 'q-pb-md'">
         <div class="header-link" :style="{ cursor: url ? 'pointer' : 'default' }">
-            <a :href="url" :class="url ? 'link' : 'color-vn-text'" v-bind="$attrs">
+            <a :href="url" :class="url ? 'link' : 'color-vn-text'">
                 {{ text }}
                 <QIcon v-if="url" :name="icon" />
             </a>

src/components/ui/CardDescriptor.vue

@@ -167,7 +167,6 @@ const toModule = computed(() =>
                     icon="more_vert"
                     round
                     size="md"
-                    data-cy="descriptor-more-opts"
                 >
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}

src/components/ui/CardSummary.vue

@@ -4,7 +4,6 @@ import { useRoute } from 'vue-router';
 import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { useArrayData } from 'src/composables/useArrayData';
-import { isDialogOpened } from 'src/filters';
 
 const props = defineProps({
     url: {
@@ -59,6 +58,22 @@ async function fetch() {
     emit('onFetch', Array.isArray(data) ? data[0] : data);
     isLoading.value = false;
 }
+
+const showRedirectToSummaryIcon = computed(() => {
+    const exist = existSummary(route.matched);
+    return !isSummary.value && route.meta.moduleName && exist;
+});
+
+function existSummary(routes) {
+    const hasSummary = routes.some((r) => r.name === `${route.meta.moduleName}Summary`);
+    if (hasSummary) return hasSummary;
+    for (const current of routes) {
+        if (current.path != '/' && current.children) {
+            const exist = existSummary(current.children);
+            if (exist) return exist;
+        }
+    }
+}
 </script>
 
 <template>
@@ -69,7 +84,7 @@ async function fetch() {
                 <div class="summaryHeader bg-primary q-pa-sm text-weight-bolder">
                     <slot name="header-left">
                         <router-link
-                            v-if="isDialogOpened()"
+                            v-if="showRedirectToSummaryIcon"
                             class="header link"
                             :to="{
                                 name: `${moduleName ?? route.meta.moduleName}Summary`,
@@ -83,7 +98,7 @@ async function fetch() {
                     <slot name="header" :entity="entity" dense>
                         <VnLv :label="`${entity.id} -`" :value="entity.name" />
                     </slot>
-                    <slot name="header-right" :entity="entity">
+                    <slot name="header-right">
                         <span></span>
                     </slot>
                 </div>
@@ -103,7 +118,6 @@ async function fetch() {
 
 .cardSummary {
     width: 100%;
-    max-height: 70vh;
     .summaryHeader {
         text-align: center;
         font-size: 20px;

src/components/ui/VnConfirm.vue

@@ -31,10 +31,10 @@ const props = defineProps({
 });
 
 const emit = defineEmits(['confirm', 'cancel', ...useDialogPluginComponent.emits]);
-defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.hide() });
 
 const { dialogRef, onDialogHide, onDialogOK, onDialogCancel } =
     useDialogPluginComponent();
+defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.hide() });
 
 const title = props.title || t('Confirm');
 const message =
@@ -103,7 +103,6 @@ function cancel() {
                     @click="confirm()"
                     unelevated
                     autofocus
-                    data-cy="VnConfirm_confirm"
                 />
             </QCardActions>
         </QCard>

src/components/ui/VnFilterPanel.vue

@@ -37,7 +37,7 @@ const $props = defineProps({
     },
     hiddenTags: {
         type: Array,
-        default: () => ['filter', 'or', 'and'],
+        default: () => ['filter', 'search', 'or', 'and'],
     },
     customTags: {
         type: Array,
@@ -49,7 +49,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'table',
+        default: 'params',
     },
     redirect: {
         type: Boolean,
@@ -57,10 +57,12 @@ const $props = defineProps({
     },
 });
 
+defineExpose({ search, sanitizer });
 const emit = defineEmits([
     'update:modelValue',
     'refresh',
     'clear',
+    'search',
     'init',
     'remove',
     'setUserParams',
@@ -168,29 +170,9 @@ const tagsList = computed(() => {
     return tagList;
 });
 
-const formatTags = (tags) => {
-    const formattedTags = [];
-    tags.forEach((tag) => {
-        if (tag.label === 'and') {
-            tag.value.forEach((item) => {
-                for (const key in item) {
-                    formattedTags.push({ label: key, value: item[key] });
-                }
-            });
-        } else {
-            formattedTags.push(tag);
-        }
-    });
-    return formattedTags;
-};
-
 const tags = computed(() => {
-    const filteredTags = tagsList.value.filter(
+    return tagsList.value.filter((tag) => !($props.customTags || []).includes(tag.label));
-        (tag) => !($props.customTags || []).includes(tag.label)
-    );
-    return formatTags(filteredTags);
 });
-
 const customTags = computed(() =>
     tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.label))
 );
@@ -211,20 +193,13 @@ function formatValue(value) {
 
 function sanitizer(params) {
     for (const [key, value] of Object.entries(params)) {
-        if (key === 'and' && Array.isArray(value)) {
+        if (value && typeof value === 'object') {
-            value.forEach((item) => {
-                Object.assign(params, item);
-            });
-            delete params[key];
-        } else if (value && typeof value === 'object') {
             const param = Object.values(value)[0];
             if (typeof param == 'string') params[key] = param.replaceAll('%', '');
         }
     }
     return params;
 }
-
-defineExpose({ search, sanitizer, userParams });
 </script>
 
 <template>

src/components/ui/VnLinkMail.vue

@@ -1,16 +0,0 @@
-<script setup>
-defineProps({ email: { type: [String], default: null } });
-</script>
-<template>
-    <QBtn
-        v-if="email"
-        flat
-        round
-        icon="email"
-        size="sm"
-        color="primary"
-        padding="none"
-        :href="`mailto:${email}`"
-        @click.stop
-    />
-</template>

src/components/ui/VnLinkPhone.vue

@@ -1,49 +1,16 @@
 <script setup>
-import { reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
+defineProps({ phoneNumber: { type: [String, Number], default: null } });
-import axios from 'axios';
-const props = defineProps({
-    phoneNumber: { type: [String, Number], default: null },
-    channel: { type: Number, default: null },
-});
-
-const config = reactive({
-    sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
-    'say-simple': {
-        icon: 'vn:saysimple',
-        href: null,
-        channel: props.channel,
-    },
-});
-const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
-
-onBeforeMount(async () => {
-    let { channel } = config[type];
-
-    if (type === 'say-simple') {
-        const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
-            .data;
-        if (!channel) channel = defaultChannel;
-
-        config[
-            type
-        ].href = `${url}?customerIdentity=%2B${props.phoneNumber}&channelId=${channel}`;
-    }
-});
 </script>
 <template>
     <QBtn
         v-if="phoneNumber"
         flat
         round
-        :icon="config[type].icon"
+        icon="phone"
         size="sm"
         color="primary"
         padding="none"
-        :href="config[type].href"
+        :href="`sip:${phoneNumber}`"
         @click.stop
-    >
+    />
-        <QTooltip>
-            {{ capitalize(type).replace('-', '') }}
-        </QTooltip>
-    </QBtn>
 </template>

src/components/ui/VnNotes.vue

@@ -65,9 +65,13 @@ onBeforeRouteLeave((to, from, next) => {
         auto-load
         @on-fetch="(data) => (observationTypes = data)"
     />
-    <QCard class="q-pa-xs q-mb-lg full-width" v-if="$props.addNote">
+    <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
         <QCardSection horizontal>
-            {{ t('New note') }}
+            <VnAvatar :worker-id="currentUser.id" size="md" />
+            <div class="full-width row justify-between q-pa-xs">
+                <VnUserLink :name="t('New note')" :worker-id="currentUser.id" />
+                {{ t('globals.now') }}
+            </div>
         </QCardSection>
         <QCardSection class="q-px-xs q-my-none q-py-none">
             <VnRow class="full-width">
@@ -140,7 +144,7 @@ onBeforeRouteLeave((to, from, next) => {
                         <div class="full-width row justify-between q-pa-xs">
                             <div>
                                 <VnUserLink
-                                    :name="`${note.worker.user.name}`"
+                                    :name="`${note.worker.user.nickname}`"
                                     :worker-id="note.worker.id"
                                 />
                                 <QBadge

src/components/ui/VnPaginate.vue

@@ -44,7 +44,7 @@ const props = defineProps({
     },
     limit: {
         type: Number,
-        default: 20,
+        default: 10,
     },
     userParams: {
         type: Object,
@@ -100,7 +100,7 @@ const arrayData = useArrayData(props.dataKey, {
 const store = arrayData.store;
 
 onMounted(async () => {
-    if (props.autoLoad && !store.data?.length) await fetch();
+    if (props.autoLoad) await fetch();
     mounted.value = true;
 });
 
@@ -115,11 +115,7 @@ watch(
 
 watch(
     () => store.data,
-    (data) => {
+    (data) => emit('onChange', data)
-        if (!mounted.value) return;
-        emit('onChange', data);
-    },
-    { immediate: true }
 );
 
 watch(

src/components/ui/VnRow.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="vn-row q-gutter-md">
+    <div class="vn-row q-gutter-md q-mb-md">
         <slot />
     </div>
 </template>
@@ -18,9 +18,6 @@
         &:not(.wrap) {
             flex-direction: column;
         }
-        &[fixed] {
-            flex-direction: row;
-        }
     }
 }
 </style>

src/components/ui/VnSearchbar.vue

@@ -45,7 +45,7 @@ const props = defineProps({
     },
     limit: {
         type: Number,
-        default: 20,
+        default: 10,
     },
     userParams: {
         type: Object,
@@ -130,7 +130,6 @@ async function search() {
                 dense
                 standout
                 autofocus
-                data-cy="vnSearchBar"
             >
                 <template #prepend>
                     <QIcon

src/components/ui/VnToSummary.vue

@@ -1,5 +1,6 @@
 <script setup>
 import { useRoute } from 'vue-router';
+import { defineProps } from 'vue';
 
 const props = defineProps({
     routeName: {

src/composables/useArrayData.js

@@ -3,7 +3,6 @@ import { useRouter, useRoute } from 'vue-router';
 import axios from 'axios';
 import { useArrayDataStore } from 'stores/useArrayDataStore';
 import { buildFilter } from 'filters/filterPanel';
-import { isDialogOpened } from 'src/filters';
 
 const arrayDataStore = useArrayDataStore();
 
@@ -75,10 +74,18 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             limit: store.limit,
         };
 
+        let exprFilter;
         let userParams = { ...store.userParams };
+        if (store?.exprBuilder) {
+            const where = buildFilter(userParams, (param, value) => {
+                const res = store.exprBuilder(param, value);
+                if (res) delete userParams[param];
+                return res;
+            });
+            exprFilter = where ? { where } : null;
+        }
 
-        Object.assign(filter, store.userFilter);
+        Object.assign(filter, store.userFilter, exprFilter);
-
         let where;
         if (filter?.where || store.filter?.where)
             where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
@@ -88,28 +95,11 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
-        if (store?.order && typeof store?.order == 'string') store.order = [store.order];
+        if (store.order && store.order.length) params.filter.order = store.order;
-        if (store.order?.length) params.filter.order = [...store.order];
         else delete params.filter.order;
 
-        store.currentFilter = JSON.parse(JSON.stringify(params));
-        delete store.currentFilter.filter.include;
-        store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
-
-        let exprFilter;
-        if (store?.exprBuilder) {
-            exprFilter = buildFilter(params, (param, value) => {
-                if (param == 'filter') return;
-                const res = store.exprBuilder(param, value);
-                if (res) delete params[param];
-                return res;
-            });
-        }
-
-        if (params.filter.where || exprFilter)
-            params.filter.where = { ...params.filter.where, ...exprFilter };
         params.filter = JSON.stringify(params.filter);
-
+        store.currentFilter = params;
         store.isLoading = true;
         const response = await axios.get(store.url, {
             signal: canceller.signal,
@@ -124,7 +114,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             for (const row of response.data) store.data.push(row);
         } else {
             store.data = response.data;
-            if (!isDialogOpened()) updateRouter && updateStateParams();
+            if (!document.querySelectorAll('[role="dialog"][aria-modal="true"]').length)
+                updateRouter && updateStateParams();
         }
 
         store.isLoading = false;
@@ -256,9 +247,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     }
 
     function updateStateParams() {
-        if (!route?.path) return;
+        if (!route) return;
         const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
-        if (store?.searchUrl)
         newUrl.query[store.searchUrl] = JSON.stringify(store.currentFilter);
 
         if (store.navigate) {
@@ -280,7 +270,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
                 const pushUrl = { path: to };
                 if (to.endsWith('/list') || to.endsWith('/'))
                     pushUrl.query = newUrl.query;
-                else destroy();
+                destroy();
                 return router.push(pushUrl);
             }
         }

src/composables/useOpenURL.js

@@ -1,8 +0,0 @@
-import { openURL } from 'quasar';
-const defaultWindowFeatures = {
-    noopener: true,
-    noreferrer: true,
-};
-export default function (url, windowFeatures = defaultWindowFeatures, fn = undefined) {
-    openURL(url, fn, windowFeatures);
-}

src/composables/useRequired.js

@@ -1,13 +0,0 @@
-import { useValidator } from 'src/composables/useValidator';
-
-export function useRequired($attrs) {
-    const { validations } = useValidator();
-
-    const isRequired = Object.keys($attrs).includes('required');
-    const requiredFieldRule = (val) => validations().required(isRequired, val);
-
-    return {
-        isRequired,
-        requiredFieldRule,
-    };
-}

src/css/app.scss

@@ -241,7 +241,7 @@ input::-webkit-inner-spin-button {
     th,
     td {
         padding: 1px 10px 1px 10px;
-        max-width: 130px;
+        max-width: 100px;
         div span {
             overflow: hidden;
             white-space: nowrap;

src/filters/getParamWhere.js

@@ -9,20 +9,12 @@ function parseJSON(str, fallback) {
 }
 export default function (route, param) {
     // catch route query params
-    const params = parseJSON(route?.query?.table, {});
+    const params = parseJSON(route?.query?.params, {});
+
     // extract and parse filter from params
     const { filter: filterStr = '{}' } = params;
-
     const where = parseJSON(filterStr, {})?.where;
-
+    if (where && where[param] !== undefined) {
-    if (where && !param) {
-        return where;
-    } else if (where && where.and) {
-        const foundParam = where.and.find((p) => p[param]);
-        if (foundParam) {
-            return foundParam[param];
-        }
-    } else if (where && where[param]) {
         return where[param];
     }
     return null;

src/filters/index.js

@@ -12,10 +12,8 @@ import dateRange from './dateRange';
 import toHour from './toHour';
 import dashOrCurrency from './dashOrCurrency';
 import getParamWhere from './getParamWhere';
-import isDialogOpened from './isDialogOpened';
 
 export {
-    isDialogOpened,
     toLowerCase,
     toLowerCamel,
     toDate,

src/filters/isDialogOpened.js

@@ -1,3 +0,0 @@
-export default function isDialogOpened(query = '[role="dialog"]') {
-    return document.querySelectorAll(query).length > 0;
-}

src/i18n/locale/en.yml

@@ -59,7 +59,7 @@ globals:
     downloadCSVSuccess: CSV downloaded successfully
     reference: Reference
     agency: Agency
-    warehouseOut: Warehouse Out
+    wareHouseOut: Warehouse Out
     wareHouseIn: Warehouse In
     landed: Landed
     shipped: Shipped
@@ -106,29 +106,6 @@ globals:
     weight: Weight
     error: Ups! Something went wrong
     recalc: Recalculate
-    alias: Alias
-    vat: VAT
-    intrastat: Intrastat
-    tags: Tags
-    size: Size
-    producer: Producer
-    origin: Origin
-    state: State
-    subtotal: Subtotal
-    visible: Visible
-    price: Price
-    client: Client
-    country: Country
-    phone: Phone
-    mobile: Mobile
-    postcode: Postcode
-    street: Street
-    tag: Tag
-    ticketId: Ticket ID
-    confirmed: Confirmed
-    small: Small
-    medium: Medium
-    big: Big
     pageTitles:
         logIn: Login
         addressEdit: Update address
@@ -320,10 +297,13 @@ globals:
     maxTemperature: Max
     minTemperature: Min
     params:
+        id: ID
         clientFk: Client id
         salesPersonFk: Sales person
         warehouseFk: Warehouse
         provinceFk: Province
+        from: From
+        To: To
         stateFk: State
         email: Email
         SSN: SSN
@@ -353,12 +333,16 @@ login:
     loginError: Invalid username or password
     fieldRequired: This field is required
     twoFactorRequired: Two-factor verification required
-twoFactorRequired:
+twoFactor:
+    code: Code
     validate: Validate
     insert: Enter the verification code
     explanation: >-
         Please, enter the verification code that we have sent to your email in the
         next 5 minutes
+verifyEmail:
+    pageTitles:
+        verifyEmail: Email verification
 recoverPassword:
     userOrEmail: User or recovery email
     explanation: >-
@@ -370,7 +354,15 @@ resetPassword:
 entry:
     list:
         newEntry: New entry
+        landed: Landed
+        invoiceNumber: Invoice number
+        supplier: Supplier
+        booked: Booked
+        confirmed: Confirmed
+        ordered: Ordered
         tableVisibleColumns:
+            id: Id
+            reference: Reference
             created: Creation
             supplierFk: Supplier
             isBooked: Booked
@@ -383,117 +375,236 @@ entry:
     summary:
         commission: Commission
         currency: Currency
+        company: Company
+        reference: Reference
         invoiceNumber: Invoice number
         ordered: Ordered
+        confirmed: Confirmed
         booked: Booked
         excludedFromAvailable: Inventory
         travelReference: Reference
         travelAgency: Agency
         travelShipped: Shipped
+        travelWarehouseOut: Warehouse Out
         travelDelivered: Delivered
         travelLanded: Landed
+        travelWarehouseIn: Warehouse In
         travelReceived: Received
         buys: Buys
+        quantity: Quantity
         stickers: Stickers
         package: Package
+        weight: Weight
         packing: Packing
         grouping: Grouping
         buyingValue: Buying value
         import: Import
         pvp: PVP
+        item: Item
     basicData:
+        supplier: Supplier
         travel: Travel
+        reference: Reference
+        invoiceNumber: Invoice number
+        company: Company
         currency: Currency
         commission: Commission
         observation: Observation
+        ordered: Ordered
+        confirmed: Confirmed
         booked: Booked
         excludedFromAvailable: Inventory
+        agency: Agency
+        warehouseOut: Warehouse Out
+        warehouseIn: Warehouse In
+        shipped: Shipped
+        landed: Landed
+        id: ID
     buys:
+        groupingPrice: Grouping price
+        packingPrice: Packing price
+        reference: Reference
         observations: Observations
+        item: Item
+        size: Size
+        packing: Packing
+        grouping: Grouping
+        buyingValue: Buying value
         packagingFk: Box
+        file: File
+        name: Name
+        producer: Producer
+        type: Type
         color: Color
+        id: ID
         printedStickers: Printed stickers
     notes:
         observationType: Observation type
+    descriptor:
+        agency: Agency
+        landed: Landed
+        warehouseOut: Warehouse Out
     latestBuys:
         tableVisibleColumns:
             image: Picture
             itemFk: Item ID
+            packing: Packing
+            grouping: Grouping
+            quantity: Quantity
+            size: Size
+            tags: Tags
+            type: Type
+            intrastat: Intrastat
+            origin: Origin
             weightByPiece: Weight/Piece
             isActive: Active
             family: Family
             entryFk: Entry
+            buyingValue: Buying value
             freightValue: Freight value
             comissionValue: Commission value
+            description: Description
             packageValue: Package value
             isIgnored: Is ignored
             price2: Grouping
             price3: Packing
             minPrice: Min
             ektFk: Ekt
+            weight: Weight
+            packagingFk: Package
             packingOut: Package out
             landing: Landing
             isExcludedFromAvailable: Es inventory
 ticket:
+    pageTitles:
+        tickets: Tickets
+        list: List
+        ticketCreate: New ticket
+        summary: Summary
+        basicData: Basic Data
+        boxing: Boxing
+        sms: Sms
+        notes: Notes
+        sale: Sale
+        dms: File management
+        volume: Volume
+        observation: Notes
+        ticketAdvance: Advance tickets
+        futureTickets: Future tickets
+        purchaseRequest: Purchase request
+        weeklyTickets: Weekly tickets
+    list:
+        nickname: Nickname
+        state: State
+        shipped: Shipped
+        landed: Landed
+        salesPerson: Sales person
+        total: Total
     card:
+        ticketId: Ticket ID
+        state: State
         customerId: Customer ID
+        salesPerson: Sales person
+        agency: Agency
+        shipped: Shipped
+        warehouse: Warehouse
         customerCard: Customer card
+        alias: Alias
         ticketList: Ticket List
         newOrder: New Order
     boxing:
         expedition: Expedition
+        item: Item
         created: Created
+        worker: Worker
         selectTime: 'Select time:'
         selectVideo: 'Select video:'
         notFound: No videos available
     summary:
+        state: State
+        salesPerson: Sales person
+        agency: Agency
         zone: Zone
+        warehouse: Warehouse
         collection: Collection
         route: Route
         invoice: Invoice
         shipped: Shipped
+        landed: Landed
         consigneePhone: Consignee phone
         consigneeMobile: Consignee mobile
         consigneeAddress: Consignee address
         clientPhone: Client phone
         clientMobile: Client mobile
         consignee: Consignee
+        subtotal: Subtotal
+        vat: VAT
         total: Total
         saleLines: Line items
+        item: Item
+        visible: Visible
         available: Available
+        quantity: Quantity
+        price: Price
         discount: Discount
         packing: Packing
         hasComponentLack: Component lack
         itemShortage: Not visible
         claim: Claim
         reserved: Reserved
+        created: Created
         package: Package
         taxClass: Tax class
         services: Services
         requester: Requester
         atender: Atender
         request: Request
+        weight: Weight
         goTo: Go to
         summaryAmount: Summary
         purchaseRequest: Purchase request
         service: Service
+        description: Description
         attender: Attender
         ok: Ok
     create:
+        client: Client
         address: Address
+        landed: Landed
+        warehouse: Warehouse
+        agency: Agency
 invoiceOut:
+    list:
+        ref: Reference
+        issued: Issued
+        shortIssued: Issued
+        client: Client
+        created: Created
+        shortCreated: Created
+        company: Company
+        dued: Due date
+        shortDued: Due date
+        amount: Amount
     card:
         issued: Issued
+        client: Client
+        company: Company
         customerCard: Customer card
     summary:
         issued: Issued
+        created: Created
         dued: Due
         booked: Booked
+        company: Company
         taxBreakdown: Tax breakdown
+        type: Type
         taxableBase: Taxable base
         rate: Rate
         fee: Fee
         tickets: Tickets
+        ticketId: Ticket id
+        nickname: Alias
+        shipped: Shipped
         totalWithVat: Amount
     globalInvoices:
         errors:
@@ -506,16 +617,23 @@ invoiceOut:
             invoiceWithFutureDate: Exists an invoice with a future date
             noTicketsToInvoice: There are not tickets to invoice
             criticalInvoiceError: 'Critical invoicing error, process stopped'
-            invalidSerialTypeForAll: The serial type must be global when invoicing all clients
         table:
+            client: Client
             addressId: Address id
             streetAddress: Street
         statusCard:
             percentageText: '{getPercentage}% {getAddressNumber} of {getNAddresses}'
             pdfsNumberText: '{nPdfs} of {totalPdfs} PDFs'
     negativeBases:
+        from: From
+        to: To
+        company: Company
+        country: Country
         clientId: Client Id
+        client: Client
+        amount: Amount
         base: Base
+        ticketId: Ticket Id
         active: Active
         hasToInvoice: Has to Invoice
         verifiedData: Verified Data
@@ -528,6 +646,15 @@ shelving:
         priority: Priority
         newShelving: New Shelving
     summary:
+        code: Code
+        parking: Parking
+        priority: Priority
+        worker: Worker
+        recyclable: Recyclable
+    basicData:
+        code: Code
+        parking: Parking
+        priority: Priority
         recyclable: Recyclable
 parking:
     pickingOrder: Picking order
@@ -540,27 +667,54 @@ parking:
 order:
     field:
         salesPersonFk: Sales Person
+        clientFk: Client
+        isConfirmed: Confirmed
+        created: Created
+        landed: Landed
+        hour: Hour
+        agency: Agency
+        total: Total
     form:
         clientFk: Client
         addressFk: Address
+        landed: Landed
         agencyModeFk: Agency
     list:
         newOrder: New Order
     summary:
         basket: Basket
+        nickname: Nickname
+        company: Company
+        confirmed: Confirmed
         notConfirmed: Not confirmed
         created: Created
+        landed: Landed
+        phone: Phone
         createdFrom: Created From
         address: Address
+        notes: Notes
+        subtotal: Subtotal
         total: Total
+        vat: VAT
+        state: State
+        alias: Alias
         items: Items
         orderTicketList: Order Ticket List
+        details: Details
+        item: Item
+        quantity: Quantity
+        price: Price
         amount: Amount
-        confirm: Confirm
-        confirmLines: Confirm lines
 department:
+    pageTitles:
+        basicData: Basic data
+        department: Department
+        summary: Summary
+    name: Name
+    code: Code
     chat: Chat
     bossDepartment: Boss Department
+    email: Email
     selfConsumptionCustomer: Self-consumption customer
     telework: Telework
     notifyOnErrors: Notify on errors
@@ -569,11 +723,47 @@ department:
     hasToSendMail: Send check-ins by email
     departmentRemoved: Department removed
 worker:
+    pageTitles:
+        workers: Workers
+        list: List
+        basicData: Basic data
+        summary: Summary
+        notifications: Notifications
+        workerCreate: New worker
+        department: Department
+        pda: PDA
+        notes: Notas
+        dms: My documentation
+        pbx: Private Branch Exchange
+        log: Log
+        calendar: Calendar
+        timeControl: Time control
+        locker: Locker
+        balance: Balance
+        medical: Medical
+        operator: Operator
     list:
+        name: Name
+        email: Email
+        phone: Phone
+        mobile: Mobile
+        active: Active
         department: Department
         schedule: Schedule
         newWorker: New worker
+    card:
+        workerId: Worker ID
+        user: User
+        name: Name
+        email: Email
+        phone: Phone
+        mobile: Mobile
+        active: Active
+        warehouse: Warehouse
+        agency: Agency
+        salesPerson: Sales person
     summary:
+        basicData: Basic data
         boss: Boss
         phoneExtension: Phone extension
         entPhone: Enterprise phone
@@ -584,15 +774,15 @@ worker:
         role: Role
         sipExtension: Extension
         locker: Locker
-        fiDueDate: FI due date
+        fiDueDate: Fecha de caducidad del DNI
-        sex: Sex
+        sex: Sexo
-        seniority: Seniority
+        seniority: Antigüedad
         fi: DNI/NIE/NIF
-        birth: Birth
+        birth: Fecha de nacimiento
-        isFreelance: Freelance
+        isFreelance: Autónomo
         isSsDiscounted: Bonificación SS
-        hasMachineryAuthorized: Machinery authorized
+        hasMachineryAuthorized: Autorizado para llevar maquinaria
-        isDisable: Disable
+        isDisable: Trabajador desactivado
     notificationsManager:
         activeNotifications: Active notifications
         availableNotifications: Available notifications
@@ -605,12 +795,19 @@ worker:
         serialNumber: Serial number
         removePDA: Deallocate PDA
     create:
+        name: Name
         lastName: Last name
         birth: Birth
         fi: Fi
         code: Worker code
+        phone: Phone
+        postcode: Postcode
+        province: Province
+        city: City
+        street: Street
         webUser: Web user
         personalEmail: Personal email
+        company: Company
         boss: Boss
         payMethods: Pay method
         iban: IBAN
@@ -622,13 +819,16 @@ worker:
             endDate: End date
             center: Training center
             invoice: Invoice
+            amount: Amount
             remark: Remark
             hasDiploma: Has diploma
     medical:
         tableVisibleColumns:
+            date: Date
             time: Hour
             center: Formation Center
             invoice: Invoice
+            amount: Amount
             isFit: Fit
             remark: Observations
     imageNotFound: Image not found
@@ -652,7 +852,18 @@ worker:
         isOnReservationMode: Reservation mode
         machine: Machine
 wagon:
+    pageTitles:
+        wagons: Wagons
+        wagonsList: Wagons List
+        wagonCreate: Create wagon
+        wagonEdit: Edit wagon
+        typesList: Types List
+        typeCreate: Create type
+        typeEdit: Edit type
+        wagonCounter: Trolley counter
+        wagonTray: Tray List
     type:
+        name: Name
         submit: Submit
         reset: Reset
         trayColor: Tray color
@@ -660,10 +871,13 @@ wagon:
     list:
         plate: Plate
         volume: Volume
+        type: Type
         remove: Remove
         removeItem: Wagon removed successfully
     create:
         plate: Plate
+        volume: Volume
+        type: Type
         label: Label
     warnings:
         noData: No data available
@@ -680,17 +894,26 @@ wagon:
 supplier:
     list:
         payMethod: Pay method
+        payDeadline: Pay deadline
+        payDay: Pay day
         account: Account
         newSupplier: New supplier
         tableVisibleColumns:
+            id: Id
+            name: Name
             nif: NIF/CIF
+            nickname: Alias
             account: Account
+            payMethod: Pay Method
             payDay: Pay Day
+            country: Country
     summary:
         responsible: Responsible
+        notes: Notes
         verified: Verified
         isActive: Is active
         billingData: Billing data
+        payMethod: Pay method
         payDeadline: Pay deadline
         payDay: Pay day
         account: Account
@@ -703,16 +926,20 @@ supplier:
         fiscalAddress: Fiscal address
         socialName: Social name
         taxNumber: Tax number
+        street: Street
         city: City
+        postCode: Postcode
+        province: Province
+        country: Country
     create:
         supplierName: Supplier name
     basicData:
+        alias: Alias
         workerFk: Responsible
-        isReal: Verified
+        isSerious: Verified
         isActive: Active
         isPayMethodChecked: PayMethod checked
         note: Notes
-        size: Size
     fiscalData:
         name: Social name *
         nif: Tax number *
@@ -721,18 +948,36 @@ supplier:
         sageWithholdingFk: Sage withholding
         sageTransactionTypeFk: Sage transaction type
         supplierActivityFk: Supplier activity
+        healthRegister: Health register
+        street: Street
+        postcode: Postcode
+        city: City *
+        provinceFk: Province
+        country: Country
         isTrucker: Trucker
         isVies: Vies
     billingData:
         payMethodFk: Billing data
         payDemFk: Payment deadline
+        payDay: Pay day
     accounts:
         iban: Iban
         bankEntity: Bank entity
         beneficiary: Beneficiary
     contacts:
+        name: Name
+        phone: Phone
+        mobile: Mobile
         email: Email
         observation: Notes
+    addresses:
+        street: Street
+        postcode: Postcode
+        phone: Phone
+        name: Name
+        city: City
+        province: Province
+        mobile: Mobile
     agencyTerms:
         agencyFk: Agency
         minimumM3: Minimum M3
@@ -744,16 +989,25 @@ supplier:
         addRow: Add row
     consumption:
         entry: Entry
+        date: Date
+        reference: Reference
 travel:
     travelList:
         tableVisibleColumns:
+            id: Id
             ref: Reference
+            agency: Agency
+            shipped: Shipped
+            landed: Landed
             shipHour: Shipment Hour
             landHour: Landing Hour
+            warehouseIn: Warehouse in
+            warehouseOut: Warehouse out
             totalEntries: Total entries
             totalEntriesTooltip: Total entries
             daysOnward: Landed days onwards
     summary:
+        confirmed: Confirmed
         entryId: Entry Id
         freight: Freight
         package: Package
@@ -766,90 +1020,64 @@ travel:
         AddEntry: Add entry
         thermographs: Thermographs
         hb: HB
+    variables:
+        search: Id/Reference
+        agencyModeFk: Agency
+        warehouseInFk: ' Warehouse In'
+        warehouseOutFk: Warehouse Out
+        landedFrom: Landed from
+        landedTo: Landed to
+        continent: Continent out
+        totalEntries: Total entries
     basicData:
+        reference: Reference
+        agency: Agency
+        shipped: Shipped
+        landed: Landed
+        warehouseOut: Warehouse Out
+        warehouseIn: Warehouse In
+        delivered: Delivered
+        received: Received
         daysInForward: Days in forward
-        isRaid: Raid
     thermographs:
+        code: Code
         temperature: Temperature
+        state: State
         destination: Destination
+        created: Created
         thermograph: Thermograph
+        reference: Reference
+        type: Type
+        company: Company
+        warehouse: Warehouse
         travelFileDescription: 'Travel id { travelId }'
-item:
+        file: File
-    descriptor:
-        buyer: Buyer
-        color: Color
-        category: Category
-        available: Available
-        warehouseText: 'Calculated on the warehouse of { warehouseName }'
-        itemDiary: Item diary
-    list:
-        id: Identifier
-        stems: Stems
-        category: Category
-        typeName: Type
-        isActive: Active
-        userName: Buyer
-        weightByPiece: Weight/Piece
-        stemMultiplier: Multiplier
-    fixedPrice:
-        itemFk: Item ID
-        groupingPrice: Grouping price
-        packingPrice: Packing price
-        hasMinPrice: Has min price
-        minPrice: Min price
-        started: Started
-        ended: Ended
-    create:
-        priority: Priority
-    buyRequest:
-        requester: Requester
-        requested: Requested
-        attender: Atender
-        achieved: Achieved
-        concept: Concept
-    summary:
-        otherData: Other data
-        tax: Tax
-        botanical: Botanical
-        barcode: Barcode
-        completeName: Complete name
-        family: Familiy
-        stems: Stems
-        multiplier: Multiplier
-        buyer: Buyer
-        doPhoto: Do photo
-        intrastatCode: Intrastat code
-        ref: Reference
-        relevance: Relevance
-        weight: Weight (gram)/stem
-        units: Units/box
-        expense: Expense
-        generic: Generic
-        recycledPlastic: Recycled plastic
-        nonRecycledPlastic: Non recycled plastic
-        minSalesQuantity: Min sales quantity
-        genus: Genus
-        specie: Specie
 components:
     topbar: {}
     itemsFilterPanel:
         typeFk: Type
+        tag: Tag
         value: Value
         # ItemFixedPriceFilter
         buyerFk: Buyer
+        warehouseFk: Warehouse
         started: From
         ended: To
         mine: For me
         hasMinPrice: Minimum price
         # LatestBuysFilter
         salesPersonFk: Buyer
+        supplierFk: Supplier
         from: From
+        to: To
         active: Is active
+        visible: Is visible
         floramondo: Is floramondo
         showBadDates: Show future items
     userPanel:
         copyToken: Token copied to clipboard
         settings: Settings
+        logOut: Log Out
         localWarehouse: Local warehouse
         localBank: Local bank
         localCompany: Local company
@@ -857,9 +1085,9 @@ components:
         userCompany: User company
     smartCard:
         downloadFile: Download file
+        clone: Clone
         openCard: View
         openSummary: Summary
-        viewSummary: Summary
     cardDescriptor:
         mainList: Main list
         summary: Summary

src/i18n/locale/es.yml

@@ -58,8 +58,8 @@ globals:
     downloadCSVSuccess: Descarga de CSV exitosa
     reference: Referencia
     agency: Agencia
-    warehouseOut: Alm. salida
+    wareHouseOut: Alm. salida
-    warehouseIn: Alm. entrada
+    wareHouseIn: Alm. entrada
     landed: F. entrega
     shipped: F. envío
     totalEntries: Ent. totales
@@ -108,29 +108,6 @@ globals:
     weight: Peso
     error: ¡Ups! Algo salió mal
     recalc: Recalcular
-    alias: Alias
-    vat: IVA
-    intrastat: Intrastat
-    tags: Etiquetas
-    size: Medida
-    producer: Productor
-    origin: Origen
-    state: Estado
-    subtotal: Subtotal
-    visible: Visible
-    price: Precio
-    client: Cliente
-    country: País
-    phone: Teléfono
-    mobile: Móvil
-    postcode: Código postal
-    street: Dirección
-    tag: Etiqueta
-    ticketId: ID ticket
-    confirmed: Confirmado
-    small: Pequeño/a
-    medium: Mediano/a
-    big: Grande
     pageTitles:
         logIn: Inicio de sesión
         addressEdit: Modificar consignatario
@@ -324,10 +301,13 @@ globals:
     maxTemperature: Máx
     minTemperature: Mín
     params:
+        id: Id
         clientFk: Id cliente
         salesPersonFk: Comercial
         warehouseFk: Almacén
         provinceFk: Provincia
+        from: Desde
+        To: Hasta
         stateFk: Estado
         departmentFk: Departamento
         email: Correo
@@ -358,9 +338,13 @@ login:
     fieldRequired: Este campo es obligatorio
     twoFactorRequired: Verificación de doble factor requerida
 twoFactor:
+    code: Código
     validate: Validar
     insert: Introduce el código de verificación
     explanation: Por favor introduce el código de verificación que te hemos enviado a tu email en los próximos 5 minutos
+verifyEmail:
+    pageTitles:
+        verifyEmail: Verificación de correo
 recoverPassword:
     userOrEmail: Usuario o correo de recuperación
     explanation: >-
@@ -372,7 +356,15 @@ resetPassword:
 entry:
     list:
         newEntry: Nueva entrada
+        landed: F. entrega
+        invoiceNumber: Núm. factura
+        supplier: Proveedor
+        booked: Asentado
+        confirmed: Confirmado
+        ordered: Pedida
         tableVisibleColumns:
+            id: Id
+            reference: Referencia
             created: Creación
             supplierFk: Proveedor
             isBooked: Asentado
@@ -385,8 +377,11 @@ entry:
     summary:
         commission: Comisión
         currency: Moneda
+        company: Empresa
+        reference: Referencia
         invoiceNumber: Núm. factura
         ordered: Pedida
+        confirmed: Confirmada
         booked: Contabilizada
         excludedFromAvailable: Inventario
         travelReference: Referencia
@@ -395,108 +390,230 @@ entry:
         travelWarehouseOut: Alm. salida
         travelDelivered: Enviada
         travelLanded: F. entrega
+        travelWarehouseIn: Alm. entrada
         travelReceived: Recibida
         buys: Compras
+        quantity: Cantidad
         stickers: Etiquetas
         package: Embalaje
+        weight: Peso
         packing: Packing
         grouping: Grouping
         buyingValue: Coste
         import: Importe
         pvp: PVP
+        item: Artículo
     basicData:
+        supplier: Proveedor
         travel: Envío
+        reference: Referencia
+        invoiceNumber: Núm. factura
+        company: Empresa
         currency: Moneda
         observation: Observación
         commission: Comisión
+        ordered: Pedida
+        confirmed: Confirmado
         booked: Asentado
         excludedFromAvailable: Inventario
+        agency: Agencia
+        warehouseOut: Alm. salida
+        warehouseIn: Alm. entrada
+        shipped: F. envío
+        landed: F. entrega
+        id: ID
     buys:
+        groupingPrice: Precio grouping
+        packingPrice: Precio packing
+        reference: Referencia
         observations: Observaciónes
+        item: Artículo
+        size: Medida
+        packing: Packing
+        grouping: Grouping
+        buyingValue: Coste
         packagingFk: Embalaje
+        file: Fichero
+        name: Nombre
+        producer: Productor
+        type: Tipo
         color: Color
+        id: ID
         printedStickers: Etiquetas impresas
     notes:
         observationType: Tipo de observación
+    descriptor:
+        agency: Agencia
+        landed: F. entrega
+        warehouseOut: Alm. salida
     latestBuys:
         tableVisibleColumns:
             image: Foto
             itemFk: Id Artículo
+            packing: packing
+            grouping: Grouping
+            quantity: Cantidad
+            size: Medida
+            tags: Etiquetas
+            type: Tipo
+            intrastat: Intrastat
+            origin: Origen
             weightByPiece: Peso (gramos)/tallo
             isActive: Activo
             family: Familia
             entryFk: Entrada
+            buyingValue: Coste
             freightValue: Porte
             comissionValue: Comisión
+            description: Descripción
             packageValue: Embalaje
             isIgnored: Ignorado
             price2: Grouping
             price3: Packing
             minPrice: Min
             ektFk: Ekt
+            weight: Peso
+            packagingFk: Embalaje
             packingOut: Embalaje envíos
             landing: Llegada
             isExcludedFromAvailable: Es inventario
 ticket:
+    pageTitles:
+        tickets: Tickets
+        list: Listado
+        ticketCreate: Nuevo ticket
+        summary: Resumen
+        basicData: Datos básicos
+        boxing: Encajado
+        sms: Sms
+        notes: Notas
+        sale: Lineas del pedido
+        dms: Gestión documental
+        volume: Volumen
+        observation: Notas
+        ticketAdvance: Adelantar tickets
+        futureTickets: Tickets a futuro
+        expedition: Expedición
+        purchaseRequest: Petición de compra
+        weeklyTickets: Tickets programados
+        saleTracking: Líneas preparadas
+        services: Servicios
+        tracking: Estados
+        components: Componentes
+        pictures: Fotos
+        packages: Embalajes
+    list:
+        nickname: Alias
+        state: Estado
+        shipped: Enviado
+        landed: Entregado
+        salesPerson: Comercial
+        total: Total
     card:
+        ticketId: ID ticket
+        state: Estado
         customerId: ID cliente
+        salesPerson: Comercial
+        agency: Agencia
+        shipped: Enviado
+        warehouse: Almacén
         customerCard: Ficha del cliente
+        alias: Alias
         ticketList: Listado de tickets
         newOrder: Nuevo pedido
     boxing:
         expedition: Expedición
+        item: Artículo
         created: Creado
+        worker: Trabajador
         selectTime: 'Seleccionar hora:'
         selectVideo: 'Seleccionar vídeo:'
         notFound: No hay vídeos disponibles
     summary:
+        state: Estado
+        salesPerson: Comercial
+        agency: Agencia
         zone: Zona
+        warehouse: Almacén
         collection: Colección
         route: Ruta
         invoice: Factura
         shipped: Enviado
+        landed: Entregado
         consigneePhone: Tel. consignatario
         consigneeMobile: Móv. consignatario
         consigneeAddress: Dir. consignatario
         clientPhone: Tel. cliente
         clientMobile: Móv. cliente
         consignee: Consignatario
+        subtotal: Subtotal
+        vat: IVA
         total: Total
         saleLines: Líneas del pedido
+        item: Artículo
+        visible: Visible
         available: Disponible
+        quantity: Cantidad
+        price: Precio
         discount: Descuento
         packing: Encajado
         hasComponentLack: Faltan componentes
         itemShortage: No visible
         claim: Reclamación
         reserved: Reservado
+        created: Fecha creación
         package: Embalaje
         taxClass: Tipo IVA
         services: Servicios
         requester: Solicitante
         atender: Comprador
         request: Petición de compra
+        weight: Peso
         goTo: Ir a
         summaryAmount: Resumen
         purchaseRequest: Petición de compra
         service: Servicio
+        description: Descripción
         attender: Consignatario
     create:
+        client: Cliente
         address: Dirección
+        landed: F. entrega
+        warehouse: Almacén
+        agency: Agencia
 invoiceOut:
+    list:
+        ref: Referencia
+        issued: Fecha emisión
+        shortIssued: F. emisión
+        client: Cliente
+        created: Fecha creación
+        shortCreated: F. creación
+        company: Empresa
+        dued: Fecha vencimineto
+        shortDued: F. vencimiento
+        amount: Importe
     card:
         issued: Fecha emisión
+        client: Cliente
+        company: Empresa
         customerCard: Ficha del cliente
         ticketList: Listado de tickets
     summary:
         issued: Fecha
+        created: Fecha creación
         dued: Vencimiento
         booked: Contabilizada
+        company: Empresa
         taxBreakdown: Desglose impositivo
+        type: Tipo
         taxableBase: Base imp.
         rate: Tarifa
         fee: Cuota
         tickets: Tickets
+        ticketId: Id ticket
+        nickname: Alias
+        shipped: F. envío
         totalWithVat: Importe
     globalInvoices:
         errors:
@@ -509,16 +626,21 @@ invoiceOut:
             invoiceWithFutureDate: Existe una factura con una fecha futura
             noTicketsToInvoice: No existen tickets para facturar
             criticalInvoiceError: Error crítico en la facturación proceso detenido
-            invalidSerialTypeForAll: El tipo de serie debe ser global cuando se facturan todos los clientes
         table:
+            client: Cliente
             addressId: Id dirección
             streetAddress: Dirección fiscal
         statusCard:
             percentageText: '{getPercentage}% {getAddressNumber} de {getNAddresses}'
             pdfsNumberText: '{nPdfs} de {totalPdfs} PDFs'
     negativeBases:
+        company: Empresa
+        country: País
         clientId: Id cliente
+        client: Cliente
+        amount: Importe
         base: Base
+        ticketId: Id ticket
         active: Activo
         hasToInvoice: Facturar
         verifiedData: Datos comprobados
@@ -528,33 +650,59 @@ invoiceOut:
 order:
     field:
         salesPersonFk: Comercial
+        clientFk: Cliente
+        isConfirmed: Confirmada
+        created: Creado
+        landed: F. entrega
+        hour: Hora
+        agency: Agencia
+        total: Total
     form:
         clientFk: Cliente
         addressFk: Dirección
+        landed: F. entrega
         agencyModeFk: Agencia
     list:
         newOrder: Nuevo Pedido
     summary:
         basket: Cesta
+        nickname: Alias
+        company: Empresa
+        confirmed: Confirmada
         notConfirmed: No confirmada
         created: Creado
+        landed: F. entrega
+        phone: Teléfono
         createdFrom: Creado desde
         address: Dirección
+        notes: Notas
+        subtotal: Subtotal
         total: Total
         vat: IVA
         state: Estado
         alias: Alias
-        items: Artículos
+        items: Items
         orderTicketList: Tickets del pedido
+        details: Detalles
+        item: Item
+        quantity: Cantidad
+        price: Precio
         amount: Monto
-        confirm: Confirmar
-        confirmLines: Confirmar lineas
 shelving:
     list:
         parking: Parking
         priority: Prioridad
         newShelving: Nuevo Carro
     summary:
+        code: Código
+        parking: Parking
+        priority: Prioridad
+        worker: Trabajador
+        recyclable: Reciclable
+    basicData:
+        code: Código
+        parking: Parking
+        priority: Prioridad
         recyclable: Reciclable
 parking:
     pickingOrder: Orden de recogida
@@ -564,8 +712,15 @@ parking:
         info: Puedes buscar por código de parking
         label: Buscar parking...
 department:
+    pageTitles:
+        basicData: Basic data
+        department: Departamentos
+        summary: Resumen
+    name: Nombre
+    code: Código
     chat: Chat
     bossDepartment: Jefe de departamento
+    email: Email
     selfConsumptionCustomer: Cliente autoconsumo
     telework: Teletrabaja
     notifyOnErrors: Notificar errores
@@ -574,15 +729,52 @@ department:
     hasToSendMail: Enviar fichadas por mail
     departmentRemoved: Departamento eliminado
 worker:
+    pageTitles:
+        workers: Trabajadores
+        list: Listado
+        basicData: Datos básicos
+        summary: Resumen
+        notifications: Notificaciones
+        workerCreate: Nuevo trabajador
+        department: Departamentos
+        pda: PDA
+        notes: Notas
+        dms: Mi documentación
+        pbx: Centralita
+        log: Historial
+        calendar: Calendario
+        timeControl: Control de horario
+        locker: Taquilla
+        balance: Balance
+        formation: Formación
+        medical: Mutua
+        operator: Operario
     list:
+        name: Nombre
+        email: Email
+        phone: Teléfono
+        mobile: Móvil
+        active: Activo
         department: Departamento
         schedule: Horario
         newWorker: Nuevo trabajador
+    card:
+        workerId: ID Trabajador
+        user: Usuario
+        name: Nombre
+        email: Correo personal
+        phone: Teléfono
+        mobile: Móvil
+        active: Activo
+        warehouse: Almacén
+        agency: Empresa
+        salesPerson: Comercial
     summary:
+        basicData: Datos básicos
         boss: Jefe
-        phoneExtension: Ext. de teléfono
+        phoneExtension: Extensión de teléfono
-        entPhone: Tel. de empresa
+        entPhone: Teléfono de empresa
-        personalPhone: Tel. personal
+        personalPhone: Teléfono personal
         noBoss: Sin jefe
         userData: Datos de usuario
         userId: ID del usuario
@@ -601,12 +793,19 @@ worker:
         serialNumber: Número de serie
         removePDA: Desasignar PDA
     create:
+        name: Nombre
         lastName: Apellido
         birth: Fecha de nacimiento
         fi: DNI/NIF/NIE
         code: Código de trabajador
+        phone: Teléfono
+        postcode: Código postal
+        province: Provincia
+        city: Población
+        street: Dirección
         webUser: Usuario Web
         personalEmail: Correo personal
+        company: Empresa
         boss: Jefe
         payMethods: Método de pago
         iban: IBAN
@@ -618,13 +817,16 @@ worker:
             endDate: Fecha Fin
             center: Centro Formación
             invoice: Factura
+            amount: Importe
             remark: Bonficado
             hasDiploma: Diploma
     medical:
         tableVisibleColumns:
+            date: Fecha
             time: Hora
             center: Centro de Formación
             invoice: Factura
+            amount: Importe
             isFit: Apto
             remark: Observaciones
     imageNotFound: No se ha encontrado la imagen
@@ -649,7 +851,18 @@ worker:
         machine: Máquina
 
 wagon:
+    pageTitles:
+        wagons: Vagones
+        wagonsList: Listado vagones
+        wagonCreate: Crear tipo
+        wagonEdit: Editar tipo
+        typesList: Listado tipos
+        typeCreate: Crear tipo
+        typeEdit: Editar tipo
+        wagonCounter: Contador de carros
+        wagonTray: Listado bandejas
     type:
+        name: Nombre
         submit: Guardar
         reset: Deshacer cambios
         trayColor: Color de la bandeja
@@ -657,9 +870,13 @@ wagon:
     list:
         plate: Matrícula
         volume: Volumen
+        type: Tipo
         remove: Borrar
         removeItem: Vagón borrado correctamente
     create:
+        plate: Matrícula
+        volume: Volumen
+        type: Tipo
         label: Etiqueta
     warnings:
         noData: Sin datos disponibles
@@ -675,16 +892,26 @@ wagon:
 supplier:
     list:
         payMethod: Método de pago
+        payDeadline: Plazo de pago
+        payDay: Día de pago
         account: Cuenta
         newSupplier: Nuevo proveedor
         tableVisibleColumns:
+            id: Id
+            name: Nombre
             nif: NIF/CIF
+            nickname: Alias
             account: Cuenta
+            payMethod: Método de pago
+            payDay: Dia de pago
+            country: País
     summary:
         responsible: Responsable
+        notes: Notas
         verified: Verificado
         isActive: Está activo
         billingData: Forma de pago
+        payMethod: Método de pago
         payDeadline: Plazo de pago
         payDay: Día de pago
         account: Cuenta
@@ -697,17 +924,20 @@ supplier:
         fiscalAddress: Dirección fiscal
         socialName: Razón social
         taxNumber: NIF/CIF
+        street: Dirección
         city: Población
+        postCode: Código postal
         province: Provincia
+        country: País
     create:
         supplierName: Nombre del proveedor
     basicData:
+        alias: Alias
         workerFk: Responsable
-        isReal: Verificado
+        isSerious: Verificado
         isActive: Activo
         isPayMethodChecked: Método de pago validado
         note: Notas
-        size: Tamaño
     fiscalData:
         name: Razón social *
         nif: NIF/CIF *
@@ -716,17 +946,36 @@ supplier:
         sageWithholdingFk: Retención sage
         sageTransactionTypeFk: Tipo de transacción sage
         supplierActivityFk: Actividad proveedor
+        healthRegister: Pasaporte sanitario
+        street: Calle
+        postcode: Código postal
+        city: Población *
+        provinceFk: Provincia
+        country: País
         isTrucker: Transportista
         isVies: Vies
     billingData:
         payMethodFk: Forma de pago
         payDemFk: Plazo de pago
+        payDay: Día de pago
     accounts:
         iban: Iban
         bankEntity: Entidad bancaria
         beneficiary: Beneficiario
     contacts:
+        name: Nombre
+        phone: Teléfono
+        mobile: Móvil
+        email: Email
         observation: Notas
+    addresses:
+        street: Dirección
+        postcode: Código postal
+        phone: Teléfono
+        name: Nombre
+        city: Población
+        province: Provincia
+        mobile: Móvil
     agencyTerms:
         agencyFk: Agencia
         minimumM3: M3 mínimos
@@ -738,16 +987,25 @@ supplier:
         addRow: Añadir fila
     consumption:
         entry: Entrada
+        date: Fecha
+        reference: Referencia
 travel:
     travelList:
         tableVisibleColumns:
+            id: Id
             ref: Referencia
+            agency: Agencia
+            shipped: F.envío
             shipHour: Hora de envío
             landHour: Hora de llegada
+            landed: F.entrega
+            warehouseIn: Alm.salida
+            warehouseOut: Alm.entrada
             totalEntries: ∑
             totalEntriesTooltip: Entradas totales
             daysOnward: Días de llegada en adelante
     summary:
+        confirmed: Confirmado
         entryId: Id entrada
         freight: Porte
         package: Embalaje
@@ -760,89 +1018,62 @@ travel:
         AddEntry: Añadir entrada
         thermographs: Termógrafos
         hb: HB
+    variables:
+        search: Id/Referencia
+        agencyModeFk: Agencia
+        warehouseInFk: Alm. entrada
+        warehouseOutFk: ' Alm. salida'
+        landedFrom: Llegada desde
+        landedTo: Llegada hasta
+        continent: Cont. Salida
+        totalEntries: Ent. totales
     basicData:
+        reference: Referencia
+        agency: Agencia
+        shipped: F. Envío
+        landed: F. entrega
+        warehouseOut: Alm. salida
+        warehouseIn: Alm. entrada
+        delivered: Enviada
+        received: Recibida
         daysInForward: Días redada
-        isRaid: Redada
     thermographs:
+        code: Código
         temperature: Temperatura
+        state: Estado
         destination: Destino
+        created: Fecha creación
         thermograph: Termógrafo
+        reference: Referencia
+        type: Tipo
+        company: Empresa
+        warehouse: Almacén
         travelFileDescription: 'Id envío { travelId }'
-item:
+        file: Fichero
-    descriptor:
-        buyer: Comprador
-        color: Color
-        category: Categoría
-        available: Disponible
-        warehouseText: 'Calculado sobre el almacén de { warehouseName }'
-        itemDiary: Registro de compra-venta
-    list:
-        id: Identificador
-        stems: Tallos
-        category: Reino
-        typeName: Tipo
-        isActive: Activo
-        weightByPiece: Peso (gramos)/tallo
-        userName: Comprador
-        stemMultiplier: Multiplicador
-    fixedPrice:
-        itemFk: ID Artículo
-        groupingPrice: Precio grouping
-        packingPrice: Precio packing
-        hasMinPrice: Tiene precio mínimo
-        minPrice: Precio min
-        started: Inicio
-        ended: Fin
-    create:
-        priority: Prioridad
-    summary:
-        otherData: Otros datos
-        tax: IVA
-        botanical: Botánico
-        barcode: Código de barras
-        completeName: Nombre completo
-        family: Familia
-        stems: Tallos
-        multiplier: Multiplicador
-        buyer: Comprador
-        doPhoto: Hacer foto
-        intrastatCode: Código intrastat
-        ref: Referencia
-        relevance: Relevancia
-        weight: Peso (gramos)/tallo
-        units: Unidades/caja
-        expense: Gasto
-        generic: Genérico
-        recycledPlastic: Plástico reciclado
-        nonRecycledPlastic: Plástico no reciclado
-        minSalesQuantity: Cantidad mínima de venta
-        genus: Genus
-        specie: Specie
-    buyRequest:
-        requester: Solicitante
-        requested: Solicitado
-        attender: Comprador
-        achieved: Conseguido
-        concept: Concepto
 components:
     topbar: {}
     itemsFilterPanel:
         typeFk: Tipo
+        tag: Etiqueta
         value: Valor
         # ItemFixedPriceFilter
         buyerFk: Comprador
+        warehouseFk: Almacén
         started: Desde
         ended: Hasta
         mine: Para mi
         hasMinPrice: Precio mínimo
         # LatestBuysFilter
         salesPersonFk: Comprador
+        supplierFk: Proveedor
         active: Activo
+        visible: Visible
         floramondo: Floramondo
         showBadDates: Ver items a futuro
     userPanel:
         copyToken: Token copiado al portapapeles
         settings: Configuración
+        logOut: Cerrar sesión
         localWarehouse: Almacén local
         localBank: Banco local
         localCompany: Empresa local
@@ -850,6 +1081,7 @@ components:
         userCompany: Empresa del usuario
     smartCard:
         downloadFile: Descargar archivo
+        clone: Clonar
         openCard: Ficha
         openSummary: Detalles
         viewSummary: Vista previa

src/pages/Account/AccountCreate.vue

@@ -37,7 +37,7 @@ const redirectToAccountBasicData = (_, { id }) => {
             <div class="column q-gutter-sm">
                 <VnInput
                     v-model="data.name"
-                    :label="t('globals.name')"
+                    :label="t('account.create.name')"
                     :rules="validate('VnUser.name')"
                 />
                 <VnInput
@@ -47,12 +47,12 @@ const redirectToAccountBasicData = (_, { id }) => {
                 />
                 <VnInput
                     v-model="data.email"
-                    :label="t('globals.params.email')"
+                    :label="t('account.create.email')"
                     type="email"
                     :rules="validate('VnUser.email')"
                 />
                 <VnSelect
-                    :label="t('account.card.role')"
+                    :label="t('account.create.role')"
                     v-model="data.roleFk"
                     :options="rolesOptions"
                     option-value="id"
@@ -63,7 +63,7 @@ const redirectToAccountBasicData = (_, { id }) => {
                 />
                 <VnInput
                     v-model="data.password"
-                    :label="t('ldap.password')"
+                    :label="t('account.create.password')"
                     type="password"
                     :rules="validate('VnUser.password')"
                 />

src/pages/Account/AccountFilter.vue

@@ -45,7 +45,7 @@ const rolesOptions = ref([]);
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('globals.name')"
+                        :label="t('account.card.name')"
                         v-model="params.name"
                         lazy-rules
                         is-outlined

src/pages/Account/AccountLdap.vue

@@ -102,11 +102,11 @@ onMounted(async () => await getInitialLdapConfig());
                 <QBtn
                     class="q-ml-none"
                     color="primary"
-                    :label="t('account.card.testConnection')"
+                    :label="t('ldap.testConnection')"
                     @click="onTestConection()"
                 >
                     <QTooltip>
-                        {{ t('account.card.testConnection') }}
+                        {{ t('ldap.testConnection') }}
                     </QTooltip>
                 </QBtn>
             </template>
@@ -114,7 +114,7 @@ onMounted(async () => await getInitialLdapConfig());
                 <VnRow class="row q-gutter-md">
                     <div class="col">
                         <QCheckbox
-                            :label="t('account.card.enableSync')"
+                            :label="t('ldap.enableSync')"
                             v-model="data.hasData"
                             @update:model-value="($event) => (hasData = $event)"
                             :toggle-indeterminate="false"
@@ -146,7 +146,7 @@ onMounted(async () => await getInitialLdapConfig());
                     />
                     <VnInput :label="t('ldap.userDN')" clearable v-model="data.userDn" />
                     <VnInput
-                        :label="t('account.card.groupDN')"
+                        :label="t('ldap.groupDN')"
                         clearable
                         v-model="data.groupDn"
                     />

src/pages/Account/AccountList.vue

@@ -104,7 +104,7 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="AccountList"
+        data-key="AccountUsers"
         :expr-builder="exprBuilder"
         :label="t('account.search')"
         :info="t('account.searchInfo')"
@@ -112,12 +112,12 @@ const exprBuilder = (param, value) => {
     />
     <RightMenu>
         <template #right-panel>
-            <AccountFilter data-key="AccountList" />
+            <AccountFilter data-key="AccountUsers" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="AccountList"
+        data-key="AccountUsers"
         url="VnUsers/preview"
         :filter="filter"
         order="id DESC"

src/pages/Account/AccountSamba.vue

@@ -110,12 +110,12 @@ onMounted(async () => await getInitialSambaConfig());
                 <QBtn
                     class="q-ml-none"
                     color="primary"
-                    :label="t('account.card.testConnection')"
+                    :label="t('samba.testConnection')"
                     :disable="formModel.hasChanges"
                     @click="onTestConection()"
                 >
                     <QTooltip>
-                        {{ t('account.card.testConnection') }}
+                        {{ t('samba.testConnection') }}
                     </QTooltip>
                 </QBtn>
             </template>
@@ -123,7 +123,7 @@ onMounted(async () => await getInitialSambaConfig());
                 <VnRow class="row q-gutter-md">
                     <div class="col">
                         <QCheckbox
-                            :label="t('account.card.enableSync')"
+                            :label="t('samba.enableSync')"
                             v-model="data.hasData"
                             @update:model-value="($event) => (hasData = $event)"
                             :toggle-indeterminate="false"

src/pages/Account/Alias/AliasCreateForm.vue

@@ -36,12 +36,15 @@ const onDataSaved = ({ id }) => {
         <template #form-inputs="{ data }">
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.alias" :label="t('globals.name')" />
+                    <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
                 </div>
             </VnRow>
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.description" :label="t('role.description')" />
+                    <VnInput
+                        v-model="data.description"
+                        :label="t('mailAlias.description')"
+                    />
                 </div>
             </VnRow>
         </template>

src/pages/Account/Alias/Card/AliasBasicData.vue

@@ -11,8 +11,8 @@ const { t } = useI18n();
     <FormModel model="Alias">
         <template #form="{ data }">
             <div class="column q-gutter-y-md">
-                <VnInput v-model="data.alias" :label="t('globals.name')" />
+                <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
-                <VnInput v-model="data.description" :label="t('role.description')" />
+                <VnInput v-model="data.description" :label="t('mailAlias.description')" />
                 <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
             </div>
         </template>

src/pages/Account/Alias/Card/AliasDescriptor.vue

@@ -71,7 +71,7 @@ const removeAlias = () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('role.description')" :value="entity.description" />
+            <VnLv :label="t('mailAlias.description')" :value="entity.description" />
         </template>
     </CardDescriptor>
 </template>

src/pages/Account/Alias/Card/AliasSummary.vue

@@ -42,8 +42,8 @@ const entityId = computed(() => $props.id || route.params.id);
                         <QIcon name="open_in_new" />
                     </router-link>
                 </QCardSection>
-                <VnLv :label="t('role.id')" :value="alias.id" />
+                <VnLv :label="t('mailAlias.id')" :value="alias.id" />
-                <VnLv :label="t('role.description')" :value="alias.description" />
+                <VnLv :label="t('mailAlias.description')" :value="alias.description" />
             </QCard>
         </template>
     </CardSummary>

src/pages/Account/Card/AccountBasicData.vue

@@ -36,7 +36,7 @@ watch(
             <div class="q-gutter-y-sm">
                 <VnInput v-model="data.name" :label="t('account.card.nickname')" />
                 <VnInput v-model="data.nickname" :label="t('account.card.alias')" />
-                <VnInput v-model="data.email" :label="t('globals.params.email')" />
+                <VnInput v-model="data.email" :label="t('account.card.email')" />
                 <VnSelect
                     url="Languages"
                     v-model="data.lang"

src/pages/Account/Card/AccountDescriptor.vue

@@ -54,7 +54,7 @@ const hasAccount = ref(false);
         </template>
         <template #before>
             <!-- falla id :id="entityId.value" collection="user" size="160x160" -->
-            <VnImg :id="entityId" collection="user" resolution="520x520" class="photo">
+            <VnImg :id="entityId" collection="user" resolution="160x160" class="photo">
                 <template #error>
                     <div
                         class="absolute-full picture text-center q-pa-md flex flex-center"

src/pages/Account/Role/AccountRoles.vue

@@ -82,14 +82,14 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="AccountRolesList"
+        data-key="Roles"
         :expr-builder="exprBuilder"
         :label="t('role.searchRoles')"
         :info="t('role.searchInfo')"
     />
     <VnTable
         ref="tableRef"
-        data-key="AccountRolesList"
+        data-key="Roles"
         :url="`VnRoles`"
         :create="{
             urlCreate: 'VnRoles',

src/pages/Account/Role/AccountRolesFilter.vue

@@ -29,7 +29,7 @@ const props = defineProps({
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('globals.name')"
+                        :label="t('role.name')"
                         v-model="params.name"
                         lazy-rules
                         is-outlined

src/pages/Account/Role/Card/RoleBasicData.vue

@@ -12,12 +12,15 @@ const { t } = useI18n();
         <template #form="{ data }">
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.name" :label="t('globals.name')" />
+                    <VnInput v-model="data.name" :label="t('role.card.name')" />
                 </div>
             </VnRow>
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.description" :label="t('role.description')" />
+                    <VnInput
+                        v-model="data.description"
+                        :label="t('role.card.description')"
+                    />
                 </div>
             </VnRow>
         </template>

src/pages/Account/Role/Card/RoleCard.vue

@@ -9,7 +9,7 @@ const { t } = useI18n();
     <VnCard
         data-key="Role"
         :descriptor="RoleDescriptor"
-        search-data-key="AccountRolesList"
+        search-data-key="AccountRoles"
         :searchbar-props="{
             url: 'VnRoles',
             label: t('role.searchRoles'),

src/pages/Account/Role/Card/RoleDescriptor.vue

@@ -58,7 +58,7 @@ const removeRole = async () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('role.description')" :value="entity.description" />
+            <VnLv :label="t('role.card.description')" :value="entity.description" />
         </template>
     </CardDescriptor>
 </template>

src/pages/Account/Role/Card/RoleForm.vue

@@ -22,12 +22,15 @@ const { t } = useI18n();
         <template #form-inputs="{ data }">
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.name" :label="t('globals.name')" />
+                    <VnInput v-model="data.name" :label="t('role.card.name')" />
                 </div>
             </VnRow>
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.description" :label="t('role.description')" />
+                    <VnInput
+                        v-model="data.description"
+                        :label="t('role.card.description')"
+                    />
                 </div>
             </VnRow>
         </template>

src/pages/Account/Role/Card/RoleSummary.vue

@@ -44,9 +44,9 @@ const filter = {
                         <QIcon name="open_in_new" />
                     </a>
                 </QCardSection>
-                <VnLv :label="t('role.id')" :value="role.id" />
+                <VnLv :label="t('role.card.id')" :value="role.id" />
-                <VnLv :label="t('globals.name')" :value="role.name" />
+                <VnLv :label="t('role.card.name')" :value="role.name" />
-                <VnLv :label="t('role.description')" :value="role.description" />
+                <VnLv :label="t('role.card.description')" :value="role.description" />
             </QCard>
         </template>
     </CardSummary>

src/pages/Account/locale/en.yml

@@ -1,15 +1,32 @@
 account:
+    pageTitles:
+        users: Users
+        list: Users
+        roles: Roles
+        alias: Mail aliasses
+        accounts: Accounts
+        ldap: LDAP
+        samba: Samba
+        acls: ACLs
+        connections: Connections
+        inheritedRoles: Inherited Roles
+        subRoles: Sub Roles
+        newRole: New role
+        privileges: Privileges
+        mailAlias: Mail Alias
+        mailForwarding: Mail Forwarding
+        accountCreate: New user
+        aliasUsers: Users
     card:
+        name: Name
         nickname: User
         role: Role
+        email: Email
         alias: Alias
         lang: Language
         roleFk: Role
         newUser: New user
         ticketTracking: Ticket tracking
-        enableSync: Habilitar sincronización
-        groupDN: DN grupos
-        testConnection: Probar conexión
         privileges:
             delegate: Can delegate privileges
         enabled: Account enabled!
@@ -57,7 +74,11 @@ account:
     search: Search user
     searchInfo: You can search by id, name or nickname
     create:
+        name: Name
         nickname: Nickname
+        email: Email
+        role: Role
+        password: Password
         active: Active
     mailForwarding:
         forwardingMail: Forward email
@@ -65,30 +86,50 @@ account:
         enableMailForwarding: Enable mail forwarding
         mailInputInfo: All emails will be forwarded to the specified address.
 role:
+    pageTitles:
+        inheritedRoles: Inherited Roles
+        subRoles: Sub Roles
+    card:
+        description: Description
+        id: Id
+        name: Name
     newRole: New role
     searchRoles: Search role
     searchInfo: Search role by id or name
+    name: Name
     description: Description
     id: Id
 mailAlias:
+    pageTitles:
+        aliasUsers: Users
     search: Search mail alias
     searchInfo: Search alias by id or name
+    alias: Alias
+    description: Description
+    id: Id
     newAlias: New alias
+    name: Name
     isPublic: Public
 ldap:
+    enableSync: Enable synchronization
     server: Server
     rdn: RDN
     userDN: User DN
     filter: Filter
+    groupDN: Group DN
+    testConnection: Test connection
     success: LDAP connection established!
     password: Password
 samba:
+    enableSync: Enable synchronization
     domainController: Domain controller
     domainAD: AD domain
     userAD: AD user
+    groupDN: Group DN
     passwordAD: AD password
     domainPart: User DN (without domain part)
     verifyCertificate: Verify certificate
+    testConnection: Test connection
     success: Samba connection established!
 accounts:
     homedir: Homedir base
@@ -106,6 +147,8 @@ connections:
     created: Created
     killSession: Kill session
 acls:
+    role: Role
+    accessType: Access type
     permissions: Permission
     search: Search acls
     searchInfo: Search acls by model name

src/pages/Account/locale/es.yml

@@ -1,7 +1,27 @@
 account:
+    pageTitles:
+        users: Usuarios
+        list: Usuarios
+        roles: Roles
+        alias: Alias de correo
+        accounts: Cuentas
+        ldap: LDAP
+        samba: Samba
+        acls: ACLs
+        connections: Conexiones
+        inheritedRoles: Roles heredados
+        newRole: Nuevo rol
+        subRoles: Subroles
+        privileges: Privilegios
+        mailAlias: Alias de correo
+        mailForwarding: Reenvío de correo
+        accountCreate: Nuevo usuario
+        aliasUsers: Usuarios
     card:
         nickname: Usuario
+        name: Nombre
         role: Rol
+        email: Mail
         alias: Alias
         lang: Idioma
         roleFk: Rol
@@ -13,9 +33,6 @@ account:
         deactivated: ¡Usuario desactivado!
         newUser: Nuevo usuario
         twoFactor: Doble factor
-        enableSync: Habilitar sincronización
-        groupDN: DN grupos
-        testConnection: Probar conexión
         privileges:
             delegate: Puede delegar privilegios
         actions:
@@ -56,7 +73,11 @@ account:
     search: Buscar usuario
     searchInfo: Puedes buscar por id, nombre o usuario
     create:
+        name: Nombre
         nickname: Nombre mostrado
+        email: Email
+        role: Rol
+        password: Contraseña
         active: Activo
     mailForwarding:
         forwardingMail: Dirección de reenvío
@@ -64,30 +85,51 @@ account:
         enableMailForwarding: Habilitar redirección de correo
         mailInputInfo: Todos los correos serán reenviados a la dirección especificada, no se mantendrá copia de los mismos en el buzón del usuario.
 role:
+    pageTitles:
+        inheritedRoles: Roles heredados
+        subRoles: Subroles
+        newRole: Nuevo rol
+    card:
+        description: Descripción
+        id: Id
+        name: Nombre
     newRole: Nuevo rol
     searchRoles: Buscar roles
     searchInfo: Buscar rol por id o nombre
+    name: Nombre
     description: Descripción
     id: Id
 mailAlias:
+    pageTitles:
+        aliasUsers: Usuarios
     search: Buscar alias de correo
     searchInfo: Buscar alias por id o nombre
+    alias: Alias
+    description: Descripción
+    id: Id
     newAlias: Nuevo alias
+    name: Nombre
     isPublic: Público
 ldap:
     password: Contraseña
+    enableSync: Habilitar sincronización
     server: Servidor
     rdn: RDN
     userDN: DN usuarios
     filter: Filtro
+    groupDN: DN grupos
+    testConnection: Probar conexión
     success: ¡Conexión con LDAP establecida!
 samba:
+    enableSync: Habilitar sincronización
     domainController: Controlador de dominio
     domainAD: Dominio AD
+    groupDN: DN grupos
     userAD: Usuario AD
     passwordAD: Contraseña AD
     domainPart: DN usuarios (sin la parte del dominio)
     verifyCertificate: Verificar certificado
+    testConnection: Probar conexión
     success: ¡Conexión con Samba establecida!
 accounts:
     homedir: Directorio base para carpetas de usuario
@@ -105,6 +147,8 @@ connections:
     created: Creado
     killSession: Matar sesión
 acls:
+    role: Rol
+    accessType: Tipo de acceso
     permissions: Permiso
     search: Buscar acls
     searchInfo: Buscar acls por nombre

src/pages/Claim/Card/ClaimDescriptorMenu.vue

@@ -100,7 +100,7 @@ async function remove() {
         </QMenu>
     </QItem>
     <QSeparator />
-    <QItem @click="confirmRemove()" v-ripple clickable data-cy="deleteClaim">
+    <QItem @click="confirmRemove()" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="delete" />
         </QItemSection>

src/pages/Claim/Card/ClaimLinesImport.vue

@@ -130,7 +130,7 @@ function cancel() {
                 <template #body-cell-description="{ row, value }">
                     <QTd auto-width align="right" class="link">
                         {{ value }}
-                        <ItemDescriptorProxy :id="row.itemFk" />
+                        <ItemDescriptorProxy :id="row.itemFk"></ItemDescriptorProxy>
                     </QTd>
                 </template>
             </QTable>

src/pages/Claim/Card/ClaimNotes.vue

@@ -25,7 +25,7 @@ const claimFilter = computed(() => {
                 include: {
                     relation: 'user',
                     scope: {
-                        fields: ['id', 'nickname', 'name'],
+                        fields: ['id', 'nickname'],
                     },
                 },
             },

src/pages/Claim/ClaimFilter.vue

@@ -23,7 +23,7 @@ defineExpose({ states });
 
 <template>
     <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>

src/pages/Customer/Card/CustomerAddress.vue

@@ -27,7 +27,7 @@ const addressFilter = {
         'isLogifloraAllowed',
         'postalCode',
     ],
-    order: ['isDefaultAddress DESC', 'isActive DESC', 'id DESC', 'nickname ASC'],
+    order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
     include: [
         {
             relation: 'observations',

src/pages/Customer/Card/CustomerBalance.vue

@@ -5,7 +5,7 @@ import { useRoute } from 'vue-router';
 import { useAcl } from 'src/composables/useAcl';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
-import { getClientRisk } from '../composables/getClientRisk';
+import FetchData from 'components/FetchData.vue';
 
 import { toCurrency, toDate, toDateHourMin } from 'src/filters';
 import { useState } from 'composables/useState';
@@ -16,7 +16,7 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
-import VnFilter from 'components/VnTable/VnFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
@@ -25,7 +25,7 @@ const { openConfirmationModal } = useVnConfirm();
 const { sendEmail, openReport } = usePrintService();
 const { t } = useI18n();
 const { hasAny } = useAcl();
-
+const currentBalance = ref({});
 const quasar = useQuasar();
 const route = useRoute();
 const state = useState();
@@ -33,53 +33,28 @@ const stateStore = useStateStore();
 const user = state.getUser();
 
 const clientRisk = ref([]);
+const companies = ref([]);
 const tableRef = ref();
-const companyId = ref();
+const companyId = ref(user.value.companyFk);
-const companyUser = ref(user.value.companyFk);
 const balances = ref([]);
 const vnFilterRef = ref({});
 const filter = computed(() => {
     return {
         clientId: route.params.id,
-        companyId: companyId.value ?? companyUser.value,
+        companyId: companyId.value ?? user.value.companyFk,
     };
 });
 
-const companyFilterColumn = {
-    align: 'left',
-    name: 'companyId',
-    label: t('Company'),
-    component: 'select',
-    attrs: {
-        url: 'Companies',
-        optionLabel: 'code',
-        optionValue: 'id',
-        sortBy: 'code',
-    },
-    columnFilter: {
-        event: {
-            remove: () => (companyId.value = null),
-            'update:modelValue': (newCompanyFk) => {
-                if (!newCompanyFk) return;
-                vnFilterRef.value.addFilter(newCompanyFk);
-                companyUser.value = newCompanyFk;
-            },
-            blur: () => !companyId.value && (companyId.value = companyUser.value),
-        },
-    },
-    visible: false,
-};
-
 const columns = computed(() => [
     {
-        align: 'left',
+        align: 'right',
         name: 'payed',
         label: t('Date'),
         format: ({ payed }) => toDate(payed),
         cardVisible: true,
     },
     {
-        align: 'left',
+        align: 'right',
         name: 'created',
         label: t('Creation date'),
         format: ({ created }) => toDateHourMin(created),
@@ -90,12 +65,7 @@ const columns = computed(() => [
         label: t('Employee'),
         columnField: {
             component: 'userLink',
-            attrs: ({ row }) => {
+            attrs: ({ row }) => ({ workerId: row.workerFk, name: row.userName }),
-                return {
-                    workerId: row.workerFk,
-                    name: row.userName,
-                };
-            },
         },
         cardVisible: true,
     },
@@ -107,13 +77,13 @@ const columns = computed(() => [
         class: 'extend',
     },
     {
-        align: 'left',
+        align: 'right',
         name: 'bankFk',
         label: t('Bank'),
         cardVisible: true,
     },
     {
-        align: 'left',
+        align: 'right',
         name: 'debit',
         label: t('Debit'),
         format: ({ debit }) => debit && toCurrency(debit),
@@ -166,37 +136,20 @@ const columns = computed(() => [
 
 onBeforeMount(() => {
     stateStore.rightDrawer = true;
-    companyId.value = companyUser.value;
 });
 
-async function getClientRisks() {
+async function getCurrentBalance(data) {
-    const filter = {
+    currentBalance.value[companyId.value] = {
-        where: { clientFk: route.params.id, companyFk: companyUser.value },
+        amount: 0,
+        code: companies.value.find((c) => c.id === companyId.value)?.code,
     };
-    const { data } = await getClientRisk(filter);
-    clientRisk.value = data;
-    return clientRisk.value;
-}
 
-async function getCurrentBalance() {
+    for (const balance of data) {
-    const currentBalance = (await getClientRisks()).find((balance) => {
+        currentBalance.value[balance.companyFk] = {
-        return balance.companyFk === companyId.value;
+            code: balance.company.code,
-    });
+            amount: balance.amount,
-    return currentBalance && currentBalance.amount;
+        };
     }
-
-async function onFetch(data) {
-    balances.value = [];
-    for (const [index, balance] of data.entries()) {
-        if (index === 0) {
-            balance.balance = await getCurrentBalance();
-            continue;
-        }
-        const previousBalance = data[index - 1];
-        balance.balance =
-            previousBalance?.balance - (previousBalance?.debit - previousBalance?.credit);
-    }
-    balances.value = data;
 }
 
 const showNewPaymentDialog = () => {
@@ -216,25 +169,43 @@ const showBalancePdf = ({ id }) => {
 </script>
 
 <template>
+    <FetchData
+        url="Companies"
+        auto-load
+        @on-fetch="(data) => (companies = data)"
+    ></FetchData>
+    <FetchData
+        v-if="companies.length > 0"
+        url="clientRisks"
+        :filter="{
+            include: { relation: 'company', scope: { fields: ['code'] } },
+            where: { clientFk: route.params.id },
+        }"
+        auto-load
+        @on-fetch="getCurrentBalance"
+    ></FetchData>
+
     <VnSubToolbar class="q-mb-md">
         <template #st-data>
             <div class="column justify-center q-px-md q-py-sm">
                 <span class="text-bold">{{ t('Total by company') }}</span>
-                <div class="row justify-center" v-if="clientRisk?.length">
+                <div class="row justify-center">
-                    {{ clientRisk[0].company.code }}:
+                    {{ currentBalance[companyId]?.code }}:
-                    {{ toCurrency(clientRisk[0].amount) }}
+                    {{ toCurrency(currentBalance[companyId]?.amount) }}
                 </div>
             </div>
         </template>
         <template #st-actions>
             <div>
-                <VnFilter
+                <VnSelect
+                    :label="t('Company')"
                     ref="vnFilterRef"
                     v-model="companyId"
                     data-key="CustomerBalance"
-                    :column="companyFilterColumn"
+                    :options="companies"
-                    search-url="balance"
+                    option-label="code"
-                />
+                    option-value="id"
+                ></VnSelect>
             </div>
         </template>
     </VnSubToolbar>
@@ -248,7 +219,6 @@ const showBalancePdf = ({ id }) => {
         :right-search="false"
         :is-editable="false"
         :column-search="false"
-        @on-fetch="onFetch"
         :disable-option="{ card: true }"
         auto-load
     >
@@ -256,10 +226,10 @@ const showBalancePdf = ({ id }) => {
             {{ toCurrency(balances[rowIndex]?.balance) }}
         </template>
         <template #column-description="{ row }">
-            <span class="link" v-if="row.isInvoice" @click.stop>
+            <div class="link" v-if="row.isInvoice">
                 {{ t('bill', { ref: row.description }) }}
-                <InvoiceOutDescriptorProxy :id="row.id" />
+                <InvoiceOutDescriptorProxy :id="row.description" />
-            </span>
+            </div>
             <span v-else class="q-pa-xs dotted rounded-borders" :title="row.description">
                 {{ row.description }}
             </span>

src/pages/Customer/Card/CustomerBasicData.vue

@@ -55,7 +55,7 @@ const exprBuilder = (param, value) => {
                 />
                 <VnSelect
                     :input-debounce="0"
-                    :label="t('customer.summary.businessType')"
+                    :label="t('customer.basicData.businessType')"
                     :options="businessTypes"
                     :rules="validate('client.businessTypeFk')"
                     emit-value
@@ -67,13 +67,13 @@ const exprBuilder = (param, value) => {
             </VnRow>
             <VnRow>
                 <VnInput
-                    :label="t('customer.summary.contact')"
+                    :label="t('customer.basicData.contact')"
                     :rules="validate('client.contact')"
                     clearable
                     v-model="data.contact"
                 />
                 <VnInput
-                    :label="t('globals.params.email')"
+                    :label="t('customer.basicData.email')"
                     :rules="validate('client.email')"
                     clearable
                     type="email"
@@ -90,13 +90,13 @@ const exprBuilder = (param, value) => {
             </VnRow>
             <VnRow>
                 <VnInput
-                    :label="t('customer.extendedList.tableVisibleColumns.phone')"
+                    :label="t('customer.basicData.phone')"
                     :rules="validate('client.phone')"
                     clearable
                     v-model="data.phone"
                 />
                 <VnInput
-                    :label="t('customer.summary.mobile')"
+                    :label="t('customer.basicData.mobile')"
                     :rules="validate('client.mobile')"
                     clearable
                     v-model="data.mobile"
@@ -106,7 +106,7 @@ const exprBuilder = (param, value) => {
                 <VnSelect
                     url="Workers/search"
                     v-model="data.salesPersonFk"
-                    :label="t('customer.summary.salesPerson')"
+                    :label="t('customer.basicData.salesPerson')"
                     :params="{
                         departmentCodes: ['VT', 'shopping'],
                     }"
@@ -144,7 +144,7 @@ const exprBuilder = (param, value) => {
                     option-value="id"
                     option-label="name"
                     emit-value
-                    :label="t('customer.summary.contactChannel')"
+                    :label="t('customer.basicData.contactChannel')"
                     map-options
                     :rules="validate('client.contactChannelFk')"
                     :input-debounce="0"

src/pages/Customer/Card/CustomerCredits.vue

@@ -49,9 +49,7 @@ const columns = computed(() => [
         name: 'credit',
         create: true,
         visible: false,
-        columnCreate: {
+        attrs: {
-            component: 'number',
-            required: true,
             autofocus: true,
         },
     },

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -37,9 +37,6 @@ const entityId = computed(() => {
 
 const data = ref(useCardDescription());
 const setData = (entity) => (data.value = useCardDescription(entity?.name, entity?.id));
-const debtWarning = computed(() => {
-    return customer.value?.debt > customer.value?.credit ? 'negative' : 'primary';
-});
 </script>
 
 <template>
@@ -56,17 +53,11 @@ const debtWarning = computed(() => {
             <CustomerDescriptorMenu :customer="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv
+            <VnLv :label="t('customer.card.payMethod')" :value="entity.payMethod.name" />
-                :label="t('customer.summary.payMethod')"
-                :value="entity.payMethod.name"
-            />
 
+            <VnLv :label="t('customer.card.credit')" :value="toCurrency(entity.credit)" />
             <VnLv
-                :label="t('customer.summary.credit')"
+                :label="t('customer.card.securedCredit')"
-                :value="toCurrency(entity.credit)"
-            />
-            <VnLv
-                :label="t('customer.summary.securedCredit')"
                 :value="toCurrency(entity.creditInsurance)"
             />
 
@@ -75,7 +66,7 @@ const debtWarning = computed(() => {
                 :value="toCurrency(entity.debt)"
                 :info="t('customer.summary.riskInfo')"
             />
-            <VnLv :label="t('customer.summary.salesPerson')">
+            <VnLv :label="t('customer.card.salesPerson')">
                 <template #value>
                     <VnUserLink
                         v-if="entity.salesPersonUser"
@@ -86,7 +77,7 @@ const debtWarning = computed(() => {
                 </template>
             </VnLv>
             <VnLv
-                :label="t('customer.extendedList.tableVisibleColumns.businessTypeFk')"
+                :label="t('customer.card.businessTypeFk')"
                 :value="entity.businessType.description"
             />
         </template>
@@ -120,7 +111,7 @@ const debtWarning = computed(() => {
                     v-if="customer.debt > customer.credit"
                     name="vn:risk"
                     size="xs"
-                    :color="debtWarning"
+                    color="primary"
                 >
                     <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
                 </QIcon>
@@ -159,7 +150,7 @@ const debtWarning = computed(() => {
             </QCardActions>
         </template>
         <template #actions="{ entity }">
-            <QCardActions class="flex justify-center" style="padding-inline: 0">
+            <QCardActions class="flex justify-center">
                 <QBtn
                     :to="{
                         name: 'TicketList',
@@ -224,8 +215,6 @@ es:
     Go to module index: Ir al índice del módulo
     Customer ticket list: Listado de tickets del cliente
     Customer invoice out list: Listado de facturas del cliente
-    New order: Nuevo pedido
-    New ticket: Nuevo ticket
     Go to user: Ir al usuario
     Go to supplier: Ir al proveedor
     Customer unpaid: Cliente impago

src/pages/Customer/Card/CustomerDescriptorMenu.vue

@@ -6,8 +6,11 @@ import axios from 'axios';
 import { useQuasar } from 'quasar';
 
 import useNotify from 'src/composables/useNotify';
+
 import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
-import useOpenURL from 'src/composables/useOpenURL';
+import TicketCreateDialog from 'src/pages/Ticket/TicketCreateDialog.vue';
+import OrderCreateDialog from 'src/pages/Order/Card/OrderCreateDialog.vue';
+import { ref } from 'vue';
 
 const $props = defineProps({
     customer: {
@@ -15,6 +18,7 @@ const $props = defineProps({
         required: true,
     },
 });
+
 const { notify } = useNotify();
 const { t } = useI18n();
 const quasar = useQuasar();
@@ -24,7 +28,7 @@ const showSmsDialog = () => {
     quasar.dialog({
         component: VnSmsDialog,
         componentProps: {
-            phone: $props.customer.mobile || $props.customer.phone,
+            phone: $props.customer.phone || $props.customer.mobile,
             promise: sendSms,
         },
     });
@@ -40,39 +44,31 @@ const sendSms = async (payload) => {
     }
 };
 
-const openCreateForm = (type) => {
+const ticketCreateFormDialog = ref(null);
-    const query = {
+const openTicketCreateForm = () => {
-        table: {
+    ticketCreateFormDialog.value.show();
-            clientFk: $props.customer.id,
-        },
-        createForm: {
-            addressId: $props.customer.defaultAddressFk,
-        },
 };
-    const clientFk = {
+const orderCreateFormDialog = ref(null);
-        ticket: 'clientId',
+const openOrderCreateForm = () => {
-        order: 'clientFk',
+    orderCreateFormDialog.value.show();
-    };
-    const key = clientFk[type];
-    if (!key) return;
-    query.createForm[key] = $props.customer.id;
-
-    const params = Object.entries(query)
-        .map(([key, value]) => `${key}=${JSON.stringify(value)}`)
-        .join('&');
-    useOpenURL(`/#/${type}/list?${params}`);
 };
 </script>
 
 <template>
-    <QItem v-ripple clickable @click="openCreateForm('ticket')">
+    <QItem v-ripple clickable @click="openTicketCreateForm()">
         <QItemSection>
             {{ t('globals.pageTitles.createTicket') }}
+            <QDialog ref="ticketCreateFormDialog">
+                <TicketCreateDialog />
+            </QDialog>
         </QItemSection>
     </QItem>
-    <QItem v-ripple clickable @click="openCreateForm('order')">
+    <QItem v-ripple clickable @click="openOrderCreateForm()">
         <QItemSection>
             {{ t('globals.pageTitles.createOrder') }}
+            <QDialog ref="orderCreateFormDialog">
+                <OrderCreateDialog :client-fk="customer.id" />
+            </QDialog>
         </QItemSection>
     </QItem>
     <QItem v-ripple clickable>

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -53,11 +53,11 @@ function handleLocation(data, location) {
                         </QIcon>
                     </template>
                 </VnInput>
-                <VnInput :label="t('Tax number')" clearable v-model="data.fi" required />
+                <VnInput :label="t('Tax number')" clearable v-model="data.fi" />
             </VnRow>
 
             <VnRow>
-                <VnInput :label="t('Street')" clearable v-model="data.street" required />
+                <VnInput :label="t('Street')" clearable v-model="data.street" />
             </VnRow>
 
             <VnRow>
@@ -68,7 +68,6 @@ function handleLocation(data, location) {
                     option-label="vat"
                     option-value="id"
                     v-model="data.sageTaxTypeFk"
-                    :required="data.isTaxDataChecked"
                 />
                 <VnSelect
                     :label="t('Sage transaction type')"
@@ -77,7 +76,6 @@ function handleLocation(data, location) {
                     option-label="transaction"
                     option-value="id"
                     v-model="data.sageTransactionTypeFk"
-                    :required="data.isTaxDataChecked"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
@@ -98,7 +96,6 @@ function handleLocation(data, location) {
                     :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :location="data"
-                    :required="true"
                     @update:model-value="(location) => handleLocation(data, location)"
                 />
             </VnRow>

src/pages/Customer/Card/CustomerGreuges.vue

@@ -80,11 +80,6 @@ const columns = computed(() => [
         align: 'left',
         name: 'amount',
         label: t('Amount'),
-        columnCreate: {
-            component: 'number',
-            autofocus: true,
-            required: true,
-        },
         format: ({ amount }) => toCurrency(amount),
         create: true,
     },

src/pages/Customer/Card/CustomerRecoveries.vue

@@ -56,7 +56,6 @@ const columns = computed(() => [
         label: t('Period'),
         create: true,
         ...componentColumn('number'),
-        required: true,
     },
     {
         align: 'left',

src/pages/Customer/Card/CustomerSummary.vue

@@ -1,15 +1,13 @@
 <script setup>
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
-import { toCurrency, toPercentage, toDate, dashOrCurrency } from 'src/filters';
+import { toCurrency, toPercentage, toDate } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
-import { getUrl } from 'src/composables/getUrl';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-import VnLinkMail from 'src/components/ui/VnLinkMail.vue';
 import CustomerSummaryTable from 'src/pages/Customer/components/CustomerSummaryTable.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
@@ -27,16 +25,16 @@ const $props = defineProps({
 const entityId = computed(() => $props.id || route.params.id);
 const customer = computed(() => summary.value.entity);
 const summary = ref();
-const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);
+
 const balanceDue = computed(() => {
-    const amount = defaulterAmount.value;
+    return (
-    if (!amount || amount < 0) {
+        customer.value &&
-        return null;
+        customer.value.defaulters.length &&
-    }
+        customer.value.defaulters[0].amount
-    return amount;
+    );
 });
 
-const balanceDueWarning = computed(() => (defaulterAmount.value ? 'negative' : ''));
+const balanceDueWarning = computed(() => (balanceDue.value ? 'negative' : ''));
 
 const claimRate = computed(() => {
     return customer.value.claimsRatio?.claimingRate ?? 0;
@@ -69,7 +67,6 @@ const sumRisk = ({ clientRisks }) => {
         ref="summary"
         :url="`Clients/${entityId}/summary`"
         data-key="CustomerSummary"
-        module-name="Customer"
     >
         <template #body="{ entity }">
             <QCard class="vn-one">
@@ -82,7 +79,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
                 <VnLv :value="entity.phone">
                     <template #label>
-                        {{ t('customer.extendedList.tableVisibleColumns.phone') }}
+                        {{ t('customer.summary.phone') }}
                         <VnLinkPhone :phone-number="entity.phone" />
                     </template>
                 </VnLv>
@@ -90,19 +87,9 @@ const sumRisk = ({ clientRisks }) => {
                     <template #label>
                         {{ t('customer.summary.mobile') }}
                         <VnLinkPhone :phone-number="entity.mobile" />
-                        <VnLinkPhone
-                            say-simple
-                            :phone-number="entity.mobile"
-                            :channel="entity.country?.saySimpleCountry?.channel"
-                            class="q-ml-xs"
-                        />
                     </template>
                 </VnLv>
-                <VnLv :value="entity.email" copy
+                <VnLv :label="t('customer.summary.email')" :value="entity.email" copy />
-                    ><template #label>
-                        {{ t('globals.params.email') }}
-                        <VnLinkMail email="entity.email"></VnLinkMail> </template
-                ></VnLv>
                 <VnLv
                     :label="t('customer.summary.salesPerson')"
                     :value="entity?.salesPersonUser?.name"
@@ -143,7 +130,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv
                     v-if="entity.country"
                     :label="t('customer.summary.country')"
-                    :value="entity.country.name"
+                    :value="entity.country.country"
                 />
                 <VnLv :label="t('customer.summary.street')" :value="entity.street" />
             </QCard>
@@ -179,7 +166,7 @@ const sumRisk = ({ clientRisks }) => {
             <QCard class="vn-one">
                 <VnTitle
                     :url="`#/customer/${entityId}/billing-data`"
-                    :text="t('customer.summary.billingData')"
+                    :text="t('customer.summary.payMethodFk')"
                 />
                 <VnLv
                     :label="t('customer.summary.payMethod')"
@@ -214,7 +201,7 @@ const sumRisk = ({ clientRisks }) => {
                     :value="entity.defaultAddress.city"
                 />
                 <VnLv
-                    :label="t('customer.summary.street')"
+                    :label="t('customer.summary.addressStreet')"
                     :value="entity.defaultAddress.street"
                 />
             </QCard>
@@ -235,7 +222,6 @@ const sumRisk = ({ clientRisks }) => {
             </QCard>
             <QCard class="vn-one" v-if="entity.account">
                 <VnTitle
-                    target="_blank"
                     :url="`${grafanaUrl}/d/adjlxzv5yjt34d/analisis-de-clientes-7c-crm?orgId=1&var-clientFk=${entityId}`"
                     :text="t('customer.summary.businessData')"
                     icon="vn:grafana"
@@ -249,7 +235,6 @@ const sumRisk = ({ clientRisks }) => {
                     :value="toCurrency(entity?.mana?.mana)"
                 />
                 <VnLv
-                    v-if="entity.claimsRatio"
                     :label="t('customer.summary.priceIncreasingRate')"
                     :value="toPercentage(priceIncreasingRate)"
                 />
@@ -258,14 +243,12 @@ const sumRisk = ({ clientRisks }) => {
                     :value="toCurrency(entity?.averageInvoiced?.invoiced)"
                 />
                 <VnLv
-                    v-if="entity.claimsRatio"
                     :label="t('customer.summary.claimRate')"
                     :value="toPercentage(claimRate)"
                 />
             </QCard>
             <QCard class="vn-one" v-if="entity.account">
                 <VnTitle
-                    target="_blank"
                     :url="`${grafanaUrl}/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
                     :text="t('customer.summary.payMethodFk')"
                     icon="vn:grafana"
@@ -285,12 +268,10 @@ const sumRisk = ({ clientRisks }) => {
                 />
 
                 <VnLv
-                    v-if="entity.creditInsurance"
                     :label="t('customer.summary.securedCredit')"
                     :value="toCurrency(entity.creditInsurance)"
                     :info="t('customer.summary.securedCreditInfo')"
                 />
-
                 <VnLv
                     :label="t('customer.summary.balance')"
                     :value="toCurrency(sumRisk(entity)) || toCurrency(0)"
@@ -300,7 +281,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv
                     v-if="entity.defaulters"
                     :label="t('customer.summary.balanceDue')"
-                    :value="dashOrCurrency(balanceDue)()"
+                    :value="toCurrency(balanceDue)"
                     :class="balanceDueWarning"
                     :info="t('customer.summary.balanceDueInfo')"
                 />
@@ -320,7 +301,7 @@ const sumRisk = ({ clientRisks }) => {
                     :value="entity.recommendedCredit"
                 />
             </QCard>
-            <QCard class="vn-max">
+            <QCard>
                 <VnTitle :text="t('Latest tickets')" />
                 <CustomerSummaryTable />
             </QCard>

src/pages/Customer/Card/CustomerUnpaid.vue

@@ -2,9 +2,10 @@
 import { computed, onBeforeMount, ref, watch, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
+
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnRow from 'components/ui/VnRow.vue';
+
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify';
 import { useStateStore } from 'stores/useStateStore';

src/pages/Customer/CustomerFilter.vue

@@ -11,24 +11,10 @@ defineProps({
         required: true,
     },
 });
-const handleSalesModelValue = (val) => ({
-    or: [
-        { id: val },
-        { name: val },
-        { nickname: { like: '%' + val + '%' } },
-        { code: { like: `${val}%` } },
-    ],
-});
-
-const exprBuilder = (param, value) => {
-    return {
-        and: [{ active: { neq: false } }, handleSalesModelValue(value)],
-    };
-};
 </script>
 
 <template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true">
+    <VnFilterPanel :data-key="dataKey" :search-button="true" search-url="table">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -48,7 +34,7 @@ const exprBuilder = (param, value) => {
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('globals.name')"
+                        :label="t('customerFilter.filter.name')"
                         v-model="params.name"
                         is-outlined
                     />
@@ -57,7 +43,7 @@ const exprBuilder = (param, value) => {
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('customer.summary.socialName')"
+                        :label="t('customerFilter.filter.socialName')"
                         v-model="params.socialName"
                         is-outlined
                     />
@@ -66,18 +52,14 @@ const exprBuilder = (param, value) => {
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnSelect
-                        url="Workers/search"
+                        url="Workers/activeWithInheritedRole"
-                        :params="{
+                        :filter="{ where: { role: 'salesPerson' } }"
-                            departmentCodes: ['VT'],
-                        }"
                         auto-load
                         :label="t('Salesperson')"
-                        :expr-builder="exprBuilder"
                         v-model="params.salesPersonFk"
                         @update:model-value="searchFn()"
                         option-value="id"
                         option-label="name"
-                        sort-by="nickname ASC"
                         emit-value
                         map-options
                         use-input
@@ -86,18 +68,7 @@ const exprBuilder = (param, value) => {
                         outlined
                         rounded
                         :input-debounce="0"
-                    >
+                    />
-                        <template #option="{ itemProps, opt }">
-                            <QItem v-bind="itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ opt.name }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ opt.nickname }},{{ opt.code }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template></VnSelect
-                    >
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">

src/pages/Customer/CustomerList.vue

@@ -68,6 +68,7 @@ const columns = computed(() => [
             fields: ['id', 'name'],
             where: { role: 'salesPerson' },
             optionFilter: 'firstName',
+            useLike: false,
         },
         create: false,
         columnField: {
@@ -77,7 +78,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.credit'),
+        label: t('customer.extendedList.tableVisibleColumns.credit'),
         name: 'credit',
         columnFilter: {
             component: 'number',
@@ -115,7 +116,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.mobile'),
+        label: t('customer.extendedList.tableVisibleColumns.mobile'),
         name: 'mobile',
         cardVisible: true,
         columnFilter: {
@@ -162,17 +163,17 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.city'),
+        label: t('customer.extendedList.tableVisibleColumns.city'),
         name: 'city',
     },
     {
         align: 'left',
-        label: t('customer.summary.postcode'),
+        label: t('customer.extendedList.tableVisibleColumns.postcode'),
         name: 'postcode',
     },
     {
         align: 'left',
-        label: t('globals.params.email'),
+        label: t('customer.extendedList.tableVisibleColumns.email'),
         name: 'email',
         cardVisible: true,
     },
@@ -207,7 +208,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.payMethodFk'),
+        label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
         name: 'payMethodFk',
         columnFilter: {
             component: 'select',
@@ -250,7 +251,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.isActive'),
+        label: t('customer.extendedList.tableVisibleColumns.isActive'),
         name: 'isActive',
         chip: {
             color: null,
@@ -279,7 +280,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.isEqualizated'),
+        label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
         name: 'isEqualizated',
         create: true,
         columnFilter: {
@@ -325,7 +326,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.hasLcr'),
+        label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
         name: 'hasLcr',
         columnFilter: {
             inWhere: true,
@@ -333,7 +334,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.hasCoreVnl'),
+        label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
         name: 'hasCoreVnl',
         columnFilter: {
             inWhere: true,
@@ -394,16 +395,16 @@ function handleLocation(data, location) {
     <VnSearchbar
         :info="t('You can search by customer id or name')"
         :label="t('Search customer')"
-        data-key="CustomerList"
+        data-key="Customer"
     />
     <RightMenu>
         <template #right-panel>
-            <CustomerFilter data-key="CustomerList" />
+            <CustomerFilter data-key="Customer" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="CustomerList"
+        data-key="Customer"
         url="Clients/filter"
         :create="{
             urlCreate: 'Clients/createWithUser',
@@ -424,14 +425,13 @@ function handleLocation(data, location) {
             <VnSelect
                 url="Workers/search"
                 v-model="data.salesPersonFk"
-                :label="t('customer.summary.salesPerson')"
+                :label="t('customer.basicData.salesPerson')"
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
                 }"
-                :fields="['id', 'nickname', 'code']"
+                :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
-                option-label="nickname"
+                :use-like="false"
-                option-value="id"
                 emit-value
                 auto-load
             >

src/pages/Customer/components/CustomerAddressCreate.vue

@@ -85,26 +85,15 @@ function handleLocation(data, location) {
             <QCheckbox :label="t('Default')" v-model="data.isDefaultAddress" />
 
             <VnRow>
-                <VnInput
+                <VnInput :label="t('Consignee')" clearable v-model="data.nickname" />
-                    :label="t('Consignee')"
-                    required
-                    clearable
-                    v-model="data.nickname"
-                />
 
-                <VnInput
+                <VnInput :label="t('Street address')" clearable v-model="data.street" />
-                    :label="t('Street address')"
-                    clearable
-                    v-model="data.street"
-                    required
-                />
             </VnRow>
 
             <VnLocation
                 :rules="validate('Worker.postcode')"
                 :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                 v-model="data.location"
-                :required="true"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
 

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -23,7 +23,6 @@ const incoterms = ref([]);
 const customsAgents = ref([]);
 const observationTypes = ref([]);
 const notes = ref([]);
-let originalNotes = [];
 const deletes = ref([]);
 
 onBeforeMount(() => {
@@ -43,8 +42,7 @@ const getData = async (observations) => {
         });
 
         if (data.length) {
-            originalNotes = data;
+            notes.value = data
-            notes.value = originalNotes
                 .map((observation) => {
                     const type = observationTypes.value.find(
                         (type) => type.id === observation.observationTypeFk
@@ -83,24 +81,14 @@ const deleteNote = (id, index) => {
 };
 
 const onDataSaved = async () => {
-    let payload = {
+    let payload = {};
-        creates: notes.value.filter((note) => note.$isNew),
+    const creates = notes.value.filter((note) => note.$isNew);
-        deletes: deletes.value,
+    if (creates.length) {
-        updates: notes.value
+        payload.creates = creates;
-            .filter((note) =>
+    }
-                originalNotes.some(
+    if (deletes.value.length) {
-                    (oNote) =>
+        payload.deletes = deletes.value;
-                        oNote.id === note.id &&
+    }
-                        (note.description !== oNote.description ||
-                            note.observationTypeFk !== oNote.observationTypeFk)
-                )
-            )
-            .map((note) => ({
-                data: note,
-                where: { id: note.id },
-            })),
-    };
-
     await axios.post('AddressObservations/crud', payload);
     notes.value = [];
     deletes.value = [];

src/pages/Customer/components/CustomerNewPayment.vue

@@ -3,7 +3,7 @@ import { onBeforeMount, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
-import { getClientRisk } from '../composables/getClientRisk';
+
 import { useDialogPluginComponent } from 'quasar';
 
 import { usePrintService } from 'composables/usePrintService';
@@ -158,7 +158,9 @@ async function getAmountPaid() {
         },
     };
 
-    const { data } = await getClientRisk(filter);
+    const { data } = await axios(`ClientRisks`, {
+        params: { filter: JSON.stringify(filter) },
+    });
     initialData.amountPaid = (data?.length && data[0].amount) || undefined;
 }
 </script>
@@ -239,7 +241,7 @@ async function getAmountPaid() {
                             </QItem>
                         </template>
                     </VnSelect>
-                    <VnInputNumber
+                    <VnInput
                         :label="t('Amount')"
                         :required="true"
                         @update:model-value="calculateFromAmount($event)"
@@ -252,7 +254,7 @@ async function getAmountPaid() {
                         {{ t('Compensation') }}
                     </div>
                     <VnRow>
-                        <VnInputNumber
+                        <VnInput
                             :label="t('Compensation account')"
                             clearable
                             v-model="data.compensationAccount"

src/pages/Customer/components/CustomerSummaryTable.vue

@@ -63,7 +63,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        format: (row) => dashIfEmpty(row.agencyMode?.name),
+        format: (row) => row.agencyMode.name,
         columnClass: 'expand',
         label: t('Agency'),
     },
@@ -111,11 +111,7 @@ const columns = computed(() => [
             {
                 title: t('customer.summary.goToLines'),
                 icon: 'vn:lines',
-                action: ({ id }) =>
+                action: ({ id }) => router.push({ params: { id }, name: 'TicketSale' }),
-                    window.open(
-                        router.resolve({ params: { id }, name: 'TicketSale' }).href,
-                        '_blank'
-                    ),
                 isPrimary: true,
             },
             {
@@ -154,8 +150,6 @@ const setShippedColor = (date) => {
     if (difference == 0) return 'warning';
     if (difference < 0) return 'success';
 };
-const rowClick = ({ id }) =>
-    window.open(router.resolve({ params: { id }, name: 'TicketSummary' }).href, '_blank');
 
 const getItemPackagingType = (ticketSales) => {
     if (!ticketSales?.length) return '-';
@@ -183,25 +177,23 @@ const getItemPackagingType = (ticketSales) => {
         :column-search="false"
         url="Tickets"
         :columns="columns"
+        search-url="tickets"
         :without-header="true"
         auto-load
-        :row-click="rowClick"
         order="shipped DESC, id"
         :disable-option="{ card: true, table: true }"
         class="full-width"
         :disable-infinite-scroll="true"
-        :search-url="false"
-        redirect="ticket"
     >
         <template #column-nickname="{ row }">
-            <span class="link" @click.stop>
+            <span class="link">
                 {{ row.nickname }}
                 <CustomerDescriptorProxy :id="row.clientFk" />
             </span>
         </template>
 
         <template #column-routeFk="{ row }">
-            <span class="link" @click.stop>
+            <span class="link">
                 {{ row.routeFk }}
                 <RouteDescriptorProxy :id="row.routeFk" />
             </span>
@@ -218,7 +210,7 @@ const getItemPackagingType = (ticketSales) => {
             <span v-else> {{ toCurrency(row.totalWithVat) }}</span>
         </template>
         <template #column-state="{ row }">
-            <span v-if="row.invoiceOut" @click.stop>
+            <span v-if="row.invoiceOut">
                 <span :class="{ link: row.invoiceOut.ref }">
                     {{ row.invoiceOut.ref }}
                     <InvoiceOutDescriptorProxy :id="row.invoiceOut.id" />

src/pages/Customer/composables/getClientRisk.js

@@ -1,12 +0,0 @@
-import axios from 'axios';
-
-export async function getClientRisk(_filter) {
-    const filter = {
-        ..._filter,
-        include: { relation: 'company', scope: { fields: ['code'] } },
-    };
-
-    return await axios(`ClientRisks`, {
-        params: { filter: JSON.stringify(filter) },
-    });
-}

src/pages/Customer/locale/en.yml

@@ -1,5 +1,21 @@
+customerFilter:
+    filter:
+        name: Name
+        socialName: Social name
 customer:
+    list:
+        phone: Phone
+        email: Email
+        customerOrders: Display customer orders
+        moreOptions: More options
     card:
+        customerList: Customer list
+        customerId: Claim ID
+        salesPerson: Sales person
+        credit: Credit
+        risk: Risk
+        securedCredit: Secured credit
+        payMethod: Pay method
         debt: Debt
         isFrozen: Customer frozen
         hasDebt: Customer has debt
@@ -7,7 +23,9 @@ customer:
         notChecked: Customer no checked
         webAccountInactive: Web account inactive
         noWebAccess: Web access is disabled
+        businessType: Business type
         passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
+        businessTypeFk: Business type
     summary:
         basicData: Basic data
         fiscalAddress: Fiscal address
@@ -19,7 +37,9 @@ customer:
         customerId: Customer ID
         name: Name
         contact: Contact
+        phone: Phone
         mobile: Mobile
+        email: Email
         salesPerson: Sales person
         contactChannel: Contact channel
         socialName: Social name
@@ -43,6 +63,7 @@ customer:
         hasB2BVnl: Has B2B VNL
         addressName: Address name
         addressCity: City
+        addressStreet: Street
         username: Username
         webAccess: Web access
         totalGreuge: Total greuge
@@ -71,27 +92,45 @@ customer:
         goToLines: Go to lines
     basicData:
         socialName: Fiscal name
+        businessType: Business type
+        contact: Contact
         youCanSaveMultipleEmails: You can save multiple emails
+        email: Email
+        phone: Phone
+        mobile: Mobile
+        salesPerson: Sales person
+        contactChannel: Contact channel
         previousClient: Previous client
     extendedList:
         tableVisibleColumns:
             id: Identifier
+            name: Name
             socialName: Social name
             fi: Tax number
             salesPersonFk: Salesperson
+            credit: Credit
             creditInsurance: Credit insurance
             phone: Phone
+            mobile: Mobile
             street: Street
             countryFk: Country
             provinceFk: Province
+            city: City
+            postcode: Postcode
+            email: Email
             created: Created
             businessTypeFk: Business type
+            payMethodFk: Billing data
             sageTaxTypeFk: Sage tax type
             sageTransactionTypeFk: Sage tr. type
+            isActive: Active
             isVies: Vies
             isTaxDataChecked: Verified data
+            isEqualizated: Is equalizated
             isFreezed: Freezed
             hasToInvoice: Invoice
             hasToInvoiceByAddress: Invoice by address
             isToBeMailed: Mailing
+            hasLcr: Received LCR
+            hasCoreVnl: VNL core received
             hasSepaVnl: VNL B2B received

src/pages/Customer/locale/es.yml

@@ -1,7 +1,22 @@
 Search customer: Buscar cliente
 You can search by customer id or name: Puedes buscar por id o nombre del cliente
+customerFilter:
+    filter:
+        name: Nombre
+        socialName: Razón Social
 customer:
+    list:
+        phone: Teléfono
+        email: Email
+        customerOrders: Mostrar órdenes del cliente
+        moreOptions: Más opciones
     card:
+        customerId: ID cliente
+        salesPerson: Comercial
+        credit: Crédito
+        risk: Riesgo
+        securedCredit: Crédito asegurado
+        payMethod: Método de pago
         debt: Riesgo
         isFrozen: Cliente congelado
         hasDebt: Cliente con riesgo
@@ -9,7 +24,9 @@ customer:
         notChecked: Cliente no comprobado
         webAccountInactive: Sin acceso web
         noWebAccess: El acceso web está desactivado
+        businessType: Tipo de negocio
         passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
+        businessTypeFk: Tipo de negocio
     summary:
         basicData: Datos básicos
         fiscalAddress: Dirección fiscal
@@ -21,7 +38,9 @@ customer:
         customerId: ID cliente
         name: Nombre
         contact: Contacto
+        phone: Teléfono
         mobile: Móvil
+        email: Email
         salesPerson: Comercial
         contactChannel: Canal de contacto
         socialName: Razón social
@@ -45,6 +64,7 @@ customer:
         hasB2BVnl: Recibido B2B VNL
         addressName: Nombre de la dirección
         addressCity: Ciudad
+        addressStreet: Calle
         username: Usuario
         webAccess: Acceso web
         totalGreuge: Greuge total
@@ -73,27 +93,45 @@ customer:
         goToLines: Ir a líneas
     basicData:
         socialName: Nombre fiscal
+        businessType: Tipo de negocio
+        contact: Contacto
         youCanSaveMultipleEmails: Puede guardar varios correos electrónicos encadenándolos mediante comas sin espacios{','} ejemplo{':'} user{'@'}dominio{'.'}com, user2{'@'}dominio{'.'}com siendo el primer correo electrónico el principal
+        email: Email
+        phone: Teléfono
+        mobile: Móvil
+        salesPerson: Comercial
+        contactChannel: Canal de contacto
         previousClient: Cliente anterior
     extendedList:
         tableVisibleColumns:
             id: Identificador
+            name: Nombre
             socialName: Razón social
             fi: NIF / CIF
             salesPersonFk: Comercial
+            credit: Crédito
             creditInsurance: Crédito asegurado
             phone: Teléfono
+            mobile: Móvil
             street: Dirección fiscal
             countryFk: País
             provinceFk: Provincia
+            city: Población
+            postcode: Código postal
+            email: Email
             created: Fecha creación
             businessTypeFk: Tipo de negocio
+            payMethodFk: Forma de pago
             sageTaxTypeFk: Tipo de impuesto Sage
             sageTransactionTypeFk: Tipo tr. sage
+            isActive: Activo
             isVies: Vies
             isTaxDataChecked: Datos comprobados
+            isEqualizated: Recargo de equivalencias
             isFreezed: Congelado
             hasToInvoice: Factura
             hasToInvoiceByAddress: Factura por consigna
             isToBeMailed: Env. emails
+            hasLcr: Recibido LCR
+            hasCoreVnl: Recibido core VNL
             hasSepaVnl: Recibido B2B VNL

src/pages/Department/Card/DepartmentBasicData.vue

@@ -20,16 +20,16 @@ const { t } = useI18n();
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
-                    :label="t('globals.name')"
+                    :label="t('department.name')"
                     v-model="data.name"
-                    :rules="validate('globals.name')"
+                    :rules="validate('department.name')"
                     clearable
                     autofocus
                 />
                 <VnInput
                     v-model="data.code"
-                    :label="t('globals.code')"
+                    :label="t('department.code')"
-                    :rules="validate('globals.code')"
+                    :rules="validate('department.code')"
                     clearable
                 />
             </VnRow>
@@ -42,8 +42,8 @@ const { t } = useI18n();
                 />
                 <VnInput
                     v-model="data.notificationEmail"
-                    :label="t('globals.params.email')"
+                    :label="t('department.email')"
-                    :rules="validate('globals.params.email')"
+                    :rules="validate('department.email')"
                     clearable
                 />
             </VnRow>

src/pages/Department/Card/DepartmentSummary.vue

@@ -45,8 +45,16 @@ onMounted(async () => {
                 />
                 <div class="full-width row wrap justify-between content-between">
                     <div class="column" style="min-width: 50%">
-                        <VnLv :label="t('globals.name')" :value="department.name" dash />
+                        <VnLv
-                        <VnLv :label="t('globals.code')" :value="department.code" dash />
+                            :label="t('department.name')"
+                            :value="department.name"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.code')"
+                            :value="department.code"
+                            dash
+                        />
                         <VnLv
                             :label="t('department.chat')"
                             :value="department.chatName"

src/pages/Entry/Card/EntryBasicData.vue

@@ -44,15 +44,16 @@ const onFilterTravelSelected = (formData, id) => {
         auto-load
     />
     <FormModel
+        :url="`Entries/${route.params.id}`"
         :url-update="`Entries/${route.params.id}`"
-        model="Entry"
+        model="entry"
         auto-load
         :clear-store-on-unmount="false"
     >
         <template #form="{ data }">
             <VnRow>
                 <VnSelect
-                    :label="t('globals.supplier')"
+                    :label="t('entry.basicData.supplier')"
                     v-model="data.supplierFk"
                     url="Suppliers"
                     option-value="id"
@@ -107,15 +108,18 @@ const onFilterTravelSelected = (formData, id) => {
                 </VnSelectDialog>
             </VnRow>
             <VnRow>
-                <VnInput v-model="data.reference" :label="t('globals.reference')" />
+                <VnInput
+                    v-model="data.reference"
+                    :label="t('entry.basicData.reference')"
+                />
             </VnRow>
             <VnRow>
                 <VnInput
                     v-model="data.invoiceNumber"
-                    :label="t('entry.summary.invoiceNumber')"
+                    :label="t('entry.basicData.invoiceNumber')"
                 />
                 <VnSelect
-                    :label="t('globals.company')"
+                    :label="t('entry.basicData.company')"
                     v-model="data.companyFk"
                     :options="companiesOptions"
                     option-value="id"
@@ -127,14 +131,14 @@ const onFilterTravelSelected = (formData, id) => {
             </VnRow>
             <VnRow>
                 <VnSelect
-                    :label="t('entry.summary.currency')"
+                    :label="t('entry.basicData.currency')"
                     v-model="data.currencyFk"
                     :options="currenciesOptions"
                     option-value="id"
                     option-label="code"
                 />
                 <QInput
-                    :label="t('entry.summary.commission')"
+                    :label="t('entry.basicData.commission')"
                     v-model="data.commission"
                     type="number"
                     autofocus
@@ -152,11 +156,17 @@ const onFilterTravelSelected = (formData, id) => {
                 />
             </VnRow>
             <VnRow>
-                <QCheckbox v-model="data.isOrdered" :label="t('entry.summary.ordered')" />
+                <QCheckbox
-                <QCheckbox v-model="data.isConfirmed" :label="t('globals.confirmed')" />
+                    v-model="data.isOrdered"
+                    :label="t('entry.basicData.ordered')"
+                />
+                <QCheckbox
+                    v-model="data.isConfirmed"
+                    :label="t('entry.basicData.confirmed')"
+                />
                 <QCheckbox
                     v-model="data.isExcludedFromAvailable"
-                    :label="t('entry.summary.excludedFromAvailable')"
+                    :label="t('entry.basicData.excludedFromAvailable')"
                 />
                 <QCheckbox
                     v-if="isAdministrative()"

src/pages/Entry/Card/EntryBuys.vue

@@ -5,6 +5,7 @@ import { useI18n } from 'vue-i18n';
 import { QBtn } from 'quasar';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
@@ -156,13 +157,13 @@ const tableColumnComponents = computed(() => ({
 const entriesTableColumns = computed(() => {
     return [
         {
-            label: t('globals.item'),
+            label: t('entry.summary.item'),
             field: 'itemFk',
             name: 'item',
             align: 'left',
         },
         {
-            label: t('globals.quantity'),
+            label: t('entry.summary.quantity'),
             field: 'quantity',
             name: 'quantity',
             align: 'left',
@@ -186,7 +187,7 @@ const entriesTableColumns = computed(() => {
             align: 'left',
         },
         {
-            label: t('globals.weight'),
+            label: t('entry.summary.weight'),
             field: 'weight',
             name: 'weight',
             align: 'left',
@@ -211,13 +212,13 @@ const entriesTableColumns = computed(() => {
             format: (value) => toCurrency(value),
         },
         {
-            label: t('item.fixedPrice.groupingPrice'),
+            label: t('entry.buys.groupingPrice'),
             field: 'price2',
             name: 'price2',
             align: 'left',
         },
         {
-            label: t('item.fixedPrice.packingPrice'),
+            label: t('entry.buys.packingPrice'),
             field: 'price3',
             name: 'price3',
             align: 'left',

src/pages/Entry/Card/EntryBuysImport.vue

@@ -35,7 +35,7 @@ const packagingsOptions = ref([]);
 
 const columns = computed(() => [
     {
-        label: t('globals.item'),
+        label: t('entry.buys.item'),
         name: 'item',
         field: 'itemFk',
         options: lastItemBuysOptions.value,
@@ -56,19 +56,19 @@ const columns = computed(() => [
         align: 'left',
     },
     {
-        label: t('entry.summary.packing'),
+        label: t('entry.buys.packing'),
         name: 'packing',
         field: 'packing',
         align: 'left',
     },
     {
-        label: t('entry.summary.grouping'),
+        label: t('entry.buys.grouping'),
         name: 'grouping',
         field: 'grouping',
         align: 'left',
     },
     {
-        label: t('entry.summary.buyingValue'),
+        label: t('entry.buys.buyingValue'),
         name: 'buyingValue',
         field: 'buyingValue',
         align: 'left',
@@ -200,7 +200,7 @@ const redirectToBuysView = () => {
             <VnRow>
                 <QFile
                     ref="inputFileRef"
-                    :label="t('globals.file')"
+                    :label="t('entry.buys.file')"
                     v-model="importData.file"
                     :multiple="false"
                     accept=".json"
@@ -220,7 +220,10 @@ const redirectToBuysView = () => {
             </VnRow>
             <div v-if="importData.file">
                 <VnRow>
-                    <VnInput :label="t('globals.reference')" v-model="importData.ref" />
+                    <VnInput
+                        :label="t('entry.buys.reference')"
+                        v-model="importData.ref"
+                    />
                 </VnRow>
                 <VnRow>
                     <VnInput

src/pages/Entry/Card/EntryCard.vue

@@ -2,13 +2,11 @@
 import VnCard from 'components/common/VnCard.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
 import EntryFilter from '../EntryFilter.vue';
-import filter from './EntryFilter.js';
 </script>
 <template>
     <VnCard
         data-key="Entry"
         base-url="Entries"
-        :filter="filter"
         :descriptor="EntryDescriptor"
         :filter-panel="EntryFilter"
         search-data-key="EntryList"

src/pages/Entry/Card/EntryDescriptor.vue

@@ -1,15 +1,15 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed, watch, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 
 import { toDate } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
 import { getUrl } from 'src/composables/getUrl';
-import filter from './EntryFilter.js';
 
 const $props = defineProps({
     id: {
@@ -25,6 +25,50 @@ const { openReport } = usePrintService();
 const entryDescriptorRef = ref(null);
 const url = ref();
 
+const entryFilter = {
+    include: [
+        {
+            relation: 'travel',
+            scope: {
+                fields: [
+                    'id',
+                    'landed',
+                    'shipped',
+                    'agencyModeFk',
+                    'warehouseOutFk',
+                    'daysInForward',
+                ],
+                include: [
+                    {
+                        relation: 'agency',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                    {
+                        relation: 'warehouseOut',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                    {
+                        relation: 'warehouseIn',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                ],
+            },
+        },
+        {
+            relation: 'supplier',
+            scope: {
+                fields: ['id', 'nickname'],
+            },
+        },
+    ],
+};
+
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
@@ -32,6 +76,10 @@ onMounted(async () => {
     url.value = await getUrl('');
 });
 
+const data = ref(useCardDescription());
+const setData = (entity) =>
+    (data.value = useCardDescription(entity.supplier?.nickname, entity.id));
+
 const getEntryRedirectionFilter = (entry) => {
     let entryTravel = entry && entry.travel;
 
@@ -56,6 +104,8 @@ const getEntryRedirectionFilter = (entry) => {
 const showEntryReport = () => {
     openReport(`Entries/${route.params.id}/entry-order-pdf`);
 };
+
+watch;
 </script>
 
 <template>
@@ -63,9 +113,11 @@ const showEntryReport = () => {
         ref="entryDescriptorRef"
         module="Entry"
         :url="`Entries/${entityId}`"
-        :filter="filter"
+        :filter="entryFilter"
-        title="supplier.nickname"
+        :title="data.title"
-        data-key="Entry"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
+        data-key="entry"
     >
         <template #menu="{ entity }">
             <QItem v-ripple clickable @click="showEntryReport(entity)">
@@ -73,11 +125,14 @@ const showEntryReport = () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('globals.agency')" :value="entity.travel?.agency?.name" />
+            <VnLv
+                :label="t('entry.descriptor.agency')"
+                :value="entity.travel?.agency?.name"
+            />
             <VnLv :label="t('shipped')" :value="toDate(entity.travel?.shipped)" />
             <VnLv :label="t('landed')" :value="toDate(entity.travel?.landed)" />
             <VnLv
-                :label="t('globals.warehouseOut')"
+                :label="t('entry.descriptor.warehouseOut')"
                 :value="entity.travel?.warehouseOut?.name"
             />
         </template>
@@ -110,7 +165,7 @@ const showEntryReport = () => {
         <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
-                    :to="`/supplier/${entity.supplier?.id}`"
+                    :to="`/supplier/${entity.supplier.id}`"
                     size="md"
                     icon="vn:supplier"
                     color="primary"

src/pages/Entry/Card/EntryFilter.js

@@ -1,43 +0,0 @@
-export default {
-    include: [
-        {
-            relation: 'travel',
-            scope: {
-                fields: [
-                    'id',
-                    'landed',
-                    'shipped',
-                    'agencyModeFk',
-                    'warehouseOutFk',
-                    'daysInForward',
-                ],
-                include: [
-                    {
-                        relation: 'agency',
-                        scope: {
-                            fields: ['name'],
-                        },
-                    },
-                    {
-                        relation: 'warehouseOut',
-                        scope: {
-                            fields: ['name'],
-                        },
-                    },
-                    {
-                        relation: 'warehouseIn',
-                        scope: {
-                            fields: ['name'],
-                        },
-                    },
-                ],
-            },
-        },
-        {
-            relation: 'supplier',
-            scope: {
-                fields: ['id', 'nickname'],
-            },
-        },
-    ],
-};

src/pages/Entry/Card/EntrySummary.vue

@@ -84,7 +84,7 @@ const tableColumnComponents = {
 const entriesTableColumns = computed(() => {
     return [
         {
-            label: t('globals.quantity'),
+            label: t('entry.summary.quantity'),
             field: 'quantity',
             name: 'quantity',
             align: 'left',
@@ -102,7 +102,7 @@ const entriesTableColumns = computed(() => {
             align: 'left',
         },
         {
-            label: t('globals.weight'),
+            label: t('entry.summary.weight'),
             field: 'weight',
             name: 'weight',
             align: 'left',
@@ -188,8 +188,8 @@ const fetchEntryBuys = async () => {
                     :label="t('entry.summary.currency')"
                     :value="entry.currency?.name"
                 />
-                <VnLv :label="t('globals.company')" :value="entry.company.code" />
+                <VnLv :label="t('entry.summary.company')" :value="entry.company.code" />
-                <VnLv :label="t('globals.reference')" :value="entry.reference" />
+                <VnLv :label="t('entry.summary.reference')" :value="entry.reference" />
                 <VnLv
                     :label="t('entry.summary.invoiceNumber')"
                     :value="entry.invoiceNumber"
@@ -217,7 +217,7 @@ const fetchEntryBuys = async () => {
                 />
                 <VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
                 <VnLv
-                    :label="t('globals.warehouseOut')"
+                    :label="t('entry.summary.travelWarehouseOut')"
                     :value="entry.travel.warehouseOut?.name"
                 />
                 <QCheckbox
@@ -227,7 +227,7 @@ const fetchEntryBuys = async () => {
                 />
                 <VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
                 <VnLv
-                    :label="t('globals.warehouseIn')"
+                    :label="t('entry.summary.travelWarehouseIn')"
                     :value="entry.travel.warehouseIn?.name"
                 />
                 <QCheckbox
@@ -250,7 +250,7 @@ const fetchEntryBuys = async () => {
                     :disable="true"
                 />
                 <QCheckbox
-                    :label="t('globals.confirmed')"
+                    :label="t('entry.summary.confirmed')"
                     v-model="entry.isConfirmed"
                     :disable="true"
                 />

src/pages/Entry/EntryBuysTableDialog.vue

@@ -35,7 +35,7 @@ const entriesTableColumns = computed(() => [
     {
         align: 'left',
         name: 'item',
-        label: t('globals.item'),
+        label: t('entry.summary.item'),
         field: (row) => row.item.name,
     },
     {