wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
8,079 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

969 Commits

Author SHA1 Message Date
Carlos Satorres 6db1c8f083 fix traduction 2024-09-06 07:50:39 +02:00
Jon Elias 102f7fb13e Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-06 07:15:48 +02:00
Javier Segarra 1f96f5c09a feat: orderCreateDialog 2024-09-05 22:20:57 +02:00
Javier Segarra 31abd8b4c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable 2024-09-05 19:45:41 +02:00
Carlos Satorres 8fe6fad4a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor 2024-09-05 12:07:18 +02:00
Carlos Satorres 83969f1d57 fix traduction 2024-09-05 12:05:53 +02:00
Javier Segarra cf3b9b2ef8 perf: CustomerSummary 2024-09-04 17:55:27 +02:00
Jorge Penadés af5e47ed3e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-09-04 16:06:31 +02:00
Carlos Satorres 3a703141c6 Merge branch 'dev' into 7407-MedicalWorker2 2024-09-04 07:49:14 +00:00
Jorge Penadés 50cdb053f8 feat: refs #7663 fine tunning 2024-09-03 17:33:17 +02:00
Jorge Penadés a5887114ef Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-hotfix-fineTunning 2024-09-03 12:50:35 +02:00
Pablo Natek 2fb974af0f Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-03 08:01:19 +02:00
Jon Elias 3d683c1da3 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-03 07:45:23 +02:00
Carlos Satorres 0475083a2b refs #7407 Medical Section 2024-09-02 14:57:01 +02:00
Jon Elias 1af4a559fc Merge branch 'dev' into 7354_ZoneMigration_End 2024-09-02 10:50:22 +00:00
Carlos Satorres dfb098d440 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-09-02 12:32:47 +02:00
Jon Elias 8bcecb91c6 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-02 11:25:11 +02:00
Jon Elias 45d9322892 feat: refs #7553 added icons, descriptors and missing columns in TicketList and minor changes 2024-09-02 11:24:06 +02:00
Javier Segarra fb15e90f0b Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-02 09:48:48 +02:00
Jorge Penadés a8fc5a8d73 Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-09-02 09:09:27 +02:00
Jorge Penadés be63c8a7fa fix: refs #6900 fine tunning wip 2024-09-02 08:43:32 +02:00
Javier Segarra c25b689685 Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-08-31 00:14:42 +02:00
Carlos Satorres 268a27878c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-08-30 13:23:42 +02:00
Carlos Satorres 874cbfea9b refs #7366 fix travel hours 2024-08-30 12:31:42 +02:00
Carlos Satorres 859eb918cd refs #6897 fix entry 2024-08-30 11:50:05 +02:00
Jorge Penadés f9a509ac67 feat: refs #7353 add no one opt 2024-08-30 11:40:55 +02:00
Carlos Satorres f33733c7f2 refs #7355 fix total 2024-08-30 11:25:00 +02:00
Carlos Satorres 1544513a3e refs #7355 #7366 fix account, summary, list, travelList, tooltip 2024-08-30 11:18:48 +02:00
Carlos Satorres 278f691ed2 refs #7355 fix views summarys, entryList, travelList refact 2024-08-30 09:52:43 +02:00
Jorge Penadés 966667bab7 refactor: refs #7353 tickets correction 2024-08-29 11:40:42 +02:00
Javier Segarra 20ddabcc01 Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable 2024-08-27 16:30:32 +02:00
Javier Segarra cadd6a2b62 Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable 2024-08-27 15:52:38 +02:00
Javier Segarra 3ea8490e98 Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-08-27 15:46:04 +02:00
Carlos Satorres 477984076b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-08-27 10:55:17 +02:00
Jorge Penadés 25be0df2e3 Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-27 09:55:52 +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
Javier Segarra 10747d7a4f perf: customerSummaryTable 2024-08-27 07:00:28 +02:00
Javier Segarra 56f687ce36 perf: sendEmail customerConsumption 2024-08-23 21:06:15 +02:00
Javi Gallego defb11a6d7 Merge branch 'dev' into 7346-invoiceOutMultilple 2024-08-23 08:20:06 +00: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
Javi Gallego 0eb699bcbe feat: refs #7346 formdata uses serialType 2024-08-20 10:10:11 +02:00
Jorge Penadés f34f3a78cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-08-19 16:39:39 +02: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
Jon Elias 23e5072d38 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-08-19 11:31:30 +02:00
Jon Elias 4a57c53c3d fix: refs #7553 & #7356 migration 2024-08-19 11:30:20 +02:00
Jon Elias ce8d12fe20 Merge branch 'dev' into 7717_fixOrderCatalog 2024-08-19 09:20:31 +00:00
Jon Elias 6fd0083870 fix: refs #7354 fix validation in price field 2024-08-19 10:45:13 +02:00
Jorge Penadés ada1c948f6 feat: refs #7353 split sections 2024-08-19 10:14:02 +02:00
Alex Moreno e45e551526 feat: customer consumption 2024-08-16 15:16:35 +02:00
Jon Elias 95cda2bad7 Merge branch 'dev' into 7354_ZoneMigration_End 2024-08-14 13:10:25 +00: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
Javier Segarra 55b9cd9ff4 feat: handle same multiple CP 2024-08-14 09:18:24 +02:00
Alex Moreno 0a0e8be39f Merge branch 'dev' into 7848-recoveryPassword 2024-08-13 14:41:23 +00: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 a46198e2d0 feat: add recover password and reset password 2024-08-13 12:25:08 +02:00
Carlos Satorres ec9c2fb3ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-08-12 14:13:26 +02:00
Jorge Penadés c4de1beabf feat: refs #6900 add InvoiceInSerial 2024-08-12 13:46:56 +02:00
Alex Moreno 37244cdbc7 feat(orderBasicData): add notes 2024-08-09 14:55:49 +02:00
Jorge Penadés dc5142c20a feat: refs #6900 use VnTable & sort filter fields 2024-08-08 10:12:54 +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
Pablo Natek f2be2b4300 fea: stockBought add form and formDetail 2024-08-05 15:42:57 +02:00
Alex Moreno 810e579ea9 refactor(customer_recovery): to vnTable 2024-08-05 12:10:15 +02:00
Carlos Satorres 2604441c13 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-08-01 10:19:26 +02:00
Carlos Satorres e41078b973 refs #7355 traduccions 2024-07-31 08:34:31 +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 a7a1b7801c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule 2024-07-23 13:25:58 +02:00
Jon Elias 12370b6437 feat: refs #6346 new wagon type section 2024-07-23 13:22:54 +02:00
Carlos Satorres f678c63043 refs #7283 request 2024-07-22 13:35:41 +02:00
Carlos Satorres 4d394a98a4 refs #7283 fix yml list basicData 2024-07-22 08:24:59 +02:00
Guillermo Bonet 580777af65 Deleted repeated labeler i18n 2024-07-22 08:20:08 +02:00
Guillermo Bonet c5903e29e8 Merge branch 'master' into test 2024-07-19 13:08:41 +02:00
Javier Segarra 7cbdf0d98b feat: fix bugs and filters 2024-07-18 15:20:44 +02:00
Javier Segarra 5fbbd27273 fat: i18n 2024-07-16 12:21:50 +02:00
Javier Segarra fb2e3f1f9c feat: required validation 2024-07-16 11:25:06 +02:00
Javier Segarra 8798598f41 Merge branch 'dev' into 7017_formModel_validations 2024-07-16 09:26:22 +02:00
Javier Segarra be86b69079 fix: ticket menu order and i18n 2024-07-15 11:53:10 +02:00
Javier Segarra c56610515c Merge branch 'dev' into TicketDms 2024-07-15 11:29:27 +02:00
Javier Segarra ae55983405 Merge branch 'dev' into feature/SaleTracking 2024-07-15 09:23:53 +00:00
Alex Moreno cc8062785a Merge branch 'dev' into feature/SaleTracking 2024-07-15 08:17:01 +00:00
Javier Segarra 20403287dd feat: scopeDays replace by daysOnward 2024-07-12 22:38:38 +02:00
Javier Segarra c5c96bf51b Merge branch 'dev' into feature/SaleTracking 2024-07-09 09:41:45 +02:00
Javier Segarra cededb54e8 Merge branch 'dev' into feature/TicketDms 2024-07-09 09:14:40 +02:00
Alex Moreno 75b8cca2e0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5 2024-07-08 14:25:01 +02:00
Javier Segarra aabd575854 Merge branch 'dev' into feature/TicketPackages 2024-07-08 10:55:14 +02:00
Javier Segarra 84462fe201 Merge branch 'dev' into feature/TicketComponents 2024-07-08 10:14:13 +02:00
Javier Segarra f87b806406 Merge branch 'dev' into feature/TicketPhotos 2024-07-08 10:10:24 +02:00
Javier Segarra a303942f76 Merge branch 'dev' into feature/TicketExpedition 2024-07-08 08:05:33 +00:00
Javier Segarra 9d4cfbd90c Merge branch 'dev' into feature/TicketPackages 2024-07-05 09:28:31 +02:00
Alex Moreno 12ca0faf21 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5 2024-07-05 07:23:20 +02:00
William Buezas decf33c0b7 small changes 2024-07-04 09:46:10 -03:00
Javier Segarra d6cc447989 Merge branch 'dev' into feature/SaleTracking 2024-07-04 10:44:50 +02:00
Javier Segarra 14e26f0285 Merge branch 'dev' into feature/TicketComponents 2024-07-04 09:40:00 +02:00
William Buezas 91eb966586 Ticket photos 2024-07-03 14:44:36 -03:00
Alex Moreno 2340aaba0b feat: list use vnTable, fix descriptor 2024-07-03 14:39:15 +02:00
Jorge Penadés 076fbad20e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-03 14:11:29 +02:00
Jorge Penadés b0c5f19f1d merge dev 2024-07-03 12:31:01 +02:00
Carlos Satorres 92b8104b19 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration 2024-07-03 12:21:03 +02:00
Carlos Satorres 885decc700 Merge branch 'dev' into 6897-entryMigration2 2024-07-03 10:02:28 +00:00
Alex Moreno 1463cc8904 Merge branch 'dev' into 7366-travelMigration2 2024-07-03 08:32:00 +00:00
Carlos Satorres 27876b0bab Merge branch 'dev' into 7366-travelMigration2 2024-07-03 08:30:56 +00:00
Pablo Natek 29c4b1bcb8 Merge branch '7404-add-e2e-to-route' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route 2024-07-03 10:20:58 +02:00
Pablo Natek 937167ce95 remove: refs #7404 remove traductions 2024-07-03 10:19:47 +02:00
Carlos Satorres 94680a6c2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration 2024-07-03 10:07:34 +02:00
Pablo Natek f15fc0d6a7 Merge branch 'dev' into 7404-add-e2e-to-route 2024-07-03 08:07:15 +00:00
Carlos Satorres dff77277ac refs #6897 fix summary, list, inputs 2024-07-03 10:05:05 +02:00
Jon Elias f8d263c347 Merge branch 'dev' into 7543-StandarizeDescriptors 2024-07-03 07:52:35 +00:00
Pablo Natek 61bd1eaf04 merge dev 2024-07-03 09:33:04 +02:00
Carlos Satorres b40e3f2c7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2 2024-07-03 08:48:33 +02:00
Carlos Satorres 21d5d6b986 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration2 2024-07-03 08:46:05 +02:00
Javier Segarra f46443ee69 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-03 08:33:33 +02:00
Javier Segarra d15dc7336b Merge branch 'dev' into 7648_dev_customerEntries 2024-07-03 08:26:27 +02:00
Jon Elias e13f98dffb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7543-StandarizeDescriptors 2024-07-03 07:12:07 +02:00
William Buezas 5c36ad14f4 Ticket components 2024-07-02 21:33:19 -03:00
Javier Segarra 8a94701422 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-02 20:32:08 +02:00
Jon Elias c0e65ff3b7 fix: refs #7030 solve conflicts 2024-07-02 11:50:07 +02:00
Pablo Natek 2ad9530b1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route 2024-07-02 09:58:46 +02:00
Jorge Penadés 2c9c1bed09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-02 09:56:55 +02:00
Javier Segarra 68298b9ba6 feat: rreplace eti by labeler 2024-07-01 19:03:17 +02:00
Javier Segarra 3f5f918684 Merge branch 'dev' into feature/TicketExpedition 2024-07-01 15:12:40 +02:00
Javier Segarra 7896e3d7f9 Merge branch 'dev' into feature/TicketDms 2024-07-01 14:59:09 +02:00
Javier Segarra 0cbd7c9cae Merge branch 'dev' into feature/TicketService 2024-07-01 14:53:08 +02:00
Javier Segarra 527c565ca9 Merge branch 'dev' into feature/TicketTracking 2024-07-01 14:50:23 +02:00
Javier Segarra 9bb75b8305 Merge branch 'dev' into feature/TicketVolume 2024-07-01 14:48:12 +02:00
Javier Segarra 0dfdb1edb0 Merge branch '7648_customerEntries' into 7648_dev_customerEntries 2024-07-01 12:27:07 +02:00
Javier Segarra 71900b15a6 feat: newsection and i18n 2024-07-01 12:18:58 +02:00
Jorge Penadés 4ffe0894c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-01 11:55:16 +02:00
Carlos Satorres 9d1e7363ab refs #6897 fix filters 2024-07-01 10:13:33 +02:00
Pablo Natek a69235e4d4 fix: refs #7404 add e2e and fix route 2024-07-01 07:39:35 +02:00
William Buezas 768b619904 Sale tracking 2024-06-30 17:43:21 -03:00
Javier Segarra 9f68c380da Merge branch 'dev' into feature/TicketExpedition 2024-06-29 00:32:33 +02:00
Carlos Satorres 41d6c3f07e refs #6897 fix columns trad 2024-06-28 15:00:35 +02:00
Carlos Satorres e62e914e48 refs #6897 change image, fit component 2024-06-28 14:55:44 +02:00
Javier Segarra 946a2d4823 Merge branch 'dev' into feature/TicketService 2024-06-28 13:24:24 +02:00
Jon Elias 93c109b70d refactor: new translations 2024-06-28 11:25:38 +02:00
Carlos Satorres b05528ae14 refs #6897 fix latestbuys trad 2024-06-28 11:23:29 +02:00
Jon Elias 8e9b238eaa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7030-FixTranslations 2024-06-28 10:58:57 +02:00
Jon Elias 369cb9dc75 refactor: refs #7030 added translations 2024-06-28 10:56:09 +02:00
William Buezas db4c3a6799 Changes 2024-06-27 11:46:31 -03:00
Carlos Satorres ed4517183e refs #6897 fix trad, latestBuys 2024-06-27 14:02:45 +02:00
William Buezas 0e8106af17 Resolve conflicts 2024-06-26 17:21:31 -03:00
Carlos Satorres aaee96d6bb refs #7366 VnTable 2024-06-26 15:09:26 +02:00
Jon Elias 452d1000bc refactor: refs #7543 requested changes 2024-06-26 14:28:21 +02:00
William Buezas fd03336c7a Resolve conflicts 2024-06-26 09:12:23 -03:00
William Buezas 8ee4fa2e7d Resolve conflicts 2024-06-26 08:39:56 -03:00
William Buezas ad950f33c6 WIP 2024-06-26 08:27:36 -03:00
Carlos Satorres 44ba965feb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration 2024-06-26 11:42:38 +02:00
Carlos Satorres c570f2058b Merge branch 'dev' into 7409-workerBalance 2024-06-26 09:37:52 +00:00
Carlos Satorres 1f41f8e564 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration 2024-06-26 10:10:00 +02:00
Jorge Penadés 98bc7cbf0d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-06-26 09:46:38 +02:00
Javier Segarra 120a119b38 Merge branch 'dev' into feature/TicketTracking 2024-06-25 23:05:11 +02:00
Javier Segarra ff02e5d160 Merge branch 'dev' into feature/WeeklyTickets 2024-06-25 22:59:16 +02:00
Javier Segarra 7a2b334a64 Merge branch 'dev' into feature/TicketTracking 2024-06-25 22:41:15 +02:00
Javier Segarra c45c24e983 Merge branch 'dev' into feature/TicketPurchaseRequest 2024-06-25 22:31:52 +02:00
Carlos Satorres 6e33a2930b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance 2024-06-25 17:04:47 +02:00
Javier Segarra 1e080d02ed Merge branch 'dev' into feature/WeeklyTickets 2024-06-25 14:48:31 +02:00
Javier Segarra 049174232a Merge branch 'dev' into feature/TicketsFuture 2024-06-25 14:24:38 +02:00
Javier Segarra 5685d99cd6 Merge branch 'dev' into feature/TicketsAdvance 2024-06-25 14:22:00 +02:00
William Buezas 8e538fb463 WIP 2024-06-25 08:27:25 -03:00
Carlos Satorres 49b86672f5 Merge branch 'dev' into 7406-workerFormation 2024-06-25 11:18:05 +00:00
Jorge Penadés 262742fee3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-06-25 09:23:05 +02:00
Alex Moreno d421cefeb1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-25 07:32:17 +02:00
William Buezas fb12d4ddc0 WIP 2024-06-24 17:24:36 -03:00
William Buezas 4effba1580 Ticket dms 2024-06-24 16:38:41 -03:00
William Buezas 91df35fcae Ticket volume 2024-06-24 11:12:49 -03:00
William Buezas 17e9d95702 Ticket notes 2024-06-24 09:02:29 -03:00
Javier Segarra 0d718448e2 perf: approach 2024-06-21 13:09:34 +02:00
Jorge Penadés 891c0d2347 feat: refs 6238 show notes & create vnPopup 2024-06-21 13:05:28 +02:00
Carlos Satorres f88fffa89c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration 2024-06-21 10:32:44 +02:00
Carlos Satorres 87a9ee5ccb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance 2024-06-21 09:50:38 +02:00
Carlos Satorres fdedf7bf57 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-21 08:42:57 +02:00
Jorge Penadés 9e078bc074 fix: refs #7197 vat, intrastat, filter and list sections 2024-06-20 16:15:10 +02:00
Alex Moreno 28b241bb77 Merge branch 'dev' into 6825-vnTable 2024-06-20 10:26:05 +00:00
William Buezas 0afd7f4ae1 Ticket tracking 2024-06-19 10:22:20 -03:00
William Buezas b3a4dd3f79 Ticket purchase request 2024-06-19 08:16:20 -03:00
Carlos Satorres 789dffe2e2 refs #6898 vntable, traductions 2024-06-19 12:05:21 +02:00
Pablo Natek 825762d70e Merge branch 'dev' into 7129-finishRouteMigration 2024-06-19 08:20:14 +00:00
Jon Elias 42c58296ac refafctor: changed titles errors 2024-06-19 08:44:40 +02:00
William Buezas bb208040bb Last changes 2024-06-18 11:47:35 -03:00
Jon Elias a33ce5699e feat: refs #7030 translation proposal 2024-06-18 15:26:48 +02:00
Alex Moreno 8085e1e518 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-18 13:25:44 +02:00
Carlos Satorres 84378187be Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance 2024-06-18 08:56:23 +02:00
Carlos Satorres 0940872625 Merge branch '6897-EntryMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration 2024-06-18 07:18:47 +02:00
Carlos Satorres bc30531d42 refs #6897 fix trad 2024-06-18 07:18:44 +02:00
William Buezas 06e8e819f4 WIP 2024-06-17 12:11:23 -03:00
Carlos Satorres 0ccfd9ae75 refs #7409 columns trad 2024-06-17 15:50:33 +02:00
William Buezas c807b5feb2 Weekly tickets 2024-06-17 08:21:43 -03:00
Alex Moreno e8054467a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-17 13:00:30 +02:00
Pablo Natek 20e0c84035 fix: refs #7129 fix module routes 2024-06-14 13:10:47 +02:00
Pablo Natek d6f085dc3d Merge branch 'dev' into 7129-finishRouteMigration 2024-06-13 13:48:44 +02:00
Pablo Natek f2dddb5e30 Merge branch 'dev' into 7129-finishRouteMigration 2024-06-13 10:45:37 +02:00
Pablo Natek e10755d8fe Merge branch 'dev' into 7499-refactorEntrys 2024-06-13 05:39:13 +00:00
Guillermo Bonet 9388cb3599 Merge branch 'test' into dev 2024-06-12 12:02:12 +02:00
Guillermo Bonet 135e05b139 hotfix: refs #6636 EN i18n 2024-06-12 12:00:43 +02:00
Pablo Natek b7a097fd13 Merge branch 'dev' into 7499-refactorEntrys 2024-06-12 06:16:48 +00:00
Alex Moreno c3409a9d5c Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-12 07:50:41 +02:00
Alex Moreno 048685277f Merge branch 'dev' into 6825-vnTable 2024-06-12 05:31:31 +00:00
Pablo Natek a65f5dfe44 fix: refs #7499 use current colors 2024-06-11 16:38:12 +02:00
Alex Moreno 3dfe3226ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-11 15:00:52 +02:00
Jon Elias 4045a3a631 Merge branch 'dev' into 7154-ItemDescriptor 2024-06-11 12:56:52 +00:00
Javi Gallego cb0559fee8 Merge pull request '7548-ticketSummaryCollection' (!432) from 7548-ticketSummaryCollection into dev 
Reviewed-on: verdnatura/salix-front#432
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-11 12:53:42 +00:00
Jon Elias 2d0b33c626 Merge branch '7154-ItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7154-ItemDescriptor 2024-06-11 14:29:44 +02:00
Jon Elias de18b670ea feat: refs #7154 changed label 2024-06-11 14:29:42 +02:00
Pablo Natek be919f97b1 Merge branch '7499-refactorEntrys' of https://gitea.verdnatura.es/verdnatura/salix-front into 7499-refactorEntrys 2024-06-11 14:28:20 +02:00
Pablo Natek 80adeede81 fix: refs #7499 fix item reference 2024-06-11 14:28:19 +02:00
Jon Elias 989ea3d82c Merge branch 'dev' into 7154-ItemDescriptor 2024-06-11 11:49:25 +00:00
Jon Elias e5a590a9f9 feat: refs #7154 new item descriptor field 2024-06-11 13:48:15 +02:00
Alex Moreno 59e72dcd50 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-11 12:53:50 +02:00
Alex Moreno f753eddc43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-11 11:40:58 +02:00
Javi Gallego 0e0e351805 Merge branch 'dev' into 7548-ticketSummaryCollection 2024-06-10 10:53:33 +02:00
Jorge Penadés d35f9c9468 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection 2024-06-07 12:03:52 +02:00
Javi Gallego 9ceac32d89 feat: refs #7548 grafana 2024-06-07 11:59:26 +02:00
Javier Segarra 0ea44eb8db Merge branch 'dev' into feature/AccountAcls 2024-06-07 10:07:15 +02:00
Pablo Natek 68e49e2ffa fix: refs #7129 fix some issues on load and tools 2024-06-07 07:52:50 +02:00
Alex Moreno 395eb6bed7 Merge branch 'dev' into feature/AccountRoles 2024-06-06 07:32:15 +00:00
William Buezas 3efca6242d Account ACLs 2024-06-04 08:41:41 -03:00
Jorge Penadés 1bc99cbd22 feat: refs #6243 show all cmrs & filter by warehouse 2024-06-03 16:30:59 +02:00
Jorge Penadés f58b072964 feat: refs #6600 Add option to add comment for photo motivation 2024-06-03 09:30:37 +02:00
Javier Segarra 28173ddee2 Merge branch 'dev' into feature/AccountRoles 2024-05-31 10:24:37 +02:00
William Buezas 4bd78922af remove unnecesary files 2024-05-30 15:43:26 -03:00
William Buezas 05b7df9168 Role submodules 2024-05-30 15:34:37 -03:00
William Buezas 5c25c77f19 Mail aliases 2024-05-30 13:09:11 -03:00
William Buezas 0cf4f41d19 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/MailAliases 2024-05-30 08:38:23 -03:00
Alex Moreno 2b6612317c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-05-29 14:05:42 +02:00
Alex Moreno 5965e70740 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-05-29 07:50:15 +02:00
William Buezas 0659eac652 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountRoles 2024-05-28 18:38:13 -03:00
Alex Moreno 0f1c91d36c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-05-28 07:42:15 +02:00
Carlos Satorres d8512e2033 refs #7406 fix trad 2024-05-27 18:23:33 +02:00
Carlos Satorres ef52c9b0c0 refs #7406 routes trad 2024-05-27 10:42:47 +02:00
Jorge Penadés 3b799efa22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-27 08:57:34 +02:00
Carlos Satorres ba5407310f refs #7396 fix summary 2024-05-24 13:40:00 +02:00
Javier Segarra 433564507e Merge branch 'dev' into 7311_boilerplate_users 2024-05-23 08:53:10 +02:00
Javier Segarra 06664cc2d0 feat: newRole 2024-05-23 08:52:57 +02:00
Alex Moreno bcb800269e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-05-22 14:32:00 +02:00
Jorge Penadés 5bddc6e04d fix: refs #6942 wip: formModel 2024-05-22 11:22:46 +02:00
Javier Segarra a2316fb222 feat: change skeleteon different components 2024-05-18 10:35:08 +02:00
Javier Segarra aa007117a7 Merge branch 'dev' into 7311_boilerplate_users 2024-05-18 10:16:28 +02:00
Carlos Satorres cd21d7817d refs #7396 fix summary basicData 2024-05-17 14:16:06 +02:00
Alex Moreno d00801b066 feat: refs #6825 VnComponent mix component and attrs Form to create new row 2024-05-17 13:00:57 +02:00
Jorge Penadés 31573c0f0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7274-fixCustomer 2024-05-15 11:22:23 +02:00
Jorge Penadés a6c761c031 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1 2024-05-14 13:42:38 +02:00
Javier Segarra fc6bd82ea0 Merge branch 'dev' into feature/ZoneCreate 2024-05-14 11:52:29 +02:00
Javier Segarra 32e715ce6b Merge branch 'dev' into feature/Monitors 2024-05-13 17:59:39 +02:00
William Buezas 8e7b043a46 Resolve conflicts 2024-05-13 10:28:21 -03:00
Jorge Penadés 0b83d3663f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker 2024-05-13 13:20:15 +02:00