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

4845 Commits

Author SHA1 Message Date
Jon Elias 954a6ff6c0 refacotr: refs #7553 refactor sales, purchaseRequest and saleTracking 2024-08-02 13:55:51 +02:00
Jon Elias 3330e43e25 Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-07-26 12:01:48 +02:00
Jon Elias 61f1eae282 fix: deleted branch cloned wrongly 2024-07-26 12:01:46 +02:00
Jon Elias 7c5f5aee77 Merge branch 'dev' into 7553_FixTicketExpedition 2024-07-26 09:25:37 +00:00
Jon Elias 1dace39882 refactor: refs #7553 changed isScanned field & fixed cardDescriptor warning 2024-07-26 11:24:40 +02:00
Pablo Natek 0fee90d371 Merge pull request '7401-add-option-on-descriptor-menu' (!569) from 7401-add-option-on-descriptor-menu into dev 
Reviewed-on: verdnatura/salix-front#569
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-26 08:34:48 +00:00
Jon Elias 2ab7d48b0c feat: refs #7553 added VnTable in Expedition, new field & minor changes in rest of section 2024-07-26 09:55:24 +02:00
Pablo Natek 81463cf129 Merge branch 'dev' into 7401-add-option-on-descriptor-menu 2024-07-26 07:46:32 +00:00
Pablo Natek 2d8eecca1c fix: refs #7401 fix routeForm 2024-07-26 09:46:00 +02:00
Pablo Natek ed60793381 fix: refs #7401 remove console.log 2024-07-26 09:42:53 +02:00
Pablo Natek eae2144e1d feat: refs #7401 add menu options 2024-07-26 09:41:47 +02:00
Alex Moreno a96693f94c Merge pull request 'warmFix: rollback VnRow' (!568) from warmFix_rollback_VnRow into dev 
Reviewed-on: verdnatura/salix-front#568
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-07-26 07:33:19 +00:00
Alex Moreno c5927f14c3 warmFix: rollback VnRow 2024-07-26 09:27:38 +02:00
Javier Segarra 2245552dfa Merge pull request 'Ticket expedition fix' (!567) from hyervoni/salix-front-mindshore:bugfix/TicketExpeditionFix into dev 
Reviewed-on: verdnatura/salix-front#567
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-26 05:39:12 +00:00
William Buezas 7432396cea Ticket expedition initial load fix 2024-07-25 13:55:41 -03:00
Carlos Satorres fdec25dc88 Merge pull request 'refs #6898 fix' (!562) from fix-supplierMigration into dev 
Reviewed-on: verdnatura/salix-front#562
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-24 09:38:01 +00:00
Carlos Satorres 2e56100623 refs #6898 fix 2024-07-24 11:36:00 +02:00
Alex Moreno 8d59fc95e7 Merge pull request '#6943 fix Customer' (!526) from 6943-fixCustomer into dev 
Reviewed-on: verdnatura/salix-front#526
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-24 05:53:37 +00:00
Alex Moreno 4d8ba2bca0 Merge branch 'dev' into 6943-fixCustomer 2024-07-24 05:52:29 +00:00
Jon Elias 19fa5a294d Merge pull request '#7014 refactor <module>Main.vue' (!476) from 7014-RefactorQDrawer into dev 
Reviewed-on: verdnatura/salix-front#476
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-24 05:17:13 +00:00
Javier Segarra 6c7509856e Merge branch 'dev' into 7014-RefactorQDrawer 2024-07-23 21:08:56 +00:00
Javier Segarra 2c0b215023 Merge branch 'dev' into 6943-fixCustomer 2024-07-23 18:44:08 +00:00
Alex Moreno e6709db3a2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-23 14:46:44 +02:00
Alex Moreno 38437aa2f9 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-07-23 14:46:27 +02:00
Alex Moreno db3813ccf0 warmFix: orderBy tableActions false 2024-07-23 14:46:05 +02:00
Alex Moreno eb90fe359f fix: customer defaulter add amount order 2024-07-23 14:03:45 +02:00
Alex Moreno 0cd42e6fac Merge branch 'dev' into 6943-fixCustomer 2024-07-23 09:47:01 +00:00
Jon Elias 7ce05406cc fix: refs #7014 fix tests 2024-07-23 10:55:30 +02:00
Jon Elias 67275e435e refactor: refs #7014 refactor ZoneCard, deleted ZoneMain & created basic tests for functionality 2024-07-23 10:38:45 +02:00
Alex Moreno 451619fb88 hotFix(VnTable): add ctrl + click 2024-07-23 10:09:42 +02:00
Alex Moreno ad87fd8311 hotfix(entry_latest-buys): refs #6897 img 2024-07-23 09:36:23 +02:00
Jon Elias e76d8bf269 fix: fix conflicts 2024-07-23 09:15:06 +02:00
Jon Elias a3256c7dc8 Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer 2024-07-23 09:14:53 +02:00
Alex Moreno ca9425cfb7 hotfix(entry_latest-buys): refs #6897 img 2024-07-23 09:14:22 +02:00
Jon Elias 18dac38fb2 Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer 2024-07-23 09:14:14 +02:00
Jon Elias 33ad8fcb9d refactor: refs #7014 improved route.js & deleted RouteMain 2024-07-23 09:12:00 +02:00
Alex Moreno c7d54668e6 hotfix(entry_latest-buys): refs #6897 redirect to entry 2024-07-23 08:45:54 +02:00
Alex Moreno 53d59ee75c Merge pull request '7773-testToMaster_2430' (!561) from 7773-testToMaster_2430 into master 
Reviewed-on: verdnatura/salix-front#561
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-07-23 06:24:04 +00:00
Jon Elias 92b053013f Merge branch 'dev' into 7014-RefactorQDrawer 2024-07-23 06:18:17 +00:00
Pablo Natek a421c96e85 Merge pull request '#7129 - fixFilters' (!559) from 7129-fixFilters into test 
Reviewed-on: verdnatura/salix-front#559
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-22 16:00:14 +00:00
Pablo Natek 1a091e5b5a Merge branch '7129-fixFilters' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixFilters 2024-07-22 17:50:59 +02:00
Pablo Natek 3ceb0771a7 fix: refs #7129 remove templates 2024-07-22 17:50:58 +02:00
Pablo Natek f2b56c92c6 Merge branch 'test' into 7129-fixFilters 2024-07-22 15:37:35 +00:00
Pablo Natek 5f0c4fea3c feat: refs #7129 add e2e 2024-07-22 13:19:41 +02:00
Pablo Natek 6f959ff99c fix: refs #7129 fix filters 2024-07-22 09:18:53 +02:00
Pablo Natek af6a20729b fix: refs #7129 fixFilters 2024-07-22 09:12:56 +02:00
Guillermo Bonet 0a431ef5cb Merge branch 'test' into dev 2024-07-22 08:20:16 +02:00
Guillermo Bonet 580777af65 Deleted repeated labeler i18n 2024-07-22 08:20:08 +02:00
Guillermo Bonet 76517d102d Merge branch 'test' into dev 2024-07-19 13:09:19 +02:00
Guillermo Bonet c5903e29e8 Merge branch 'master' into test 2024-07-19 13:08:41 +02:00