wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
3,347 Commits 154 Branches 0 Tags 22 MiB
Commit Graph

397 Commits

Author SHA1 Message Date
Carlos Satorres ef52c9b0c0 refs #7406 routes trad 2024-05-27 10:42:47 +02:00
Javier Segarra c40f322a8f Merge branch 'dev' into feature/ZoneWarehouses 2024-05-20 08:40:27 +02:00
William Buezas e196cf8fd5 Zone warehouses 2024-05-17 10:57:20 -03:00
Javier Segarra 01ad6d9bea Merge branch 'dev' into feature/ZoneDelivery 2024-05-17 09:52:21 +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
Alex Moreno 2b27e39d72 fix: zone icon and isVolumetric default false 2024-05-15 09:37:33 +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 20f9b53afb Merge branch 'dev' into 7271-EndZoneMigration 2024-05-14 10:42:43 +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
William Buezas 9304b511bc Zone delivery 2024-05-13 10:14:36 -03:00
Javier Segarra 1181cd0daa Merge branch 'dev' into 7271-EndZoneMigration 2024-05-13 12:15:50 +00: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
Jon Elias 14910c5899 feat: refs #7271 basicData and Log 2024-05-13 12:46:25 +02:00
William Buezas d227d4b09b Zone create 2024-05-09 11:32:04 -03:00
William Buezas 9b9e482fa7 Zone list and Zone summary 2024-05-09 08:21:30 -03:00
William Buezas a3ce81d66d Zone list 2024-05-08 15:23:52 -03:00
William Buezas 712d7e13ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/Monitors 2024-05-08 10:45:05 -03:00
William Buezas 5bdbbf426a Tables development 2024-05-08 10:43:18 -03:00
Jorge Penadés a1f785ccbe feat: refs #5919 WIP workerlocker 2024-05-08 11:02:40 +02:00
Alex Moreno d69b362407 Merge branch 'dev' into feature/ItemTags 2024-05-08 08:02:55 +00:00
Alex Moreno a139c11a22 Merge branch 'test' into fix_Customer_1 2024-05-07 07:05:25 +00:00
William Buezas dbc9e9dd71 Sales monitor base 2024-05-05 19:13:36 -03:00
William Buezas 99adc9aa05 WIP 2024-05-03 08:53:50 -03:00
William Buezas d2e178a41b resolve conflicts 2024-05-02 12:02:44 -03:00
Javier Segarra 9fa03beda1 Merge branch 'dev' into 6887-endClaimMigration 2024-05-02 12:44:02 +00:00
Javier Segarra 03759d2746 Merge branch 'dev' into feature/ItemLastEntries 2024-05-02 14:34:54 +02:00
Javier Segarra 1675919801 fix: minor build bugs 2024-05-02 14:33:24 +02:00
Jon Elias c1a464d9ae fix: refs #6887 fix conflicts 2024-05-02 13:02:59 +02:00
Javier Segarra 494f0be44a Merge branch 'dev' into feature/ItemDiary 2024-05-02 08:13:41 +00:00
Javier Segarra 94fc856bea Merge branch 'dev' into feature/ItemDiary 2024-05-02 08:05:17 +00:00
Javier Segarra b530101cda Merge branch 'dev' into 7190_renewTokenMultimedia 2024-05-02 07:44:20 +00:00
Javier Segarra 4ef7b0e17c fix: item routes order 2024-05-01 13:31:32 +02:00
Javier Segarra d2531efdd6 fix: Botanical icon 2024-05-01 13:27:40 +02:00
William Buezas ac219bfbb7 Item shelvings 2024-04-30 16:15:48 -03:00
Jon Elias d5762f65b3 refactor: refs #6887 fixed errors 2024-04-30 10:34:48 +02:00
Jon Elias 5b15558dbf refactor: refs #6887 fixed errors 2024-04-30 10:32:32 +02:00
William Buezas ac9063e166 Item Last entries 2024-04-29 17:01:26 -03:00
Javier Segarra 761bc7724f fix: redirect 2024-04-29 11:46:40 +02:00
Javier Segarra 19fcacebc9 perf: VnSearchbar 2024-04-29 10:12:19 +02:00
William Buezas 322ad816b9 item diary 2024-04-28 19:37:44 -03:00
Javier Segarra 2deeada1f5 Merge remote-tracking branch 'origin/dev' into fix_Customer_1 2024-04-26 12:50:46 +02:00
Javier Segarra 93bbd0c222 fix: icons 2024-04-26 10:48:25 +02:00
Javier Segarra 33f3024246 Merge branch 'dev' into 7190_renewTokenMultimedia 2024-04-26 07:47:24 +00:00
Javier Segarra 98846bbd1a Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical 2024-04-26 09:28:40 +02:00
Pablo Natek cb22eaee4d Merge branch 'dev' into 4988-agencySection 2024-04-26 06:58:53 +00:00
Javier Segarra 22d9d369c8 Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical 2024-04-26 08:52:05 +02:00
Javier Segarra aa87d54f57 Merge remote-tracking branch 'origin/dev' into feature/ItemLog 2024-04-26 08:34:05 +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