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

5485 Commits

Author SHA1 Message Date
Jorge Penadés 79c96199f3 Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-21 11:35:16 +02:00
Jorge Penadés 172c238ac3 Merge pull request 'hotfix: #6917 set right time' (!632) from hotfix-fixVnInputTime into master 
Reviewed-on: verdnatura/salix-front#632
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-08-21 07:28:27 +00:00
Jon Elias 8903aabddf Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-21 08:13:21 +02:00
Jon Elias a31931f8cf Merge branch 'dev' of https: refs #7354//gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-21 08:13:19 +02:00
Jorge Penadés 7f2407996f chore: const var 2024-08-20 17:02:38 +02:00
Jorge Penadés d89d324a7e chore: drop ref 2024-08-20 16:59:16 +02:00
Jorge Penadés 0277aa50ce fix: set right time 2024-08-20 16:55:39 +02:00
Jorge Penadés 03baef8231 fix: refs #7353 css 2024-08-20 12:14:05 +02:00
Javier Segarra f9fd1c1f90 Merge pull request '#6336 - FIX ClaimList states' (!627) from 6336_claim_fix_states into dev 
Reviewed-on: verdnatura/salix-front#627
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-08-20 09:42:41 +00:00
Javier Segarra 7e3c5a9278 Merge pull request 'HOTFIX remove full-height class' (!631) from hotfix_workerTimeControl_style into master 
Reviewed-on: verdnatura/salix-front#631
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-08-20 09:42:37 +00:00
Javier Segarra a5fc366081 Merge branch 'dev' into 6336_claim_fix_states 2024-08-20 09:34:46 +00:00
Javier Segarra 472d477b15 fix: trim vnsearchbar input value 2024-08-20 09:32:50 +00:00
Javier Segarra 145c8b00d5 fix: limit and order TicketTracking 2024-08-20 09:32:01 +00:00
Javi Gallego 0eb699bcbe feat: refs #7346 formdata uses serialType 2024-08-20 10:10:11 +02:00
Javier Segarra 6e814ed4a8 fix: remove full-height class 2024-08-20 08:02:06 +00:00
Javier Segarra 5206f56cec Merge pull request '#7864 - 7864_testToMaster_2434' (!629) from 7864_testToMaster_2434 into master 
Reviewed-on: verdnatura/salix-front#629
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-08-20 06:33:16 +00:00
Javier Segarra 9086735aa1 test: fix routeList 2024-08-20 08:22:20 +02:00
Jorge Penadés 206253ac6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-19 16:03:23 +02:00
Jorge Penadés 1ec7b7a8c1 fix: refs #7353 css 2024-08-19 16:02:30 +02:00
Jorge Penadés 3f9bdfcc9c fix: refs #7353 saleTicketMonitors 2024-08-19 14:21:36 +02:00
Jorge Penadés e6e61e5717 fix: refs #7353 vnTable colors 2024-08-19 13:40:35 +02:00
Javier Segarra c19585fb1b fix: quasar build warnings 2024-08-19 11:36:12 +02:00
Jon Elias f31f876189 Merge branch 'dev' into 7354_ZoneMigration_End 2024-08-19 09:23:34 +00:00
Jon Elias 5230b8f722 Merge pull request '#7717 fix OrderCatalog' (!558) from 7717_fixOrderCatalog into dev 
Reviewed-on: verdnatura/salix-front#558
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-08-19 09:22:34 +00:00
Jon Elias a0aa902fe3 Merge branch 'dev' into 7354_ZoneMigration_End 2024-08-19 09:22:25 +00:00
Jon Elias ce8d12fe20 Merge branch 'dev' into 7717_fixOrderCatalog 2024-08-19 09:20:31 +00:00
Jon Elias f3d7590edf refactor: refs #7717 delete useless function and import 2024-08-19 10:49:04 +02:00
Jon Elias 6fd0083870 fix: refs #7354 fix validation in price field 2024-08-19 10:45:13 +02:00
Jorge Penadés 9a4a51fadb refactor: refs #7353 simplify code 2024-08-19 10:29:55 +02:00
Javi Gallego ca3406fbc0 Merge branch 'dev' into 7346-invoiceOutMultilple 2024-08-19 10:27:48 +02:00
Jorge Penadés ada1c948f6 feat: refs #7353 split sections 2024-08-19 10:14:02 +02:00
Javier Segarra 74f335b22e fix: #6336 ClaimListStates 2024-08-19 06:51:52 +00:00
Jorge Penadés bd9aea767a fix: refs #7353 salesorderTable 2024-08-16 18:10:10 +02:00
Jorge Penadés 1cca504c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-16 15:18:20 +02:00
Jorge Penadés a69f41834e fix: refs #7353 padding 2024-08-16 14:19:02 +02:00
Jorge Penadés a13ea900ce fix: refs #7353 salesClientTable 2024-08-16 13:54:37 +02:00
Alex Moreno 00616939c6 Merge pull request 'feat(FormModel): trim data by default' (!625) from formModel_trimData into dev 
Reviewed-on: verdnatura/salix-front#625
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-08-16 11:13:38 +00:00
Alex Moreno fa0ca732fc feat(FormModel): trim data by default 2024-08-16 12:29:35 +02:00
Alex Moreno 4b2f4ffac1 fix(VnTable): orderBy v-model 2024-08-16 12:20:08 +02:00
Alex Moreno 93a56b036a Merge branch 'dev' into 7354_ZoneMigration_End 2024-08-16 09:47:49 +00:00
Alex Moreno 2bea46b601 fix: test 2024-08-16 11:47:32 +02:00
Alex Moreno 0e8455888b Merge branch 'dev' into 7354_ZoneMigration_End 2024-08-16 09:32:55 +00:00
Jon Elias 3c4fc9473d refactor: refs #7354 changed descriptor menu options 2024-08-16 11:20:03 +02:00
Alex Moreno b35bf85f4a fix(claim_summary): url links 2024-08-16 10:50:45 +02:00
Alex Moreno ed29088d76 typo 2024-08-16 10:49:52 +02:00
Javi Gallego 06c0f49128 feat: refs #7346 add seriaType option 2024-08-16 10:10:40 +02:00
Alex Moreno 51ee79b7f7 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-08-16 09:24:24 +02:00
Alex Moreno 83a8f7e147 fix(invoiceOutGlobal): formData is object 2024-08-16 09:20:53 +02:00
Jorge Penadés a564f94e30 Merge pull request '#6900 add Serial' (!610) from 6900-addSerial into test 
Reviewed-on: verdnatura/salix-front#610
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-14 14:20:40 +00:00
Jorge Penadés ecfdf0b6b9 fix: refs #6900 improve loading 2024-08-14 15:27:36 +02:00