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

5096 Commits

Author SHA1 Message Date
Guillermo Bonet f701b6387a Merge branch 'dev' into 6769-itemDiary 2024-07-10 12:05:26 +02:00
Javier Segarra 85f94fa1f4 feat: salesTicketTable 2024-07-10 10:41:39 +02:00
Javier Segarra 44294bb46a feat: salesOrderTable 2024-07-10 09:56:37 +02:00
Jon Elias d86915fdd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-10 09:42:10 +02:00
Javier Segarra f45b623f24 feat: SalesClientTable 2024-07-10 09:25:15 +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
Javier Segarra 5e53a7d9a0 Merge branch 'dev' into 7353-MonitorsFixes 2024-07-09 20:41:16 +02: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
Carlos Satorres 31056ea5c9 refs #7355 fix lists redirects summary 2024-07-09 07:56:38 +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
Javier Segarra 286fbc5aba fix: Right menu double icon 2024-07-08 14:59:12 +02:00
Alex Moreno 2b67b85179 add changlelog 2024-07-08 14:58:33 +02:00
Alex Moreno 092909512a feat(ClaimSummary): add workerDescriptor in development 2024-07-08 14:25:50 +02:00
Alex Moreno 75b8cca2e0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5 2024-07-08 14:25:01 +02:00
Alex Moreno b23915ea2d fix: vnTable filter class 2024-07-08 14:14:24 +02:00
Alex Moreno 0c84d7d0ef Merge pull request 'feat(VnTable): add visibleColumns' (!536) from 6825-visibleColumns into dev 
Reviewed-on: verdnatura/salix-front#536
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-07-08 12:07:42 +00:00
Alex Moreno 54ca806ad9 Merge branch '6825-visibleColumns' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-visibleColumns 2024-07-08 13:51:57 +02:00
Alex Moreno dd872dba3b fix: areAllChecksMarked 2024-07-08 13:51:56 +02:00
Alex Moreno 4588897752 Merge branch 'dev' into 6825-visibleColumns 2024-07-08 11:47:23 +00:00
Javi Gallego b437630b62 Merge pull request 'feat: refs #7348 add checkbox' (!530) from 7348-client-hasDailyInvoice into dev 
Reviewed-on: verdnatura/salix-front#530
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-08 11:29:26 +00:00
Alex Moreno 4a8493f035 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-visibleColumns 2024-07-08 13:25:14 +02:00
Alex Moreno 41deb82174 feat(VnTable): add visibleColumns 2024-07-08 13:23:42 +02:00
Jon Elias 960c011024 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-08 13:16:06 +02:00
Jon Elias e70adce488 feat: refs #7323 fix descriptors, added VnTable and minor changes 2024-07-08 13:15:14 +02:00
Javi Gallego 32d2087bce feat: #7348 restore template 2024-07-08 12:56:34 +02:00
Javi Gallego 815a544244 Merge branch 'dev' into 7348-client-hasDailyInvoice 2024-07-08 12:44:06 +02:00
Javier Segarra 7393e51a94 fix: when param not exists 2024-07-08 12:41:00 +02:00
Javier Segarra e9ab0154fe Merge branch 'dev' into feature/TicketAdvanceFilter 2024-07-08 12:35:13 +02:00