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

4708 Commits

Author SHA1 Message Date
Guillermo Bonet 0794e09272 Merge pull request 'feat: refs #6769 itemDiary' (!532) from 6769-itemDiary into dev 
Reviewed-on: verdnatura/salix-front#532
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-12 08:13:32 +00:00
Guillermo Bonet 686bbc26bd Merge branch 'dev' into 6769-itemDiary 2024-07-12 08:02:11 +00:00
Guillermo Bonet 28cf9ac509 Merge pull request 'feat: refs #7704 Deleted minQuantity label' (!544) from 7704-itemMinimalQuantity into dev 
Reviewed-on: verdnatura/salix-front#544
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-07-12 07:43:51 +00:00
Guillermo Bonet 3e0c495f97 Merge branch 'dev' into 7704-itemMinimalQuantity 2024-07-12 07:43:04 +00:00
Alex Moreno b41dc28fde fix(VnTable): check column skipped only onMounted 2024-07-12 09:08:37 +02:00
Alex Moreno e1049f660e fix(VnTable): max-width vn-select 2024-07-12 08:33:44 +02:00
Alex Moreno b4853af69d fix(VnTable): max-width vn-select 2024-07-12 08:33:06 +02:00
Alex Moreno ada666a26c feat(VnTable): improve css columns 2024-07-12 08:23:18 +02:00
Javier Segarra 2a03ad7aaa Merge pull request 'warmfix: ticketList add imports' (!541) from warmfix_ticketList into dev 
Reviewed-on: verdnatura/salix-front#541
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-12 05:39:51 +00:00
Javier Segarra b770567036 Merge branch 'dev' into warmfix_ticketList 2024-07-12 05:39:12 +00:00
Guillermo Bonet dc20b7f027 Merge branch 'dev' into 6769-itemDiary 2024-07-12 05:20:10 +00:00
Alex Moreno 452db07e6d Merge pull request 'feat: claimList better support vnTable, claimSummary redesign.' (!546) from 6336-clam_list_summary_fixes into dev 
Reviewed-on: verdnatura/salix-front#546
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-07-12 05:06:11 +00:00
Alex Moreno a2bb9bdf32 Merge branch 'dev' into warmfix_ticketList 2024-07-12 04:59:00 +00:00
Javier Segarra 73049f7282 add new filter by days 2024-07-11 19:56:37 +02:00
Alex Moreno fdb8f92a10 typo 2024-07-11 15:05:21 +02:00
Alex Moreno 5232df2595 feat: claimList better support vnTable, claimSummary redesign. 
BREAKING CHANGE: VnTable default-mode table
 2024-07-11 15:03:39 +02:00
Guillermo Bonet 8fad2f1a27 Merge branch 'dev' into 7704-itemMinimalQuantity 2024-07-11 11:36:32 +00:00
Alex Moreno 3a2b27484a Merge pull request 'feat(VnTable): order column' (!545) from 6825-vnTable-orderColumn into dev 
Reviewed-on: verdnatura/salix-front#545
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-07-11 08:38:31 +00:00
Alex Moreno d005fa3787 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable-orderColumn 2024-07-11 10:37:29 +02:00
Alex Moreno b3570878bf fix(VnTable): moreFilterPanel slot 2024-07-11 10:30:54 +02:00
Alex Moreno fd6b395f34 feat(VnTable): order column 2024-07-11 10:22:02 +02:00
Guillermo Bonet b1e6e725cf feat: refs #7704 Deleted minQuantity label 2024-07-11 08:50:10 +02:00
Guillermo Bonet 5a4be3de4a feat: refs #6769 Requested changes 2024-07-10 13:09:35 +02:00
Guillermo Bonet 3b43505c3e feat: refs #6769 Requested changes 2024-07-10 12:07:01 +02:00
Guillermo Bonet f701b6387a Merge branch 'dev' into 6769-itemDiary 2024-07-10 12:05:26 +02:00
Javier Segarra 93076f459c Actualizar src/pages/Ticket/TicketList.vue 2024-07-09 19:33:48 +00:00
Javier Segarra 4b720d9b67 warmfix: ticketList add imports 2024-07-09 19:33:02 +00:00
Alex Moreno 36fc988df2 fix(VnTable): visible if is nullish 2024-07-09 14:56:27 +02:00
Alex Moreno c10f62b717 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-09 14:21:42 +02:00
Alex Moreno 58a2a32027 warmFix(workerDescriptor): ?. 2024-07-09 14:21:41 +02:00
Jon Elias 0ad62695b5 Merge pull request '#6896 fix list & lines' (!540) from 6896_Order_End into dev 
Reviewed-on: verdnatura/salix-front#540
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-09 12:20:57 +00:00
Jon Elias 24368d99b5 fix: refs #6896 fixed list & lines error 2024-07-09 14:09:04 +02:00
Carlos Satorres e695fffb30 Merge pull request 'refs #6897 fix entry summary' (!538) from hotfix-fixEntrySummary into master 
Reviewed-on: verdnatura/salix-front#538
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-09 10:32:22 +00:00
Carlos Satorres c7952092ad remove log 2024-07-09 12:20:31 +02:00
Carlos Satorres c61cf2d4bf refs #6897 fix entry summary 2024-07-09 12:09:38 +02:00
Alex Moreno 1978157a08 fix: props 2024-07-09 11:43:32 +02:00
Alex Moreno fd9caea5c1 Merge pull request '6336-migrationClaim-v5' (!531) from 6336-migrationClaim-v5 into dev 
Reviewed-on: verdnatura/salix-front#531
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-09 09:42:42 +00:00
Alex Moreno bb8f0b43f0 Merge branch 'dev' into 6336-migrationClaim-v5 2024-07-09 09:27:16 +00:00
Alex Moreno 66a5516116 warmFix: delete params.filter url query 2024-07-09 10:34:15 +02:00
Javier Segarra 38dd54b2f5 fix: i18n components 2024-07-09 10:18:01 +02:00
Javier Segarra 4eaab6f4ae fix warning when quasar build 2024-07-09 10:07:22 +02:00
Javier Segarra a9e19309ee fix warning 2024-07-09 09:59:39 +02:00
Javier Segarra c5c96bf51b Merge branch 'dev' into feature/SaleTracking 2024-07-09 09:41:45 +02:00
Javier Segarra 3f2b675d07 feat: change ticketDms leftMenuItem position 2024-07-09 09:15:20 +02:00
Javier Segarra cededb54e8 Merge branch 'dev' into feature/TicketDms 2024-07-09 09:14:40 +02:00
Javier Segarra 6482dbad22 fix: TicketDmsImportForm 2024-07-09 09:13:44 +02:00
Alex Moreno ac8c3d86fc Merge pull request '7691-testToMaster' (!537) from 7691-testToMaster into master 
Reviewed-on: verdnatura/salix-front#537
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-07-09 05:39:55 +00:00
Jon Elias 1869e318ca Merge pull request '#6896 Order migration' (!525) from 6896_Order_End into dev 
Reviewed-on: verdnatura/salix-front#525
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-09 05:28:33 +00:00
Javier Segarra 6bd119abc3 Merge branch 'dev' into 6896_Order_End 2024-07-08 13:01:34 +00:00
Javier Segarra 20eb26127a fix: Right menu double icon 2024-07-08 15:00:45 +02:00