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

93 Commits

Author SHA1 Message Date
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
Alex Moreno bbf847e1a0 feat(url): sepate filters 2024-06-10 09:19:42 +02:00
Javier Segarra ec5d5e52f4 Merge branch 'dev' into feature/ZoneCalendar 2024-06-07 09:32:51 +02:00
William Buezas 9b3135fd97 WIP 2024-05-24 08:18:38 -03:00
William Buezas 790e69f659 WIP 2024-05-22 08:08:43 -03:00
Javier Segarra aa007117a7 Merge branch 'dev' into 7311_boilerplate_users 2024-05-18 10:16:28 +02:00
Javier Segarra 01ad6d9bea Merge branch 'dev' into feature/ZoneDelivery 2024-05-17 09:52:21 +02:00
William Buezas 9304b511bc Zone delivery 2024-05-13 10:14:36 -03:00
Javier Segarra 01bedb94d0 feat #7311: enable leftmenu option 2024-05-09 07:54:16 +02:00
William Buezas dbc9e9dd71 Sales monitor base 2024-05-05 19:13:36 -03:00
Jon Elias 5b15558dbf refactor: refs #6887 fixed errors 2024-04-30 10:32:32 +02:00
William Buezas e36949ad07 resolve conflicts 2024-04-16 10:11:03 -03:00
William Buezas f2dc50d229 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into WorkerCalendar 2024-04-12 08:13:58 -03:00
William Buezas 4da540fc9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-08 08:47:56 -03:00
William Buezas bfee37b631 WIP 2024-04-03 08:08:54 -03:00
William Buezas 772959ff81 Improve getLocales code 2024-04-02 09:13:12 -03:00
William Buezas f1faf18523 General improvements 2024-03-22 14:10:00 -03:00
William Buezas d20828ac7c remove console.logs 2024-03-21 13:15:11 -03:00
William Buezas 65da9a3e69 resolve conflicts 2024-03-21 08:53:42 -03:00
William Buezas 6baaebf6bd WIP 2024-03-14 09:48:04 -03:00
William Buezas 09582ab6a8 WIP 2024-03-13 09:05:23 -03:00
William Buezas 859c87940d Several changes 2024-03-06 08:15:50 -03:00
William Buezas 2f08b64215 merge with dev 2024-02-15 09:20:28 -03:00
William Buezas df620566ef Invoice out globals corrections 2024-02-12 08:11:44 -03:00
Kevin Martinez 15f7f85734 Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154 
# Conflicts:
#	src/components/ui/VnSearchbar.vue
#	src/pages/Route/RouteList.vue
 2024-02-07 22:38:57 -03:00
William Buezas 2bbd93748f merge with dev 2024-01-31 11:31:06 -03:00
William Buezas e9fe4a3cb9 improvement 2024-01-27 12:14:50 -03:00
William Buezas a01b80703e Create child submodules feature 2024-01-27 12:08:56 -03:00
William Buezas 4fae8e633b Create items module base structure, item descriptor and add it to supplier consumption 2024-01-26 16:36:27 -03:00
Alex Moreno b3fc865c18 refs #6718 fix: useArrayDataStore 2024-01-18 15:45:44 +01:00
Javier Segarra a94fb6026a refs #6704: remove bad code 2024-01-16 12:14:48 +01:00
Javier Segarra b58f9bee2e refs #6704: fix bug 2024-01-16 11:24:28 +01:00
Javier Segarra 9daffdfa22 refs #6704: posible fix 2024-01-16 08:40:03 +01:00
Alex Moreno c362b31fb8 refs #6595 fix: VnSelectFilter fix: invoiceIn 2024-01-11 12:05:29 +01:00
Alex Moreno 9d3c427579 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into hyervoni-branch-PR-2 2024-01-09 07:47:55 +01:00
Alex Moreno 5994b4e08e Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into hyervoni-branch-PR-2 2024-01-03 14:16:26 +01:00
Carlos Satorres 92127b766b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6618-vnSubToolBar 2024-01-03 13:00:25 +01:00
Carlos Satorres 3acc4b0d58 vn qtoolbar 2024-01-03 09:59:27 +01:00
Jorge Penadés 34e71c1900 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary 2024-01-02 12:48:03 +01:00
Jorge Penadés 9b069fbddd add filter: refs #6606 2024-01-02 11:38:43 +01:00
William Buezas 113df44705 create entries basic structure and add create entry and clone travel with entries feature to travel list and travel summary 2023-12-29 16:54:35 -03:00
Kevin Martinez bcfb34475b Merge branch 'dev' into feature/order 2023-12-20 13:58:51 -04:00
Jorge Penadés f3a1800cb0 fix breadcrumbs & header: refs #5835 2023-12-20 15:43:09 +01:00
William Buezas 40c0edfeb3 Eliminar invoiceOut.service y delegar integraciones al store 2023-12-18 17:17:12 -03:00
Kevin Martinez c0f6906119 Merge branch 'dev' into feature/order 
# Conflicts:
#	src/i18n/en/index.js
#	src/router/modules/index.js
 2023-12-14 07:08:58 -04:00
Alex Moreno 7557096af6 refs #6062 fix: migration errors 2023-12-13 14:19:42 +01:00
Kevin Martinez 9a477c2c25 Create order page 2023-12-11 10:47:16 -04:00
Jorge Penadés 61955268f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-12-11 12:36:07 +01:00
Jorge Penadés 479c782492 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6104-changeVnLog 2023-12-07 16:25:13 +01:00
William Buezas e64960d234 Extra community 2023-12-05 12:25:25 -03:00