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

5156 Commits

Author SHA1 Message Date
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
Jorge Penadés 3bba5db1b5 fix: refs #6900 improve logic 2024-08-14 14:52:47 +02:00
Jorge Penadés 65d893e128 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial 2024-08-14 14:30:47 +02:00
Jorge Penadés 760dc0e6f4 Merge branch '6900-addSerial' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial 2024-08-14 14:27:57 +02:00
Jorge Penadés 6dd9029871 fix: refs #6900 improve logic 2024-08-14 14:27:54 +02:00
Alex Moreno c7f53635d9 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-08-14 13:40:13 +02:00
Jorge Penadés e07d573788 Merge branch 'test' into 6900-addSerial 2024-08-14 10:13:39 +00:00
Jorge Penadés 7a27b9808f Merge pull request '#7323 warmfix' (!621) from 7323-warmfix-fixErrors into test 
Reviewed-on: verdnatura/salix-front#621
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-14 09:02:27 +00:00
Jorge Penadés 9bb67511e6 fix: refs #7323 vnsubtoolbar css 2024-08-14 10:34:42 +02:00
Jorge Penadés d7eb3af48d fix: refs #7323 add locale 2024-08-14 10:10:22 +02:00
Jorge Penadés 32fdec2fae feat: refs #7323 improve test 2024-08-14 10:08:31 +02:00
Jorge Penadés 30cadb5697 fix: refs #7323 use workerFilter 2024-08-14 09:11:14 +02:00
Jon Elias 71068d3e62 Merge pull request 'Hotfix: InvoiceOut List and NegativeBases' (!615) from hotfix_InvoiceOut_List&NegativeBases into master 
Reviewed-on: verdnatura/salix-front#615
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-14 06:56:39 +00:00
Alex Moreno 07e4dca361 refactor(invoiceOutList): create dialog 2024-08-14 08:55:18 +02:00
Jorge Penadés e7def05d40 feat: refs #7323 add flex-wrap 2024-08-13 16:59:43 +02:00
Jorge Penadés e780dcda05 fix: refs #7323 load all opts 2024-08-13 16:45:30 +02:00
Carlos Satorres c6db81ddb5 Merge pull request '#7323 use global locale' (!618) from 7323-warmfix-i18nTag into test 
Reviewed-on: verdnatura/salix-front#618
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-08-13 11:20:15 +00:00
Jorge Penadés a24caa9393 fix: refs #7323 use global locale 2024-08-13 12:56:39 +02:00
Jorge Penadés ac7c939e98 Merge pull request '#7323 add my account btn & fix models log selectable' (!614) from 7323-fixWorkerLog into test 
Reviewed-on: verdnatura/salix-front#614
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-13 09:20:49 +00:00
Jon Elias 4401a6108f Merge branch 'master' into hotfix_InvoiceOut_List&NegativeBases 2024-08-13 09:19:46 +00:00
Jon Elias de7251e16d fix: InvoiceOut List and negative bases 2024-08-13 11:18:07 +02:00
Jorge Penadés d276436bb3 chore: refs #7323 fix test 2024-08-13 10:42:15 +02:00
Jorge Penadés 81c70c9511 chore: refs #7323 remove unused import 2024-08-13 10:06:58 +02:00
Jorge Penadés e428da4a29 feat: refs #7323 add my account" btn & fix models log selectable 2024-08-13 10:05:07 +02:00
Alex Moreno ecfe933039 Merge pull request '7863-devToTest_2434' (!613) from 7863-devToTest_2434 into test 
Reviewed-on: verdnatura/salix-front#613
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-08-13 06:58:12 +00:00
Alex Moreno d27821c100 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-13 08:37:15 +02:00
Jorge Penadés de24a3efdb feat: refs #6900 add locale 2024-08-12 15:34:09 +02:00
Jorge Penadés c7679fd142 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial 2024-08-12 14:22:47 +02:00
Jorge Penadés 59262019f8 Merge pull request '#7283 finish item card sections' (!588) from 7283-itemSectionsMigration into dev 
Reviewed-on: verdnatura/salix-front#588
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-08-12 12:08:45 +00:00
Jon Elias 0f8e5b8bf0 Merge pull request 'Hotfix: new field's order in warehouse filter' (!611) from hotfix_TicketList_WarehouseFilter into master 
Reviewed-on: verdnatura/salix-front#611
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-12 12:06:33 +00:00
Jon Elias 563ab2de9c Merge branch 'master' into hotfix_TicketList_WarehouseFilter 2024-08-12 12:05:51 +00:00
Jorge Penadés c4de1beabf feat: refs #6900 add InvoiceInSerial 2024-08-12 13:46:56 +02:00
Jon Elias 72c8379b20 fix: new field's order in warehouse filter 2024-08-12 13:18:31 +02:00
Jorge Penadés 2cf669b479 Merge branch 'dev' into 7283-itemSectionsMigration 2024-08-12 10:51:40 +00:00
Alex Moreno 65a80e006b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-12 11:46:09 +02:00
Alex Moreno 1e78bc293e Merge pull request 'fix(customerDescription): fix action buttons' (!608) from hotFix_customerDescription_actions into master 
Reviewed-on: verdnatura/salix-front#608
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-08-12 09:45:07 +00:00
Jorge Penadés 9708214462 chore: refs #7283 drop array types 2024-08-12 11:01:32 +02:00
Jorge Penadés 239e796d2e chore: refs #7283 update VnAvatar title handling 2024-08-12 11:00:03 +02:00
Jorge Penadés f5ffe2a07b refactor: refs #7283 update avatar size and color 2024-08-12 10:18:14 +02:00
Alex Moreno 5e88004e79 fix(customerDescription): fix action buttons 2024-08-12 08:34:16 +02:00
Jorge Penadés 6b80c52b71 chore: refs #7283 drop import 2024-08-09 15:42:31 +02:00
Jorge Penadés f17ca4fe30 fix: refs #7283 itemLastEntries filter 2024-08-09 15:34:10 +02:00
Jorge Penadés bb1f507b27 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-09 15:29:37 +02:00
Alex Moreno 42a490cf18 Merge pull request 'fix(VnFilterPanel): emit userParams better' (!607) from warmFix_vnFilterPanel_setUserParams into dev 
Reviewed-on: verdnatura/salix-front#607
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-08-09 10:38:01 +00:00
Alex Moreno 08972d62b0 Merge branch 'dev' into warmFix_vnFilterPanel_setUserParams 2024-08-09 10:37:09 +00:00
Jorge Penadés bf11a184c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-09 12:34:04 +02:00
Jorge Penadés f4f1bb7792 Merge pull request '#6900 fine tunning invoice in' (!601) from 6900-fineTunning into dev 
Reviewed-on: verdnatura/salix-front#601
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-09 10:32:24 +00:00