0
0
Fork 0
Commit Graph

4575 Commits

Author SHA1 Message Date
Jorge Penadés 4d7a4be2c0 fix: refs #7524 use limit entry Section wip 2024-08-27 09:54:21 +02:00
Javier Segarra 2ae482ff8c Merge branch 'test' into dev 2024-08-27 09:38:12 +02:00
Javier Segarra 461b764f0e Merge branch 'test' into dev 2024-08-27 07:11:20 +02:00
Jorge Penadés 717c52fc02 fix: refs #7524 use id 2024-08-26 16:55:16 +02:00
Jorge Penadés 7c2a13db0b fix: refs #7524 use limit shelving Section 2024-08-26 16:39:17 +02:00
Jorge Penadés 566a649c20 fix: refs #7524 use limit item Section 2024-08-26 16:34:46 +02:00
Jorge Penadés c418899fb3 chore: refs #7323 improve vnselect 2024-08-26 13:54:48 +02:00
Jorge Penadés e1e768948e chore: refs #7323 improve vnselect 2024-08-26 13:44:35 +02:00
Jorge Penadés c47635fcf2 chore: refs #7323 refactor autofillbic 2024-08-26 13:42:08 +02:00
Carlos Satorres c4fc644a35 refs #7355 remove data 2024-08-26 13:08:47 +02:00
Jorge Penadés 6f9cd7fe15 fix: refs #7323 auto fill bic 2024-08-26 12:47:05 +02:00
Carlos Satorres 8568d36ee5 refs #7355 fix privileges 2024-08-26 12:40:01 +02:00
Carlos Satorres c84786e053 refs #7355 fix accountPrivileges 2024-08-26 11:41:35 +02:00
Jorge Penadés 1bbc6c1840 chore: refs #7353 fix warnings 2024-08-23 15:55:56 +02:00
Javi Gallego b82449b174 Merge branch 'dev' into 7710-cloneWithTicketPackaging 2024-08-23 13:41:17 +00:00
Javi Gallego a14c0f3fe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-23 13:52:51 +02:00
Javi Gallego fb0ed9c4ce para que no de el fallo de muchos registros 2024-08-23 13:52:46 +02:00
Javier Segarra e7ce2a0ef6 Merge branch 'dev' into feature/TicketFutureFilter 2024-08-23 11:17:02 +00:00
Jorge Penadés fdacdf1a12 feat: refs #7353 add filter & fix customTags 2024-08-23 12:43:27 +02:00
Javi Gallego efc7df5a60 delivery traducido a Reparto 2024-08-23 12:19:54 +02:00
Javi Gallego d0ccce2656 feat: refs #7346 elimino === 2024-08-23 10:32:36 +02:00
Javi Gallego 1984e1d0d8 feat: refs #7710 uses cloneAll 2024-08-23 10:25:05 +02:00
Javi Gallego defb11a6d7 Merge branch 'dev' into 7346-invoiceOutMultilple 2024-08-23 08:20:06 +00:00
Javier Segarra 91e52432ea Merge branch 'dev' into feature/TicketFutureFilter 2024-08-23 07:13:43 +00:00
Jorge Penadés 2d05d5e03c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-23 09:11:35 +02:00
Javier Segarra 54eb567e39 perf: date fields 2024-08-22 22:13:50 +02:00
Jorge Penadés b0c27027c0 chore: refs #7353 use Vue component nomenclature 2024-08-22 13:41:53 +02:00
Jorge Penadés 48277a5f20 fix: refs #7323 vertical align 2024-08-22 12:14:16 +02:00
Javier Segarra 5b667366ae fix: remove condition duplicated 2024-08-22 09:53:26 +02:00
Javier Segarra 57ba26280d Merge branch 'dev' into 6772_reload_sections 2024-08-22 09:48:42 +02:00
Javier Segarra a70b65ec9e feat: add key to routerView 2024-08-22 09:47:13 +02:00
Jorge Penadés b77a10a57a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-hotfix-workerFineTunning 2024-08-21 16:04:52 +02:00
Jorge Penadés 9c99266da6 fix: refs #7323 replace day 2024-08-21 16:02:16 +02:00
William Buezas 6197d283e4 Create ticket future filter 2024-08-21 10:51:38 -03:00
Jorge Penadés 517ec87e16 fix: refs #7323 use timeStamp 2024-08-21 14:18:01 +02:00
Javi Gallego b71d24cf3d feat: refs #7346 sonarLint warnings 2024-08-21 14:13:36 +02:00
Javi Gallego 3d5807463b feat: refs #7346 refactor 2024-08-21 13:46:19 +02:00
Jorge Penadés 635ac2716d fix: refs #7323 generate code & minor changes 2024-08-21 13:33:50 +02:00
Javier Segarra 292253fb45 fix: Show name in summary instead current value 2024-08-21 11:29:35 +00:00
Javier Segarra bac0a3ba6c fix: Show name in descriptor instead current value 2024-08-21 11:29:12 +00:00
Javier Segarra 89eaf02800 feat: #7323 handle workerPhoto 2024-08-21 11:45:26 +02:00
Jorge Penadés 79c96199f3 Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-21 11:35:16 +02:00
Jon Elias a31931f8cf Merge branch 'dev' of https: refs #7354//gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-21 08:13:19 +02:00
Jorge Penadés 7f2407996f chore: const var 2024-08-20 17:02:38 +02:00
Jorge Penadés d89d324a7e chore: drop ref 2024-08-20 16:59:16 +02:00
Jorge Penadés 0277aa50ce fix: set right time 2024-08-20 16:55:39 +02:00
Jorge Penadés 03baef8231 fix: refs #7353 css 2024-08-20 12:14:05 +02:00
Javier Segarra a5fc366081 Merge branch 'dev' into 6336_claim_fix_states 2024-08-20 09:34:46 +00:00
Javier Segarra 472d477b15 fix: trim vnsearchbar input value 2024-08-20 09:32:50 +00:00
Javier Segarra 145c8b00d5 fix: limit and order TicketTracking 2024-08-20 09:32:01 +00:00
Javi Gallego 0eb699bcbe feat: refs #7346 formdata uses serialType 2024-08-20 10:10:11 +02:00
Javier Segarra 6e814ed4a8 fix: remove full-height class 2024-08-20 08:02:06 +00:00
Jorge Penadés 206253ac6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-19 16:03:23 +02:00
Jorge Penadés 1ec7b7a8c1 fix: refs #7353 css 2024-08-19 16:02:30 +02:00
Jorge Penadés 3f9bdfcc9c fix: refs #7353 saleTicketMonitors 2024-08-19 14:21:36 +02:00
Jorge Penadés e6e61e5717 fix: refs #7353 vnTable colors 2024-08-19 13:40:35 +02:00
Javier Segarra c19585fb1b fix: quasar build warnings 2024-08-19 11:36:12 +02:00
Jon Elias ce8d12fe20 Merge branch 'dev' into 7717_fixOrderCatalog 2024-08-19 09:20:31 +00:00
Jon Elias f3d7590edf refactor: refs #7717 delete useless function and import 2024-08-19 10:49:04 +02:00
Jon Elias 6fd0083870 fix: refs #7354 fix validation in price field 2024-08-19 10:45:13 +02:00
Jorge Penadés 9a4a51fadb refactor: refs #7353 simplify code 2024-08-19 10:29:55 +02:00
Javi Gallego ca3406fbc0 Merge branch 'dev' into 7346-invoiceOutMultilple 2024-08-19 10:27:48 +02:00
Jorge Penadés ada1c948f6 feat: refs #7353 split sections 2024-08-19 10:14:02 +02:00
Javier Segarra 74f335b22e fix: #6336 ClaimListStates 2024-08-19 06:51:52 +00:00
Jorge Penadés bd9aea767a fix: refs #7353 salesorderTable 2024-08-16 18:10:10 +02:00
Jorge Penadés 1cca504c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-16 15:18:20 +02:00
Jorge Penadés a69f41834e fix: refs #7353 padding 2024-08-16 14:19:02 +02:00
Jorge Penadés a13ea900ce fix: refs #7353 salesClientTable 2024-08-16 13:54:37 +02:00
Alex Moreno fa0ca732fc feat(FormModel): trim data by default 2024-08-16 12:29:35 +02:00
Alex Moreno 4b2f4ffac1 fix(VnTable): orderBy v-model 2024-08-16 12:20:08 +02:00
Alex Moreno 0e8455888b Merge branch 'dev' into 7354_ZoneMigration_End 2024-08-16 09:32:55 +00:00
Jon Elias 3c4fc9473d refactor: refs #7354 changed descriptor menu options 2024-08-16 11:20:03 +02:00
Alex Moreno b35bf85f4a fix(claim_summary): url links 2024-08-16 10:50:45 +02:00
Alex Moreno ed29088d76 typo 2024-08-16 10:49:52 +02:00
Javi Gallego 06c0f49128 feat: refs #7346 add seriaType option 2024-08-16 10:10:40 +02:00
Alex Moreno 51ee79b7f7 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-08-16 09:24:24 +02:00
Alex Moreno 83a8f7e147 fix(invoiceOutGlobal): formData is object 2024-08-16 09:20:53 +02:00
Jorge Penadés ecfdf0b6b9 fix: refs #6900 improve loading 2024-08-14 15:27:36 +02:00
Javier Segarra 6378be5933 Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-14 15:26:49 +02:00
Javier Segarra c878fc9cff feat: remove duplicity 2024-08-14 15:26:47 +02:00
Jon Elias 95cda2bad7 Merge branch 'dev' into 7354_ZoneMigration_End 2024-08-14 13:10:25 +00:00
Jon Elias ea43df81fd Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-14 15:09:30 +02:00
Jon Elias d12fcd3b34 refactor: refs #7354 refactor deliveryPanel 2024-08-14 15:09:28 +02:00
Jorge Penadés 3bba5db1b5 fix: refs #6900 improve logic 2024-08-14 14:52:47 +02:00
Jorge Penadés 65d893e128 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial 2024-08-14 14:30:47 +02:00
Jorge Penadés 760dc0e6f4 Merge branch '6900-addSerial' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial 2024-08-14 14:27:57 +02:00
Jorge Penadés 6dd9029871 fix: refs #6900 improve logic 2024-08-14 14:27:54 +02:00
Alex Moreno 895441a8e4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-14 13:40:25 +02:00
Alex Moreno c7f53635d9 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-08-14 13:40:13 +02:00
Alex Moreno a8f550fcc8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-14 13:39:54 +02:00
Jorge Penadés e07d573788 Merge branch 'test' into 6900-addSerial 2024-08-14 10:13:39 +00:00
Jon Elias 926fba27b8 Merge branch 'dev' into 7354_ZoneMigration_End 2024-08-14 08:45:37 +00:00
Jon Elias ed4bf3cfa8 refactor: refs #7354 requested changes 2024-08-14 10:44:45 +02:00
Jorge Penadés 9bb67511e6 fix: refs #7323 vnsubtoolbar css 2024-08-14 10:34:42 +02:00
Jorge Penadés d7eb3af48d fix: refs #7323 add locale 2024-08-14 10:10:22 +02:00
Jorge Penadés 30cadb5697 fix: refs #7323 use workerFilter 2024-08-14 09:11:14 +02:00
Alex Moreno 07e4dca361 refactor(invoiceOutList): create dialog 2024-08-14 08:55:18 +02:00
Jorge Penadés e7def05d40 feat: refs #7323 add flex-wrap 2024-08-13 16:59:43 +02:00
Jorge Penadés e780dcda05 fix: refs #7323 load all opts 2024-08-13 16:45:30 +02:00
Alex Moreno 0a0e8be39f Merge branch 'dev' into 7848-recoveryPassword 2024-08-13 14:41:23 +00:00
Alex Moreno 3cbdf25410 delete name default 2024-08-13 16:40:02 +02:00
Jon Elias 0e9739f2a5 refactor: refs #7354 refactor zones section and fixed e2e tests 2024-08-13 14:39:50 +02:00
Carlos Satorres 405092f66d fix: account subsections cards 2024-08-13 13:11:23 +02:00
Carlos Satorres aae881c24a fix(account_card): redirection 2024-08-13 12:59:22 +02:00
Jorge Penadés a24caa9393 fix: refs #7323 use global locale 2024-08-13 12:56:39 +02:00
Carlos Satorres e144f0be01 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration2 2024-08-13 12:52:14 +02:00
Alex Moreno e88e7fa9db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-13 12:25:47 +02:00
Alex Moreno a46198e2d0 feat: add recover password and reset password 2024-08-13 12:25:08 +02:00
Jon Elias 4401a6108f Merge branch 'master' into hotfix_InvoiceOut_List&NegativeBases 2024-08-13 09:19:46 +00:00
Jon Elias de7251e16d fix: InvoiceOut List and negative bases 2024-08-13 11:18:07 +02:00
Jorge Penadés 81c70c9511 chore: refs #7323 remove unused import 2024-08-13 10:06:58 +02:00
Jorge Penadés e428da4a29 feat: refs #7323 add my account" btn & fix models log selectable 2024-08-13 10:05:07 +02:00
Alex Moreno d27821c100 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-13 08:37:15 +02:00
Jorge Penadés de24a3efdb feat: refs #6900 add locale 2024-08-12 15:34:09 +02:00
Jon Elias aefcfdba51 fix: refs #7354 fix zoneSearchbar 2024-08-12 14:28:35 +02:00
Jorge Penadés c7679fd142 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial 2024-08-12 14:22:47 +02:00
Jon Elias 563ab2de9c Merge branch 'master' into hotfix_TicketList_WarehouseFilter 2024-08-12 12:05:51 +00:00
Jorge Penadés c4de1beabf feat: refs #6900 add InvoiceInSerial 2024-08-12 13:46:56 +02:00
Jon Elias 72c8379b20 fix: new field's order in warehouse filter 2024-08-12 13:18:31 +02:00
Jon Elias b955ded123 fix: refs #7354 fix list searchbar and filters 2024-08-12 12:58:19 +02:00
Jorge Penadés 2cf669b479 Merge branch 'dev' into 7283-itemSectionsMigration 2024-08-12 10:51:40 +00:00
Carlos Satorres 94878b700b refs #7355 account cards loads 2024-08-12 12:39:06 +02:00
Alex Moreno 3222a7a42c fix(orderLines): reload when delete and redirect when confirm 2024-08-12 11:51:21 +02:00
Alex Moreno 1e4a309a84 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-08-12 11:47:01 +02:00
Alex Moreno 65a80e006b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-12 11:46:09 +02:00
Jorge Penadés 9708214462 chore: refs #7283 drop array types 2024-08-12 11:01:32 +02:00
Jorge Penadés 239e796d2e chore: refs #7283 update VnAvatar title handling 2024-08-12 11:00:03 +02:00
Jon Elias 9387082fc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-12 10:35:55 +02:00
Jon Elias 41afc52f65 fix events and descriptor menu 2024-08-12 10:33:40 +02:00
Alex Moreno 190579e7fd fix: orderCatalogFilter order 2024-08-12 10:22:52 +02:00
Jorge Penadés f5ffe2a07b refactor: refs #7283 update avatar size and color 2024-08-12 10:18:14 +02:00
Alex Moreno e11e51f432 fix: order description to vnTable 2024-08-12 09:17:51 +02:00
Alex Moreno 5e88004e79 fix(customerDescription): fix action buttons 2024-08-12 08:34:16 +02:00
Jorge Penadés 6b80c52b71 chore: refs #7283 drop import 2024-08-09 15:42:31 +02:00
Jorge Penadés f17ca4fe30 fix: refs #7283 itemLastEntries filter 2024-08-09 15:34:10 +02:00
Jorge Penadés bb1f507b27 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-09 15:29:37 +02:00
Alex Moreno 37244cdbc7 feat(orderBasicData): add notes 2024-08-09 14:55:49 +02:00
Alex Moreno dc7c686508 feat(orderList): correct create order 2024-08-09 14:19:08 +02:00
Carlos Satorres b21ba3dc2c refs #7355 account cards roles cards 2024-08-09 13:55:29 +02:00
Alex Moreno ee71ae9d24 feat(orderList): use orderFilter and fixed this 2024-08-09 13:07:37 +02:00
Alex Moreno 5741cca878 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-08-09 12:39:00 +02:00
Alex Moreno 08972d62b0 Merge branch 'dev' into warmFix_vnFilterPanel_setUserParams 2024-08-09 10:37:09 +00:00
Jorge Penadés bf11a184c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-09 12:34:04 +02:00
Alex Moreno 02cfa54a40 unify watchers 2024-08-09 12:27:24 +02:00
Jorge Penadés 7a2170e7c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-09 12:12:59 +02:00
Jorge Penadés 3680321ae8 fix: refs #6900 use type number 2024-08-09 11:44:32 +02:00
Alex Moreno bd05460b90 console.log 2024-08-09 11:41:29 +02:00
Alex Moreno 43ca7e1667 fix(VnFilterPanel): emit userParams better 2024-08-09 11:40:05 +02:00
Jorge Penadés f1047328c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-fineTunning 2024-08-09 10:19:33 +02:00
Alex Moreno 6df6e53f30 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-08-09 09:32:23 +02:00
Alex Moreno 2dd8376bcd typo 2024-08-09 09:32:04 +02:00
Jorge Penadés 3f6b20270d chore: refs #6900 drop console log 2024-08-09 09:15:12 +02:00
Jorge Penadés 81ed679a2b chore: refs #6900 mv rectificative logic 2024-08-09 09:11:35 +02:00
Jorge Penadés 88b6d7c9ae fix: refs #6900 rectificative btn reactivity 2024-08-09 09:09:16 +02:00
Alex Moreno d3f50ec9b2 Merge branch 'dev' into 7717_fixOrderCatalog 2024-08-09 06:52:13 +00:00
Alex Moreno a4d0483f89 typo 2024-08-09 08:48:24 +02:00
Alex Moreno 3ee7692bbc fix(zone): zoneLocation and the others searchbar 2024-08-09 08:45:48 +02:00
Jon Elias 3f76b5496a fix: refs #7717 fix order sections 2024-08-09 07:46:32 +02:00
Jorge Penadés 4dc12cf119 chore: refs #6900 responsive code 2024-08-08 17:14:31 +02:00
Jorge Penadés 12bb88f7f8 chore: refs #6900 drop vnCurrency 2024-08-08 17:05:31 +02:00
Jorge Penadés 344ca7d243 fix: refs #6900 vat, dueday & intrastat 2024-08-08 16:54:21 +02:00
Jorge Penadés 1a4cf51246 fix: refs #6900 vat & dueday 2024-08-08 16:44:00 +02:00
Jorge Penadés 2afe9b445e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-fineTunning 2024-08-08 15:30:19 +02:00
Pablo Natek eb74297d06 Merge branch 'master' into 6820-remove-rule 2024-08-08 12:59:36 +00:00
Carlos Satorres 40c3ba15e6 refs #7355 account acls roles cars 2024-08-08 14:55:53 +02:00
Pablo Natek c5358313df fix: route form 2024-08-08 14:54:17 +02:00
Carlos Satorres 3eaa5c864d refs #7355 account fixes 2024-08-08 13:57:01 +02:00
Alex Moreno 1512801f02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-08 12:52:55 +02:00
Alex Moreno 6fb6e07be0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-08 12:52:37 +02:00
Alex Moreno 80f63f1ae2 fix: VnCard VnSearchbar props 2024-08-08 12:52:36 +02:00
Jorge Penadés 85edc28a9b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix-6449-summaryId 2024-08-08 12:42:10 +02:00
Alex Moreno 2f3ad52d48 duplicate notify 2024-08-08 12:36:20 +02:00
Alex Moreno ea8aca29a6 fix(twoFactor): unify code login and twoFactor 2024-08-08 12:33:26 +02:00
Jorge Penadés 0782b3ff5f chore: #6900 order params 2024-08-08 12:15:11 +02:00
Pablo Natek 26628c5f2a fix: refs #7129 fix vehicle filter 2024-08-08 11:18:37 +02:00
Alex Moreno 5ac2d34125 hotFix: vnVisibleColumn fix userId 2024-08-08 10:27:27 +02:00
Jorge Penadés dc5142c20a feat: refs #6900 use VnTable & sort filter fields 2024-08-08 10:12:54 +02:00
Alex Moreno cc8afa2f99 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-08 08:57:38 +02:00
Alex Moreno ac1434fb9c Merge branch 'dev' into vnCard-unify-searchbarParams 2024-08-08 05:56:39 +00:00
Alex Moreno 3a77be0043 change searchbar to searchbarProps 2024-08-08 07:56:29 +02:00
Alex Moreno ce878b5201 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-08 07:43:58 +02:00
Alex Moreno afe178216c invoiceOut 2024-08-07 14:45:43 +02:00
Alex Moreno 12bd66b9ca typo 2024-08-07 14:41:57 +02:00
Alex Moreno 2f7dd0a4cb remove unecessary props 2024-08-07 14:41:30 +02:00
Alex Moreno 44e3eb779d feat(VnCard): use props searchbar 2024-08-07 14:40:28 +02:00
Jorge Penadés baf0981233 chore: refs #7323drop commented code 2024-08-07 13:37:37 +02:00
Jorge Penadés 855483cefd fix: refs #7323 css righ menu 2024-08-07 13:37:01 +02:00
Jorge Penadés 4ee6c7436f fix: refs #7323 righ menu bug 2024-08-07 13:18:13 +02:00
Jorge Penadés 98656aa2c8 fix: refs #7323 add department popup 2024-08-07 12:29:19 +02:00
Carlos Satorres df1b63da98 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration2 2024-08-07 12:23:22 +02:00
Carlos Satorres 6b69a16122 refs #7355 changes BasicData 2024-08-07 12:22:52 +02:00
Jorge Penadés 017d5382bb fix: refs #7323 data-key & add select 2024-08-07 12:19:26 +02:00
Jorge Penadés bd67218a00 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fixErrors 2024-08-07 11:58:41 +02:00
Jorge Penadés 08ed134b12 fix: refs #7323 wrong css 2024-08-07 11:57:27 +02:00
Alex Moreno c2e59856df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-07 11:54:55 +02:00
Alex Moreno dafa8cdebd Merge branch 'dev' into 6943-customer_migration_subsection-v2 2024-08-07 08:54:36 +00:00
Alex Moreno 9e0fba49ea fix: accountMailAlias 2024-08-07 10:38:20 +02:00
Jorge Penadés c6c2245a2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-07 10:17:14 +02:00
Alex Moreno 2cb99eb025 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-07 10:04:13 +02:00
Alex Moreno b781cfb131 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front 2024-08-07 10:03:21 +02:00
Alex Moreno f9ba6e155d hotFix: VnInputTIme 2024-08-07 10:03:20 +02:00
Alex Moreno 88d0a09324 Merge branch 'master' into hotfix_InvoiceOutMigration 2024-08-07 07:18:37 +00:00
Jon Elias 3dc2ac8bac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-08-07 07:25:57 +02:00
Alex Moreno 3f5a8218d0 Merge branch 'master' into 7129-fixFilter 2024-08-06 12:56:32 +00:00
Alex Moreno ffcab60a06 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-06 14:31:28 +02:00
Pablo Natek 990fe65a63 fix: filter and correct list 2024-08-06 14:17:17 +02:00
Alex Moreno 1db7fd8412 hotFix(routeTicket): limit 0 2024-08-06 13:01:07 +02:00
Alex Moreno c3fb30e72b Merge branch 'master' into 7129-hotfix 2024-08-06 10:15:38 +00:00
Jon Elias e8396ea338 refactor: refs #6899 added descriptors to VnTable and fix descriptor redirect 2024-08-06 11:55:44 +02:00
Alex Moreno 7e7fddb86b fix(router_basicData): transalation kmMax 2024-08-06 11:50:33 +02:00
Pablo Natek 7d6520fdaa fix: routeForm 2024-08-06 11:44:38 +02:00
Carlos Satorres 75866f2d27 refs #6898 fix new list 2024-08-06 11:00:59 +02:00
Alex Moreno 4c46e419e3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-06 09:43:50 +02:00
Alex Moreno 28efe4aacf hotFix(route_list): columnFilter change "from" to "to" 2024-08-06 09:43:16 +02:00
Jorge Penadés 90073a0a68 fix: refs #7283 locale 2024-08-06 09:12:12 +02:00
Jorge Penadés 50468d22cc fix: refs #7283 min-width vnImg 2024-08-06 08:56:12 +02:00
Jorge Penadés db38270ed5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-06 08:47:09 +02:00
Alex Moreno f38a70c040 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-06 08:01:41 +02:00
Jorge Penadés 005f571ecf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-05 17:14:06 +02:00
Jorge Penadés b8d38f15e4 fix: refs #7283 use vnAvatar & add optional zoom 2024-08-05 17:13:15 +02:00
Alex Moreno 8c754dd196 hotFix(claim_development): reload when change route id 2024-08-05 15:22:34 +02:00
Alex Moreno 6abce3c7d0 hotFix(VnPaginate): watch when is mounted 2024-08-05 15:20:07 +02:00
Alex Moreno dcc2ef3d18 typo 2024-08-05 14:25:42 +02:00
Jorge Penadés 5bd0bbb3ac fix: refs #7283 userPanel pic 2024-08-05 14:03:55 +02:00
Alex Moreno 5bac9143e6 fix(customer_sms: fix reload 2024-08-05 14:02:39 +02:00
Alex Moreno 88ea25cb83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-customer_migration_subsection-v2 2024-08-05 13:46:17 +02:00
Alex Moreno 98a16b9453 refactor(customer_log: use VnLog 2024-08-05 13:44:35 +02:00
Alex Moreno 7612260359 refactor(customer_webAccess): FormModel 2024-08-05 13:36:27 +02:00
Jorge Penadés 16cfd84fab fix: refs #7283 itemTags & VnImg 2024-08-05 13:01:26 +02:00
Alex Moreno 810e579ea9 refactor(customer_recovery): to vnTable 2024-08-05 12:10:15 +02:00
Guillermo Bonet 59b709b57d Merge branch 'test' into dev 2024-08-05 11:59:15 +02:00
Guillermo Bonet da911f80f6 Merge branch 'master' into test 2024-08-05 11:58:58 +02:00
Guillermo Bonet d12c0de144 feat: refs #7644 Optimized entry labels report 2024-08-05 11:29:44 +02:00
Alex Moreno c83b3d54ae typo 2024-08-05 10:07:47 +02:00
Alex Moreno 30961c796d feat(customer_balance): refs #6943 translations 2024-08-05 10:05:41 +02:00
Alex Moreno 460b166a17 feat(customer_balance): refs #6943 add functionality from salix 2024-08-05 09:04:08 +02:00
Alex Moreno 91e066e18a Merge branch 'test' into hotfix_TicketList_itemName 2024-08-05 05:44:41 +00:00
Jorge Penadés 6f771c7ae6 fix: refs #7283 basicData locale 2024-08-02 14:31:41 +02:00
Jon Elias bdf4c793dc Merge branch 'test' into hotfix_ItemDiary 2024-08-02 11:04:47 +00:00
Jorge Penadés 27e7d30158 fix: refs #7283 basicData locale 2024-08-02 12:50:58 +02:00
Jorge Penadés bc4ee5c8a5 fix: refs #7283 basicData locale 2024-08-02 12:50:09 +02:00
Alex Moreno eb55743bc0 Merge branch 'test' into hotfix_6101_FixTicketList 2024-08-02 10:28:44 +00:00
Guillermo Bonet 0d016e0898 Merge branch 'test' into dev 2024-08-02 10:01:16 +02:00
Guillermo Bonet 33da5dd8a8 Merge branch 'master' into test 2024-08-02 10:01:01 +02:00
Guillermo Bonet 8450830b59 Merge branch 'master' into 7413-filterValueFix 2024-08-02 07:55:30 +00:00
Jon Elias 2367550bc1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_ItemDiary 2024-08-02 09:25:46 +02:00
Jon Elias 276202f0c7 fix: refs CAU 207504 fix itemDiary and logs 2024-08-02 09:23:30 +02:00
Jon Elias b6bb8e0952 hotfix: refs CAU #207614 fix sale.concept field 2024-08-02 08:41:46 +02:00
Jon Elias c5f2075148 fix: refs #6101 fix TicketList 2024-08-02 08:25:57 +02:00
Alex Moreno 545f7c8039 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-01 14:11:15 +02:00
Alex Moreno fa60467e76 fix(claim): small details 2024-08-01 10:51:13 +02:00
Alex Moreno 3a64929c05 feat(VnLocation): onCityCreated refresh provinces 2024-08-01 10:35:33 +02:00
Carlos Satorres 8d8bd095f6 Merge branch 'dev' into 7355-accountMigration 2024-08-01 08:15:21 +00:00
Alex Moreno 0b7c8c41d2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-01 10:12:56 +02:00
Alex Moreno 5f6eeb77ea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-08-01 10:12:41 +02:00
Carlos Satorres 68e4831ea5 refs #7355 fix conflicts 2024-08-01 09:56:54 +02:00
Carlos Satorres 2d467016b2 refs #7355 fix roles 2024-08-01 09:51:18 +02:00
Alex Moreno d9fb0d9186 nullishToTrue fn 2024-08-01 09:47:38 +02:00
Alex Moreno 5233c1455a refactor: refs #7679 better way to update model 2024-07-31 14:57:25 +02:00
Guillermo Bonet f09308d956 fix: refs #7413 No id tag 2024-07-31 12:50:34 +02:00
Carlos Satorres ed032badac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration 2024-07-31 09:37:20 +02:00
Carlos Satorres e41078b973 refs #7355 traduccions 2024-07-31 08:34:31 +02:00
Alex Moreno 287abcf90c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-31 08:10:30 +02:00
Alex Moreno 2ad72c3209 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-07-31 08:01:44 +02:00
Jon Elias 68ce5880dd refactor: refs #7717 deleted useless code 2024-07-31 07:35:59 +02:00
Carlos Satorres 5b214b58ab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration 2024-07-31 07:22:43 +02:00
Jon Elias cf90007023 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-30 14:33:28 +02:00
Alex Moreno ed110beda6 Merge branch 'dev' into 6943-customer_migration_subsection 2024-07-30 11:33:11 +00:00
Jon Elias 7e3bfce732 fix: refs #7717 fix basic data form & minor errors 2024-07-30 13:31:12 +02:00
Jorge Penadés 3bb261376d chore: refs #6449 refactor model-value text 2024-07-30 13:16:45 +02:00
Alex Moreno 108ffbe7a8 Merge branch 'master' into 7679-hotFix_vnLocation 2024-07-30 11:12:10 +00:00
Alex Moreno ecb201edce delete unnesessary class 2024-07-30 12:45:18 +02:00
Jorge Penadés df907a7280 fix: refs #6449 fix summaryId 2024-07-30 12:43:26 +02:00
Carlos Satorres 7ff20f3064 hotFix: supplierList correct filter 2024-07-30 11:50:23 +02:00
Jorge Penadés 1fe2ba7f09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6989-showClientName 2024-07-30 09:52:29 +02:00
Jon Elias 2cd696aeb9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-30 08:03:46 +02:00
Alex Moreno b5cb28a0cf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-30 07:47:46 +02:00
Alex Moreno 9179e13dcd fix: vnLocation 2024-07-29 15:03:21 +02:00
Jorge Penadés 839af6d50c fix: refs #6989 show entity name & default time from config table 2024-07-29 13:41:44 +02:00
Jorge Penadés 979b3b2a6c fix: refs #7197 drop character 2024-07-29 08:46:47 +02:00
Jorge Penadés 5705904e40 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-29 08:04:51 +02:00
Jon Elias be113656ae Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-26 14:56:27 +02:00
Jon Elias 4d7fe0fd86 fix: refs #7717 fix volume and lines redirect 2024-07-26 14:56:26 +02:00
Alex Moreno f079ba4022 hotFix: twoFactor add required import 2024-07-26 14:51:22 +02:00
Jon Elias 356e7768b7 Merge branch 'dev' into 7717_fixOrderCatalog 2024-07-26 12:11:18 +00:00
Jon Elias 4cad7cbced Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-26 14:09:10 +02:00
Jon Elias d588db05ac fix: refs #7717 fix OrderList table filters' and summary table style 2024-07-26 14:09:09 +02:00
Robert Ferrús bfbe4d64b3 Merge branch 'master' into 7039-hotFixSupplierSummary 2024-07-26 11:59:32 +00:00
Guillermo Bonet 7b13250a16 Merge branch 'test' into dev 2024-07-26 13:57:11 +02:00
Guillermo Bonet 621de11890 fix: refs #6769 Requested changes 2024-07-26 13:14:45 +02:00
Guillermo Bonet 48e133ffc7 fix: refs #6769 Fix worker images 2024-07-26 13:00:55 +02:00
Robert Ferrús d4ff3ab993 fix: refs #7039 supplierSummary 2024-07-26 12:55:36 +02:00
Guillermo Bonet 86ab161302 fix: refs #6769 Fixes item diary 2024-07-26 12:37:53 +02:00
Alex Moreno 21b642a7c5 typo 2024-07-26 12:15:57 +02:00
Carlos Satorres f4c0288ca0 refs #6898 filters sortby 2024-07-26 12:01:46 +02:00
Carlos Satorres 1ad15869e8 refs #6898 filters select 2024-07-26 11:45:13 +02:00
Carlos Satorres d575c3cdae refs #6898 filters 2024-07-26 11:25:44 +02:00
Alex Moreno 28e50512ba remove console.log 2024-07-26 09:51:46 +02:00
Alex Moreno 21dd2e4b46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-customer_migration_subsection 2024-07-26 09:49:22 +02:00
Alex Moreno 026c632a4c feat(customer): improve basicData to balance 2024-07-26 09:47:28 +02:00