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

6439 Commits

Author SHA1 Message Date
Guillermo Bonet 86ab161302 fix: refs #6769 Fixes item diary 2024-07-26 12:37:53 +02:00
Alex Moreno 21b642a7c5 typo 2024-07-26 12:15:57 +02:00
Carlos Satorres 5d42a2128e Merge pull request 'refs #6898 filters' (!572) from hotfix-supplierMigration3 into master 
Reviewed-on: verdnatura/salix-front#572
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-26 10:14:33 +00: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
Carlos Satorres f4c0288ca0 refs #6898 filters sortby 2024-07-26 12:01:46 +02:00
Jon Elias 61f1eae282 fix: deleted branch cloned wrongly 2024-07-26 12:01:46 +02:00
Carlos Satorres 1ad15869e8 refs #6898 filters select 2024-07-26 11:45:13 +02:00
Carlos Satorres d575c3cdae refs #6898 filters 2024-07-26 11:25:44 +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
Alex Moreno 28e50512ba remove console.log 2024-07-26 09:51:46 +02:00
Alex Moreno 21dd2e4b46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-customer_migration_subsection 2024-07-26 09:49:22 +02:00
Alex Moreno 026c632a4c feat(customer): improve basicData to balance 2024-07-26 09:47:28 +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
Carlos Satorres 2f617f4b92 passwordAccount 2024-07-26 09:09:38 +02:00
Javier Segarra 1923e83210 Merge pull request '#7648 - HOTFIX: myEntries filters' (!566) from hotfix_myEntries into master 
Reviewed-on: verdnatura/salix-front#566
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-26 05:50:35 +00:00
Javier Segarra 662ffeac0a fix: minor changes 2024-07-26 07:44:46 +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
Javier Segarra a27ac46f9f fix: disable firstInput.focus 2024-07-26 06:21:39 +02:00
William Buezas 7432396cea Ticket expedition initial load fix 2024-07-25 13:55:41 -03:00
Javier Segarra 1a9cdee838 fix: remove columnFilter 2024-07-25 15:12:15 +02:00
Javier Segarra 6bba14cac9 test: e2e fixed 2024-07-25 14:31:31 +02:00
Carlos Satorres 8b2b618d35 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration 2024-07-25 12:42:34 +02:00
Javier Segarra ebbe6ef3b1 feat: add customfilter label 2024-07-25 12:36:16 +02:00
Javier Segarra 60708f4a6c feat: improve qFormMixin in production environment 2024-07-25 12:36:04 +02:00
Javier Segarra aef83b7e9a feat: modify myentries filters 2024-07-25 12:35:47 +02:00
Jon Elias 2de11d3ecf Merge branch 'dev' into 7717_fixOrderCatalog 2024-07-25 08:07:26 +00:00
Jon Elias fee7743b6e Merge branch 'dev' into 7500_ChangeEntryDms 2024-07-25 08:05:32 +00:00
Jon Elias 4188569908 feat: refs #7500 added VnImg to show files 2024-07-25 10:03:20 +02:00
Alex Moreno 454c229f13 hotFix: try to fix myEntries 2024-07-25 09:53:59 +02:00
Alex Moreno 687262e78c hotFix: try to fix myEntries 2024-07-25 09:50:30 +02:00
Jon Elias 8ceee6f182 fix: fix conflicts 2024-07-25 07:06:27 +02:00
Alex Moreno f0be377951 hotFix: try to fix myEntries 2024-07-24 20:52:14 +02:00
Alex Moreno 3dd6bf8802 hotFix: try to fix myEntries 2024-07-24 20:48:05 +02:00
Alex Moreno f18bc80c0b hotFix: try to fix myEntries 2024-07-24 20:44:55 +02:00
Alex Moreno 80f34edb66 hotFix: try to fix myEntries 2024-07-24 20:41:34 +02:00
Alex Moreno 38de6867b7 hotFix: try to fix myEntries 2024-07-24 20:38:25 +02:00
Alex Moreno e3204e0ce3 hotFix: try to fix myEntries 2024-07-24 20:34:09 +02:00
Alex Moreno c926b047e2 hotFix: try to fix myEntries 2024-07-24 20:29:52 +02:00
Alex Moreno c904f7f88b hotFix: try to fix myEntries 2024-07-24 20:25:46 +02:00
Alex Moreno f88ec2a2ae hotFix: try to fix myEntries 2024-07-24 20:22:31 +02:00
Alex Moreno 29299970f4 hotFix: try to fix myEntries 2024-07-24 20:19:55 +02:00
Alex Moreno 369736f362 hotFix: try to fix myEntries 2024-07-24 20:17:23 +02:00