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

2895 Commits

Author SHA1 Message Date
Javier Casado 433ca7c456 Merge pull request 'refs #6697 fix claimQuantity' (!317) from 6697-changeClaimQuantity into dev 
Reviewed-on: verdnatura/salix-front#317
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-26 05:33:40 +00:00
Javier Casado 6d5e0484cd Merge branch 'dev' into 6697-changeClaimQuantity 2024-04-26 05:32:32 +00:00
Javier Casado f76f3cae7e Merge pull request 'refs: #6764 rename VnSelectFilter' (!320) from 6764-rename-VnSelectFilter into dev 
Reviewed-on: verdnatura/salix-front#320
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-26 05:28:01 +00:00
Pablo Natek fff9ec4184 fix: e2e test 2024-04-25 17:17:28 +02:00
Pablo Natek 436f24b674 fix: translates 2024-04-25 17:11:30 +02:00
Pablo Natek f29f7a55a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection 2024-04-25 16:28:30 +02:00
Pablo Natek 5544676a1b fix: mistakes like console.log an disables 2024-04-25 16:18:06 +02:00
William Buezas 823351f76d Item botanical 2024-04-25 10:55:48 -03:00
Javier Segarra e5eb3010a3 fix: Change method because X updates row 2024-04-25 15:31:14 +02:00
Javier Segarra fb4170d83d fix Double request when update row 2024-04-25 15:25:20 +02:00
Alex Moreno 08a40e13f9 Merge branch 'dev' into 6764-rename-VnSelectFilter 2024-04-25 12:10:32 +00:00
Javier Segarra 166d678d0b Merge branch 'dev' into feature/ItemRequests 2024-04-25 12:05:09 +00:00
jcasado 7875df4b02 refs #6697 fix tfront 2024-04-25 14:03:00 +02:00
Alex Moreno da89f4d731 Merge pull request 'Items summary' (!281) from hyervoni/salix-front-mindshore:feature/ItemsSummary into dev 
Reviewed-on: verdnatura/salix-front#281
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-25 12:01:08 +00:00
Pablo Natek f2d0d3f3ff fix: remove test from vitest 2024-04-25 13:09:54 +02:00
Pablo Natek a3ba68e865 fix: test 2024-04-25 13:04:50 +02:00
Pablo Natek 914c3fb169 fix: test and console log 2024-04-25 12:40:17 +02:00
Pablo Natek d490d85ecc feat: agencyWorkCenter 2024-04-25 12:34:19 +02:00
Pablo Natek e184f70be5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection 2024-04-25 09:59:17 +02:00
Pablo Natek 897ddc44fe fix: search bar 2024-04-25 09:57:04 +02:00
jcasado 13d38c8b02 refactor: refs #6764 fix conflicts 2024-04-25 09:02:24 +02:00
Javier Segarra 68dba82763 Merge branch 'dev' into feature/ItemListFilter 2024-04-25 08:54:24 +02:00
jcasado c6c925a105 refs: #6764 fixConflicts 2024-04-25 08:50:12 +02:00
jcasado 4b3df372cd refs: #6764 fixConflicts 2024-04-25 08:49:40 +02:00
jcasado aa58838ad7 refs: #6764 rename VnSelect 2024-04-25 08:34:40 +02:00
William Buezas 969087a347 Remove unused things 2024-04-24 17:48:47 -03:00
William Buezas 84a9dc8319 Fix ItemDescriptor labels 2024-04-24 17:30:53 -03:00
William Buezas a6ebe9cf19 Item barcode 2024-04-24 12:54:38 -03:00
William Buezas 726699bbc5 Item log 2024-04-24 10:38:00 -03:00
Javier Segarra e1f50f5daf fix: minorchanges 2024-04-24 15:05:10 +02:00
Javier Segarra dcb06918dd Merge remote-tracking branch 'mindshore/feature/ItemRequests' into feature/ItemFamily 2024-04-24 14:35:20 +02:00
Javier Segarra e6c9a692f5 feat moduleName 2024-04-24 14:33:10 +02:00
Javier Segarra 51b432dfd0 fix icon 2024-04-24 14:28:20 +02:00
Javier Segarra e65ffb63c9 Merge remote-tracking branch 'mindshore/feature/ItemsSummary' into feature/ItemRequests 2024-04-24 14:26:12 +02:00
Javier Segarra 299838bfa5 Merge branch 'dev' into feature/ItemsSummary 2024-04-24 14:23:49 +02:00
Javier Segarra f4eb14f487 feat: i18n Clone 2024-04-24 14:22:14 +02:00
Carlos Satorres 6961a048e5 refs #6905 fix bank select 2024-04-24 13:29:32 +02:00
Carlos Satorres 391ca36764 fix conflicts 2024-04-24 12:47:56 +02:00
jcasado c9ab98471e refs #6697 fix changes 2024-04-24 12:01:55 +02:00
jcasado 5103b5b365 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6697-changeClaimQuantity 2024-04-24 12:01:15 +02:00
jcasado 6391ed1360 refs #6697 changes claim 2024-04-24 11:26:32 +02:00
Javier Segarra 331484dbc7 Merge pull request 'Item Fixed prices' (!307) from hyervoni/salix-front-mindshore:feature/FixedPrices into dev 
Reviewed-on: verdnatura/salix-front#307
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-04-24 07:39:22 +00:00
Javier Segarra 8bb3d48c81 Merge branch 'dev' into feature/FixedPrices 2024-04-24 07:37:39 +00:00
Jon Elias bda232f1c3 Merge pull request 'refactor: refs #6899 corrected Lilium styles and functionalities' (!304) from 6899-endInvoiceOutMigration into dev 
Reviewed-on: verdnatura/salix-front#304
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-24 07:36:51 +00:00
Javier Segarra de91364ee8 Merge remote-tracking branch 'origin/dev' into feature/FixedPrices 2024-04-24 09:33:34 +02:00
Jon Elias 39685c222f refactor: refs #6899 fixed css and minor changes 2024-04-24 09:14:35 +02:00
Jon Elias ca3b280dcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899-endInvoiceOutMigration 2024-04-24 09:06:24 +02:00
Jorge Penadés 77798cbae4 Merge pull request '#6480 improve Card' (!271) from 6480-improveCard into dev 
Reviewed-on: verdnatura/salix-front#271
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-24 06:57:38 +00:00
Jorge Penadés d93963e2c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-24 08:48:43 +02:00
Alex Moreno 1206cc2292 warmFix: duplicated button after merge min 2024-04-24 08:11:33 +02:00