0
0
Fork 0
Commit Graph

3998 Commits

Author SHA1 Message Date
Carlos Satorres dbdcc7cdf1 Merge pull request 'refs #6905 fix bank select' (!322) from 6905-fixUserPanel into dev
Reviewed-on: verdnatura/salix-front#322
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-26 06:56:50 +00:00
Carlos Satorres 1d9f4e30af Merge branch 'dev' into 6905-fixUserPanel 2024-04-26 06:54:39 +00:00
Javier Segarra 7f4155cde9 fix: replace VnSelectFilter by VnSelect 2024-04-26 08:54:26 +02:00
Javier Segarra 22d9d369c8 Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical 2024-04-26 08:52:05 +02:00
Javier Segarra b3be7c8bc3 Merge pull request 'Item log' (!323) from hyervoni/salix-front-mindshore:feature/ItemLog into dev
Reviewed-on: verdnatura/salix-front#323
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-04-26 06:37:22 +00:00
Carlos Satorres 7fd053b842 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-fixUserPanel 2024-04-26 08:36:15 +02:00
Javier Segarra aa87d54f57 Merge remote-tracking branch 'origin/dev' into feature/ItemLog 2024-04-26 08:34:05 +02:00
Pablo Natek faa6d0e4fa feat: setup commit 2024-04-26 08:33:41 +02:00
Carlos Satorres fc275d9274 refs #6976 remove logs 2024-04-26 08:29:34 +02:00
Pablo Natek d7bebfecb1 fix: fix translates 2024-04-26 08:28:42 +02:00
Javier Segarra 22478bed48 Merge pull request 'Item requests' (!297) from hyervoni/salix-front-mindshore:feature/ItemRequests into dev
Reviewed-on: verdnatura/salix-front#297
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-26 06:22:11 +00:00
Jon Elias c56b6b2dbc refactor: better syntax 2024-04-26 08:22:08 +02:00
Javier Segarra 3116bf0944 Merge branch 'dev' into feature/ItemRequests 2024-04-26 06:21:36 +00:00
Javier Segarra 22356966e1 Merge pull request 'Customer Fix: minor bugs, layout & vnlocation' (!325) from 6590_fix_CustomerAdressEdit into test
Reviewed-on: verdnatura/salix-front#325
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-26 06:00:41 +00:00
Jon Elias 443f4a4443 refactor: refs #7239 changed spanish translations 2024-04-26 07:49:28 +02:00
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
Javier Segarra 6e5ac0eeb9 fix: CustomerAdress layout 2024-04-25 14:44:32 +02:00
Javier Segarra f14d631051 feat #7271 ZoneDescriptor 2024-04-25 14:32:42 +02:00
Javier Segarra b1871c33fd feat #7271 Zone Components boilerplate 2024-04-25 14:30:16 +02:00
Javier Segarra b4e3157887 feat #7271 i18n 2024-04-25 14:28:06 +02:00
Javier Segarra 42591d0781 feat #7271 router 2024-04-25 14:27:56 +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
Robert Ferrús 92e172fcaf feat: refs #7039 country change column country - name 2024-04-25 12:56:02 +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
Javier Segarra ccc6885172 Fix: minor bugs, layout & vnlocation 2024-04-25 04:41:44 +00: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