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

7319 Commits

Author SHA1 Message Date
Alex Moreno b7ed63afc6 Merge branch 'dev' into 7404-fixFront 2024-09-24 06:18:42 +00:00
Alex Moreno 8760781660 fix: merge in dev 2024-09-24 08:15:44 +02:00
Alex Moreno 98a3b03be7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-24 07:48:58 +02:00
Alex Moreno 1f9850f520 Merge pull request 'fix: Options VnSelect properties' (!746) from 6943_fix_customer_module into dev 
Reviewed-on: verdnatura/salix-front#746
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-24 05:41:49 +00:00
Alex Moreno 5fc306e11e Merge branch 'dev' into 6943_fix_customer_module 2024-09-24 05:38:47 +00:00
Alex Moreno 96edfd4b6e Merge pull request 'feat: change label because its more natural' (!749) from 5888_format_location_label into dev 
Reviewed-on: verdnatura/salix-front#749
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-24 05:36:09 +00:00
Pablo Natek 8124a341a0 feat: refs #7129 route extended list and simplify route list 2024-09-24 07:25:17 +02:00
Javier Segarra a5c6d628ca feat: enable notify positive when user update self data 2024-09-23 18:48:58 +00:00
Javier Segarra 55e017b0cc Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-23 18:39:09 +00:00
Javier Segarra 3ede256dc5 feat: change label because its more natural 2024-09-23 18:30:14 +00:00
Jorge Penadés 2cb9899de1 feat: refs #7207 show queue 2024-09-23 15:38:54 +02:00
Javier Segarra b4b31c0c92 fix: enable autofocus 2024-09-23 15:21:07 +02:00
Javier Segarra e9e2caee85 feat: autofocus after clear 2024-09-23 13:18:14 +00:00
Javier Segarra 27a3e36b58 fix: comments 2024-09-23 14:56:34 +02:00
Javier Segarra 13b519e4b3 Merge branch 'dev' into 6943_fix_customer_module 2024-09-23 12:45:03 +00:00
Javier Segarra ab0c38810a fix: Options VnSelect properties 2024-09-23 12:44:37 +00:00
Javier Segarra caddcf45c3 fix: Options VnSelect properties 2024-09-23 12:43:52 +00:00
Javier Segarra 3cfa883642 Merge pull request '#6943 - Customer module find salesPersons out of first get' (!711) from 6943_fix_customer_module into dev 
Reviewed-on: verdnatura/salix-front#711
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-23 12:25:21 +00:00
Javier Segarra 5803af7a74 Merge branch 'dev' into 6943_fix_customer_module 2024-09-23 12:24:01 +00:00
Javier Segarra 0c1114e89e Merge pull request '6156 i18n' (!742) from 6156_i18n into dev 
Reviewed-on: verdnatura/salix-front#742
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-23 12:22:17 +00:00
Javier Segarra ac8aa6bcc1 fix: table order 2024-09-23 14:21:41 +02:00
Javier Segarra e651b7ad82 Merge branch 'dev' into 6156_i18n 2024-09-23 12:07:05 +00:00
Jon Elias 4fc3f08f77 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-23 11:52:31 +00:00
Jon Elias b728b7c5bd Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-23 13:51:22 +02:00
Jon Elias 3716507f93 perf: refs #7553 removeSales function 2024-09-23 13:51:20 +02:00
Alex Moreno d3b45af7e5 Merge pull request 'fix: VnLocation test' (!744) from fix_test_vnLocation into dev 
Reviewed-on: verdnatura/salix-front#744
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-23 11:45:24 +00:00
Robert Ferrús d13cab0a24 Merge pull request 'feat: refs #8000 add column into zoneBasicData' (!741) from 8000-zoneBasicDataAddcolumn into master 
Reviewed-on: verdnatura/salix-front#741
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-23 11:43:14 +00:00
Javier Segarra 0829b6d0d2 fix: i18n en preparation label 2024-09-23 11:42:47 +00:00
Javier Segarra 6a8ed89a71 fix: VnLocation test 2024-09-23 11:41:30 +00:00
Pablo Natek b04564d5a8 fix: refs #7404 style non center pop up 2024-09-23 13:23:25 +02:00
Pablo Natek e700f6f4a8 feat: refs #7404 style dynamic text color 2024-09-23 13:14:25 +02:00
Jorge Penadés f809e0fb31 fix: refs #7323 show prev month week color 2024-09-23 12:55:39 +02:00
Javier Segarra 279a100f8b fix: i18n en preparation label 2024-09-23 10:25:44 +00:00
Javier Segarra a52cdf8f94 fix: i18n en preparation label 2024-09-23 10:25:11 +00:00
Robert Ferrús 5ebbb1cf73 feat: refs #8000 fix 2024-09-23 12:24:19 +02:00
Robert Ferrús 1ae20202cc feat: refs #8000 add column into zoneBasicData 2024-09-23 11:56:20 +02:00
Javier Segarra 7713e33c67 Merge branch 'dev' into 8018_location_label 2024-09-23 09:48:19 +00:00
Javier Segarra 013a76cbce test: VnLocation 2024-09-23 11:48:00 +02:00
Javier Segarra f06723a919 test: VnLocation 2024-09-23 11:39:10 +02:00
Jorge Penadés 7bbad14f53 feat: refs #7323 delete btn 2024-09-23 11:38:27 +02:00
Alex Moreno 29cc14673a warmFix: e2e claimDevelopment 2024-09-23 11:15:17 +02:00
Alex Moreno 951b8fc1fa warmFix: e2e claimDevelopment 2024-09-23 11:15:11 +02:00
Javier Segarra 66cb069109 perf: CustomerBalance 2024-09-23 11:06:08 +02:00
Javier Segarra 88fd40eae6 feat: minor changes 2024-09-23 11:05:58 +02:00
Jon Elias 0dd79ed708 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-23 08:22:21 +00:00
Jon Elias f025b4361e refactor: refs #7553 last requested changes 2024-09-23 10:21:30 +02:00
Pablo Natek 17bb144bce fix: refs #7404 translates and some minor style fixes 2024-09-23 10:04:45 +02:00
Javier Segarra 8bbea9c903 feat: change order 2024-09-23 09:47:54 +02:00
Jorge Penadés 37545b4cab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-23 09:29:26 +02:00
Jon Elias 4c071aea8b Merge branch 'dev' into 7884-AddLabelerField 2024-09-23 06:51:07 +00:00