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

10073 Commits

Author SHA1 Message Date
Javier Segarra 4a2074dc9d Merge pull request '6321_negative_tickets' (!1371) from 6321_negative_tickets into dev 
Reviewed-on: verdnatura/salix-front#1371
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-02-11 09:04:30 +00:00
Javier Segarra 3a95e22f67 Merge branch 'dev' into 6321_negative_tickets 2025-02-11 08:51:33 +00:00
Jose Antonio Tubau 54585691c3 Merge pull request '#7411 - addInfoOnVnCheckboxAndVnInput' (!1295) from 7411-addInfoOnVnCheckboxAndVnInput into dev 
Reviewed-on: verdnatura/salix-front#1295
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-11 08:50:09 +00:00
Javier Segarra 4bd9e69bf1 Merge branch 'dev' into 6321_negative_tickets 2025-02-11 08:43:22 +00:00
Alex Moreno c975943eb1 Merge branch 'dev' into 7411-addInfoOnVnCheckboxAndVnInput 2025-02-11 08:38:51 +00:00
Jon Elias f6c5891e0b Merge pull request 'Fix[InvoiceInBasicData]: fixed basic data e2e' (!1361) from Fix-InvoiceInBasicDataE2E into dev 
Reviewed-on: verdnatura/salix-front#1361
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-02-11 07:14:48 +00:00
Jon Elias 94f1b2d709 Merge branch 'dev' into Fix-InvoiceInBasicDataE2E 2025-02-11 06:49:57 +00:00
Javier Segarra d4212e6e07 Merge pull request 'fix_customerConsumption_filter' (!1357) from fix_customerConsumption_filter into dev 
Reviewed-on: verdnatura/salix-front#1357
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-10 12:40:47 +00:00
Javier Segarra b2a50e23bf Merge branch 'dev' into fix_customerConsumption_filter 2025-02-10 12:39:54 +00:00
Alex Moreno 5e167876a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-10 13:31:09 +01:00
Alex Moreno 8d209c9415 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-10 13:30:57 +01:00
Jon Elias c0e03bd467 Merge branch 'Fix-InvoiceInBasicDataE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-InvoiceInBasicDataE2E 2025-02-10 13:19:01 +01:00
Jon Elias 73f02cf8bd refactor: use data-cy in VnSelectSupplier component and refactored e2e 2025-02-10 13:18:59 +01:00
Jon Elias a3c3a60e98 Merge branch 'dev' into Fix-InvoiceInBasicDataE2E 2025-02-10 11:46:20 +00:00
Jon Elias aa6c6f0e69 refactor: requested changes 2025-02-10 12:44:35 +01:00
Javier Segarra cdf600cbd0 fix: replace i18n 2025-02-10 11:04:42 +01:00
Alex Moreno 0a40dd598e fix: cardDescriptor use userFilter 2025-02-10 10:21:38 +01:00
Jon Elias 8c499e3fc3 fix: fixed basic data e2e 2025-02-10 10:20:40 +01:00
Jose Antonio Tubau 18da0e9922 refactor: refs #7411 bind event listeners to QCheckbox in VnCheckbox component 2025-02-10 09:42:34 +01:00
Javier Segarra cc21b74626 Merge branch 'dev' into fix_customerConsumption_filter 2025-02-10 09:31:02 +01:00
Jon Elias 0e1f04323c Merge pull request 'Fix[OrderCatalogItemDialog]: Fixed add item to order' (!1359) from Fix-OrderCatalogAddToOrder into dev 
Reviewed-on: verdnatura/salix-front#1359
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-10 08:08:59 +00:00
Jon Elias 585bb9973e Merge branch 'dev' into Fix-OrderCatalogAddToOrder 2025-02-10 07:57:03 +00:00
Jon Elias 311eab363a Merge pull request '#8246 modified addressFk field to use dashIfEmpty filter' (!1208) from 8246-ZoneAddressFk2 into dev 
Reviewed-on: verdnatura/salix-front#1208
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-10 07:55:54 +00:00
Jon Elias a287844860 Merge branch 'dev' into 8246-ZoneAddressFk2 2025-02-10 07:54:53 +00:00
Jon Elias 73dfce4104 fix: fixed OrderCatalog add item to order 2025-02-10 08:51:51 +01:00
Jose Antonio Tubau b2f011e7cc Merge pull request 'fix: refs #7318 fixed claim summary warnings' (!1347) from 7318-claimSummaryFixWarnings into dev 
Reviewed-on: verdnatura/salix-front#1347
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-02-10 07:17:48 +00:00
Jose Antonio Tubau b95d8f3b44 Merge branch 'dev' into 7318-claimSummaryFixWarnings 2025-02-10 07:16:40 +00:00
Jorge Penadés dc3c800342 Merge pull request 'fix: refs #6919 include entityId in descriptor filter' (!1358) from 6919-fixFilters into dev 
Reviewed-on: verdnatura/salix-front#1358
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-09 12:24:03 +00:00
Jorge Penadés 1948ee9c52 fix: refs #6919 include entityId in descriptor filter 2025-02-09 10:16:48 +01:00
Javier Segarra 40569b1ede fix: refs #6321 ticket locale en 2025-02-08 16:39:25 +01:00
Javier Segarra ca6cfb4c5e Merge branch 'fix_customerConsumption_filter' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_customerConsumption_filter 2025-02-07 23:42:39 +01:00
Javier Segarra b3fd818b13 feat: improves 2025-02-07 23:42:17 +01:00
Javier Segarra ce17e124a0 Merge branch 'dev' into fix_customerConsumption_filter 2025-02-07 22:23:58 +00:00
Javier Segarra 55719fbce7 style: remove comments 2025-02-07 23:02:45 +01:00
Javier Segarra 9dc22b39e2 feat: add more filters 2025-02-07 23:02:17 +01:00
Javier Segarra 63af730838 Merge branch 'dev' into 6321_negative_tickets 2025-02-07 21:42:21 +00:00
Carlos Satorres f8b41101d3 Merge pull request 'fix: improve method into dev' (!1356) from fix_reload_icon into dev 
Reviewed-on: verdnatura/salix-front#1356
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-02-07 14:19:32 +00:00
Javier Segarra d060e88ebb fix: improve method into dev 
Reviewed-on: verdnatura/salix-front#1354
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-02-07 14:15:28 +00:00
Javier Segarra a4179eeb0a Merge pull request 'WARMFIX: improve method' (!1354) from warmfix_reload_scriptIsMissing into test 
Reviewed-on: verdnatura/salix-front#1354
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-02-07 14:13:39 +00:00
Jorge Penadés b75578b6fb Merge pull request '#8388 fixInvoiceIn' (!1321) from 8388-fixInvoiceIn into dev 
Reviewed-on: verdnatura/salix-front#1321
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-07 13:51:46 +00:00
Jorge Penadés 8380808ffa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn 2025-02-07 14:49:43 +01:00
Javier Segarra 2a3e807460 fix: improve method 2025-02-07 13:38:06 +00:00
Jon Elias b1f0cc7f1d Merge pull request 'Fix[ItemFixedPrice]: Fixed item name filter' (!1351) from Fix-ItemFixedPriceNameFilter into dev 
Reviewed-on: verdnatura/salix-front#1351
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-07 12:44:37 +00:00
Jon Elias 94849d0cdf Merge branch 'dev' into Fix-ItemFixedPriceNameFilter 2025-02-07 12:43:23 +00:00
Jon Elias 0692de7bfb fix: fixed item name filter 2025-02-07 13:41:34 +01:00
Alex Moreno 2d65811360 Merge branch 'dev' into 8246-ZoneAddressFk2 2025-02-07 12:04:55 +00:00
Jorge Penadés f01e5b824e fix: refs #8388 adjust table cell properties and remove unused styles in InvoiceInVat.vue 2025-02-07 10:41:42 +01:00
Jorge Penadés d9897b3ea2 Merge branch 'dev' of https: refs #8388//gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn 2025-02-07 10:05:30 +01:00
Jorge Penadés de6020626f Merge pull request 'feat: refs #7119 show country name' (!1346) from 7119-showCountryName into dev 
Reviewed-on: verdnatura/salix-front#1346
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-07 09:03:52 +00:00
Jorge Penadés 05f6e1ec20 Merge branch '7119-showCountryName' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-showCountryName 2025-02-07 10:02:46 +01:00