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

4196 Commits

Author SHA1 Message Date
Guillermo Bonet 76517d102d Merge branch 'test' into dev 2024-07-19 13:09:19 +02:00
Guillermo Bonet c5903e29e8 Merge branch 'master' into test 2024-07-19 13:08:41 +02:00
Guillermo Bonet 50c8b3c672 fix: refs #7648 Fix order property 2024-07-19 13:07:30 +02:00
Javier Segarra 569b86c2c1 Merge branch 'master' into 7648_myEntries 2024-07-19 10:27:57 +00:00
Jon Elias e60f846464 refactor: refs #7354 fix tableFilters 2024-07-19 12:11:00 +02:00
Javier Segarra bcde62afb5 Merge branch 'dev' into 6943-fixCustomer 2024-07-19 07:41:55 +00:00
Jon Elias daa4a41f09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-07-19 09:25:28 +02:00
Javier Segarra 55c8de78fc perf: VnFilterPanel 2024-07-19 09:20:33 +02:00
Jon Elias 89aa987c58 Merge branch 'dev' into 7323_WorkerMigration_End 2024-07-19 06:20:57 +00:00
Jon Elias 26cdae2384 refactor: refs #7323 hidden column filter proposal 2024-07-19 08:18:41 +02:00
Alex Moreno dbe56fa3a0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-19 08:02:58 +02:00
Alex Moreno 9b1636355d fix: customerNotifications filter 2024-07-19 07:58:34 +02:00
Jon Elias 6f6ab74220 Merge branch '7323_WorkerMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-19 07:42:59 +02:00
Jon Elias f171774605 fix: refs #7323 fixed left filter 2024-07-19 07:42:58 +02:00
Alex Moreno 3fe566796b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer 2024-07-18 14:01:28 +02:00
Alex Moreno f8026dd3f6 feat: improve VnSelectCache add find by Object 2024-07-18 13:54:22 +02:00
Alex Moreno 5833b4d856 fix(VnTable): autoload when has url parameters 2024-07-18 13:53:57 +02:00
Jon Elias 4495223735 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-07-18 13:03:53 +02:00
Jon Elias f4fa9b3c1f Merge branch 'dev' into 7323_WorkerMigration_End 2024-07-18 10:14:26 +00:00
Jon Elias 4a544b0b6c Merge branch '7323_WorkerMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-18 12:13:39 +02:00
Jon Elias 901a9e1f6d fix: refs #7323 fix department & email table filter 2024-07-18 12:13:38 +02:00
Jon Elias 108375bb69 perf: refs #7356 TicketList state column 2024-07-18 12:05:10 +02:00
Jon Elias 78e074d2fb refactor: refs #7356 requested changes 2024-07-18 10:53:44 +02:00
Alex Moreno 71d6e57ea5 Merge branch 'dev' into 6943-fixCustomer 2024-07-18 06:26:19 +00:00
Alex Moreno 83596daf76 fix: customerDefaulter correct functionality 2024-07-18 08:19:08 +02:00
Javier Segarra ac89c4f328 Merge branch 'dev' into 7323_WorkerMigration_End 2024-07-18 05:49:58 +00:00
Jon Elias b2b613a1d4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_TicketMigration_End 2024-07-17 14:58:25 +02:00
Alex Moreno ea5fef9d7f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-17 14:19:25 +02:00
Alex Moreno 1c006a278e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-07-17 14:19:08 +02:00
Alex Moreno 3999d93268 fix(WorkerTimeControl): url 2024-07-17 14:17:00 +02:00
Alex Moreno 725b7053f7 fix(workerTimeControl): correct request 'updateMailState' 2024-07-17 13:32:04 +02:00
Jon Elias a544ea224b Merge branch '7356_TicketMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_TicketMigration_End 2024-07-17 13:02:22 +02:00
Jon Elias 1e959307d8 refactor: refs #7356 fixed VnTable filters 2024-07-17 13:02:21 +02:00
Jon Elias 0d60f63771 Merge branch 'dev' into 7356_TicketMigration_End 2024-07-17 06:52:42 +00:00
Jon Elias cb610608df feat: refs #7356 list & weekly to VnTable and style fixes 2024-07-17 08:49:38 +02:00
Jon Elias 9e78d30a4c Merge branch dev of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-17 07:45:24 +02:00
Alex Moreno c253959e01 feat: customerPayments card view 2024-07-16 14:08:03 +02:00
Alex Moreno 3cd185360b fix: columns style 2024-07-16 14:03:14 +02:00
Javier Segarra c7c6f0f1c6 filter: vnfilterPanel 2024-07-16 13:50:16 +02:00
Javier Segarra 86a84784b1 feat: userPanel 2024-07-16 13:50:07 +02:00
Alex Moreno 90db8b403f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-16 13:15:17 +02:00
Javier Segarra f7135008a2 feat: entryBuys 2024-07-16 12:22:08 +02:00
Javier Segarra ace529a4ba feat: vnTable template 2024-07-16 12:22:01 +02:00
Javier Segarra 5fbbd27273 fat: i18n 2024-07-16 12:21:50 +02:00
Javier Segarra d467657928 feat: myEntries 2024-07-16 12:21:36 +02:00
Alex Moreno 4f36a78681 feat: curso in start when is 00:00 2024-07-16 12:13:16 +02:00
Javier Segarra 305a06aaee Merge branch 'dev' into 7017_formModel_validations 2024-07-16 09:50:25 +00:00
Javier Segarra fabf9a2024 perf: remove print variables 2024-07-16 11:26:13 +02:00
Javier Segarra 734f8807ff perf: examples 2024-07-16 11:25:28 +02:00
Javier Segarra bd359d13e4 feat: vnInput* 2024-07-16 11:25:21 +02:00
Javier Segarra fb2e3f1f9c feat: required validation 2024-07-16 11:25:06 +02:00
Alex Moreno 9cc11f0a28 variable 2024-07-16 10:18:28 +02:00
Alex Moreno c13f7fe237 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inputTime_improviments 2024-07-16 10:11:50 +02:00
Alex Moreno 493081254d feat: improve to set time 2024-07-16 10:11:27 +02:00
Javier Segarra d2a17bc376 Merge branch 'dev' into 7353-MonitorsFixes 2024-07-16 07:28:14 +00:00
Javier Segarra 8798598f41 Merge branch 'dev' into 7017_formModel_validations 2024-07-16 09:26:22 +02:00
Alex Moreno 4f802a4786 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-16 07:40:51 +02:00
Javier Segarra da43760688 Merge branch 'dev' into '7353-MonitorFixes' 2024-07-15 15:00:01 +02:00
Alex Moreno b488a013c7 fix(arrayData): reset 2024-07-15 14:55:06 +02:00
Alex Moreno bfa61d9bea refactor: CustomerNotifications use VnTable 2024-07-15 14:54:31 +02:00
Alex Moreno fd11259f74 refactor: CustomerPayments use VnTable 2024-07-15 14:18:21 +02:00
Alex Moreno 81a9719207 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer 2024-07-15 13:13:24 +02:00
Jon Elias 94aa3bc7a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-15 12:47:59 +02:00
Jon Elias 243a8cbdc6 fix: refs #7323 fix workerTimeControl form 2024-07-15 12:42:14 +02:00
Alex Moreno ea3effd7f4 feat: VnInputDate & VnInputTime improviments 2024-07-15 12:33:58 +02:00
Alex Moreno 1ccf515509 fix: editable columns 2024-07-15 12:33:33 +02:00
Javier Segarra be86b69079 fix: ticket menu order and i18n 2024-07-15 11:53:10 +02:00
Javier Segarra 5d58676288 Merge branch 'dev' into feature/TicketAdvanceFilter 2024-07-15 09:31:22 +00:00
Javier Segarra 8ea1fb6793 Merge branch 'dev' into feature/TicketDms 2024-07-15 09:30:10 +00:00
Javier Segarra c56610515c Merge branch 'dev' into TicketDms 2024-07-15 11:29:27 +02:00
Pablo Natek 35a165b9f3 Merge branch 'dev' into 7129-finishMigration 2024-07-15 09:25:52 +00:00
Javier Segarra ae55983405 Merge branch 'dev' into feature/SaleTracking 2024-07-15 09:23:53 +00:00
Javier Segarra a779853095 Merge branch 'dev' into 7648_myEntries_filter 2024-07-15 09:22:46 +00:00
Jon Elias c016e96904 fix: refs #7354 fix VnSearchbar search for zone section & finished basic tests 2024-07-15 10:44:28 +02:00
Pablo Natek a4f11fb497 Merge branch 'dev' into 7129-finishMigration 2024-07-15 08:42:30 +00:00
Pablo Natek 9a115dac3c Merge branch '7129-finishMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-finishMigration 2024-07-15 10:42:12 +02:00
Pablo Natek 6007e0c7cc fix: refs #7129 fix e2e 2024-07-15 10:42:11 +02:00
Alex Moreno cc8062785a Merge branch 'dev' into feature/SaleTracking 2024-07-15 08:17:01 +00:00
Alex Moreno 3f3d0c7337 fix(claimList): claimList client column 2024-07-15 09:39:57 +02:00
Javier Segarra d84fd34c4b Merge branch 'dev' into 7648_myEntries_filter 2024-07-15 07:38:45 +00:00
Pablo Natek fea9c8b7fb Merge branch 'dev' into 7129-finishMigration 2024-07-15 07:37:15 +00:00
Alex Moreno dbba7589ef fix: VnBreadcrumbs return if not has matched 2024-07-15 08:32:53 +02:00
Alex Moreno a4afba6000 Merge branch 'dev' into 6825-vnSelectCache 2024-07-15 05:19:53 +00:00
Alex Moreno b3d14ebeee fix: order left panel 2024-07-15 07:11:02 +02:00
Javier Segarra 1e668d1fbd Merge branch 'dev' into 7648_myEntries_filter 2024-07-12 20:42:05 +00:00
Javier Segarra 7f7bf9c0e6 feat: remove empty locales 2024-07-12 22:40:34 +02:00
Javier Segarra 20403287dd feat: scopeDays replace by daysOnward 2024-07-12 22:38:38 +02:00
Javier Segarra 65381e6536 perf: #7648 remove default value 2024-07-12 22:38:23 +02:00
Alex Moreno bfab1ec314 useAttrs 2024-07-12 14:13:35 +02:00
Alex Moreno b30da92c1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnSelectCache 2024-07-12 14:09:06 +02:00
Alex Moreno 3087dbf512 fix(CrudModel): onChange $index 2024-07-12 14:02:29 +02:00
Guillermo Bonet 9494a30ddd feat: refs #7704 Added min quantity label in catalog 2024-07-12 13:59:03 +02:00
Alex Moreno 904acfd48f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-finishMigration 2024-07-12 13:37:04 +02:00
Alex Moreno 73c5e0f1f4 fix: formModelPoup defaultActions false 2024-07-12 13:34:31 +02:00
Jon Elias 74c36a28b2 fix: workerCreate form street field to be always upperCase 2024-07-12 13:05:46 +02:00
Alex Moreno 58d029c5bb fix(vnTable_order): default value 2024-07-12 13:03:49 +02:00
Pablo Natek eaea8a50f0 fix: refs #7129 fix styles 2024-07-12 11:49:37 +02:00
Carlos Satorres f7d0b30eb5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration 2024-07-12 11:47:31 +02:00
Alex Moreno de814f9881 Merge branch 'dev' into 6825-vnSelectCache 2024-07-12 09:20:02 +00:00
Alex Moreno a77bf93e0d feat: create VnSelectCache and add in VnColumn 2024-07-12 11:19:37 +02:00
Javier Segarra 7ddf84ac11 Merge branch 'dev' into 7648_myEntries_filter 2024-07-12 11:09:01 +02:00
Alex Moreno 79928910ca Merge branch 'dev' into 6825-improve-css 2024-07-12 09:02:42 +00:00
Pablo Natek a736867e6e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-finishMigration 2024-07-12 11:02:41 +02:00
Javier Segarra 1d4454604b Merge branch 'dev' into 7648_myEntries_filter 2024-07-12 10:51:19 +02:00
Pablo Natek 72b86c0eec remove: refs #7129 remove console log 2024-07-12 10:43:15 +02:00
Pablo Natek 9098e63793 refactor: refs #7129 refactor with vnTable 2024-07-12 10:41:18 +02:00
Guillermo Bonet 686bbc26bd Merge branch 'dev' into 6769-itemDiary 2024-07-12 08:02:11 +00:00
Guillermo Bonet 3e0c495f97 Merge branch 'dev' into 7704-itemMinimalQuantity 2024-07-12 07:43:04 +00:00
Carlos Satorres fc3fc27461 refs #7355 fix list 2024-07-12 09:33:32 +02:00
Jon Elias a4a9572c96 feat: refs #7323 fixed tests, changed calendar styles and fix workerCreate 2024-07-12 09:16:32 +02: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 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 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 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
Jon Elias 74bc4eb7db refactor: refs #7354 reverse deliveryPanel changes 2024-07-11 07:13:54 +02:00
Jon Elias d7f8b11da7 fix: refs #7354 requested changes 2024-07-10 15:40:38 +02:00
Carlos Satorres 29405a8771 refs #7355 remove spaces 2024-07-10 14:55:55 +02:00
Carlos Satorres 06f88c8cb3 refs #7355 fix alias summary 2024-07-10 13:36:08 +02:00
Guillermo Bonet 5a4be3de4a feat: refs #6769 Requested changes 2024-07-10 13:09:35 +02:00
Javier Segarra 9077c1651b perf: width SalesTicketsTable 2024-07-10 12:25:30 +02:00
Javier Segarra 5ad317df65 feat: VnTable SalesTicketTable 2024-07-10 12:19:17 +02:00
Javier Segarra 167ba2aed0 perf: LeftMenu show/hide 2024-07-10 12:19:05 +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 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
Jon Elias 8913c6a31b fix: refs #7354 fix VnTable filters and agency field 2024-07-10 09:37:32 +02:00
Javier Segarra f45b623f24 feat: SalesClientTable 2024-07-10 09:25:15 +02:00
Jon Elias 6a4161de66 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-07-10 08:53:16 +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 24368d99b5 fix: refs #6896 fixed list & lines error 2024-07-09 14:09:04 +02:00
Jon Elias 0b135bbd52 fix: refs #7354 fix delivery days 2024-07-09 12:54:42 +02:00
Jon Elias 8c744fac5a refactor: refs #7354 Zone migration changes 2024-07-09 12:51:01 +02: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 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
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 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
Javier Segarra 339fba72a7 updates 2024-07-08 14:15:24 +02:00
Alex Moreno b23915ea2d fix: vnTable filter class 2024-07-08 14:14:24 +02: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
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
Jon Elias 7d90b536b0 Merge branch 'dev' into 6899_InvoiceOut_End 2024-07-08 09:32:32 +00:00
Javier Segarra fcbe6827e3 Merge branch 'dev' into 6825_vnTable_searchBtn_sticky 2024-07-08 11:06:31 +02:00
Javier Segarra 500d582100 Merge branch 'dev' into 7185_logoutErrorsToast 2024-07-08 08:57:51 +00:00
Javier Segarra aabd575854 Merge branch 'dev' into feature/TicketPackages 2024-07-08 10:55:14 +02:00
Javier Segarra 84462fe201 Merge branch 'dev' into feature/TicketComponents 2024-07-08 10:14:13 +02:00
Javier Segarra f87b806406 Merge branch 'dev' into feature/TicketPhotos 2024-07-08 10:10:24 +02:00
Javier Segarra a303942f76 Merge branch 'dev' into feature/TicketExpedition 2024-07-08 08:05:33 +00:00
Carlos Satorres a43a6aec82 refs #7355 fix Rol, alias 2024-07-08 09:59:07 +02:00
Alex Moreno d2c4c65b00 fix 2024-07-08 09:05:03 +02:00
Alex Moreno 5be762d781 refactors 2024-07-08 09:00:01 +02:00
Alex Moreno 5ec40ac6cf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5 2024-07-08 08:29:06 +02:00
Carlos Satorres cbc055fba2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration 2024-07-08 07:33:20 +02:00
Carlos Satorres e1a25e3cf4 refs #7355 fix create Rol 2024-07-08 07:32:50 +02:00
William Buezas 1de091da47 Initial value of quantity 0 2024-07-05 17:03:31 -03:00
William Buezas 98595e9ce4 Add ticket price 2024-07-05 16:53:39 -03:00
Javier Segarra 1cfa2edc01 fix: i18n 2024-07-05 21:18:41 +02:00
Javier Segarra 356db41eac Merge branch 'dev' into feature/TicketPackages 2024-07-05 19:02:58 +00:00
Jorge Penadés aab823abd5 feat: refs #6943 wip consumption filter 2024-07-05 17:49:09 +02:00
William Buezas b87e88ae7f Handle quantity empty value 2024-07-05 12:04:18 -03:00
Jorge Penadés f723e6f058 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer 2024-07-05 16:49:32 +02:00
Jorge Penadés 028ae0b9ac chore: refs #7197 drop space 2024-07-05 16:44:17 +02:00
William Buezas 3490ba1a8c Add input type number 2024-07-05 11:36:37 -03:00
Jorge Penadés 4b709caf42 chore: refs #7197 idrop useless class 2024-07-05 16:32:49 +02:00
William Buezas 0adbd3e6d2 Ticket advance filter 2024-07-05 11:29:06 -03:00
Jorge Penadés 6de7696fd1 fix: refs #7197 rollback crudModel 2024-07-05 16:00:37 +02:00
Jorge Penadés 904fbae251 fix: refs #7197 rollback crudModel 2024-07-05 15:58:08 +02:00
Jorge Penadés 3dd2745dde fix: refs #7197 rollback crudModel 2024-07-05 15:56:57 +02:00
Jorge Penadés 9e44896305 chore: refs #7197 fix tests 2024-07-05 15:41:53 +02:00
Alex Moreno ab5347d302 fix: e2e and min-height vnTable 2024-07-05 14:58:02 +02:00
Alex Moreno 2e02027a00 fix: cardDescriptor 2024-07-05 14:11:50 +02:00
Jon Elias e975279e2f Merge branch '6899_InvoiceOut_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End 2024-07-05 14:05:59 +02:00
Jon Elias 41052cce28 refactor: refs #6899 corrected api call 2024-07-05 14:05:57 +02:00
Jon Elias 6a4eb9f3b8 Merge branch 'dev' into 6899_InvoiceOut_End 2024-07-05 12:03:25 +00:00
Jon Elias 5112ae7e1a Merge branch '6899_InvoiceOut_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End 2024-07-05 14:02:25 +02:00
Jon Elias a634d8d6e6 refactor: refs #6899 deleted comments 2024-07-05 14:02:24 +02:00
Jon Elias fe530aa1c6 Merge branch 'dev' into 6896_Order_End 2024-07-05 11:36:37 +00:00
Jon Elias 2f173ac2e7 refactor: refs #6896 requested changes & deleted basicData and Lines warnings 2024-07-05 13:35:45 +02:00
Carlos Satorres 2e3970c0cc refs #7355 fix accountAlias 2024-07-05 13:18:46 +02:00
Jorge Penadés 1efdd38cfe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-05 13:07:44 +02:00
Jorge Penadés a11dd6a5e9 feat: refs #6943 lock grid mode 2024-07-05 13:05:57 +02:00
Carlos Satorres ae7bb14382 Merge branch 'dev' into 7366-fixTravels 2024-07-05 10:27:45 +00:00
Jorge Penadés 04422a1052 refactor: #6943 wip use vnTable CustomerCredits 2024-07-05 12:27:02 +02:00
Jorge Penadés d5e916ff58 refactor: wip use vnTable CustomerCredits 2024-07-05 12:25:21 +02:00
Jorge Penadés 8fbaf43b82 fix: refs #6943 drop padding-left checkbox & create wrap mode vnRow 2024-07-05 12:04:43 +02:00
Jorge Penadés ff7f375347 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer 2024-07-05 11:49:59 +02:00
Carlos Satorres 592829c7a3 fix #7355 fix acls list 2024-07-05 11:33:36 +02:00
Alex Moreno 3a117a9f0e feat: add ClaimSummaryAction 2024-07-05 10:51:20 +02:00
Javier Segarra c2da14e59a perf: remove warningsCLI 2024-07-05 10:42:52 +02:00
Jon Elias e08a7710cf Merge branch 'dev' into 6899_InvoiceOut_End 2024-07-05 08:21:28 +00:00
Jon Elias 0436dbae51 fix: refs #6896 fixed OrderList path 2024-07-05 10:21:02 +02:00
Jon Elias 516a0642ab Merge branch '6899_InvoiceOut_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End 2024-07-05 10:16:53 +02:00
Jon Elias 9aa283a612 fix: refs #6899 fix openReport call 2024-07-05 10:16:52 +02:00
Javier Segarra da3a601741 feat: move Qbtn 2024-07-05 10:02:07 +02:00
Guillermo Bonet 7fae6b92a1 hotfix: refs #6769 Minor changes 2024-07-05 09:45:13 +02:00
Javier Segarra 7201fd6d21 fix: remove warnings 2024-07-05 09:41:36 +02:00
Javier Segarra df01967e2e perf: remove unnecessary import 2024-07-05 09:41:12 +02:00
Javier Segarra d2867857fc Merge branch 'dev' into 6825_vnTable_searchBtn_sticky 2024-07-05 09:40:40 +02:00
Javier Segarra 9d4cfbd90c Merge branch 'dev' into feature/TicketPackages 2024-07-05 09:28:31 +02:00
Jon Elias 44edccb905 refactor: refs #6896 fixed create order function 2024-07-05 09:27:20 +02:00
Jorge Penadés 973d069abe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-05 09:19:02 +02:00
Carlos Satorres dc923ed36c refs #7366 fix descriptor 2024-07-05 09:07:18 +02:00
Javi Gallego f81c5d4fb0 feat: refs #7348 add checkbox 2024-07-05 09:06:17 +02:00
Alex Moreno d3ea1986d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5 2024-07-05 08:53:36 +02:00
Guillermo Bonet a616498d1a hotfix: refs #6769 Fix 2024-07-05 08:42:13 +02:00
Alex Moreno 12ca0faf21 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5 2024-07-05 07:23:20 +02:00
Guillermo Bonet 317746b1f5 hotfix: refs #6769 Changes 2024-07-05 07:10:41 +02:00
William Buezas 273641cd98 Change translation 2024-07-04 13:02:24 -03:00
Jorge Penadés cc203022d2 chore: refs #7197 fix unit tests 2024-07-04 17:31:40 +02:00
Jorge Penadés ccf1603d02 fix: refs #6943 prevent undefined 2024-07-04 17:05:52 +02:00
Carlos Satorres 9caacf3f86 refs #7355 accountAcl 2024-07-04 14:48:45 +02:00
William Buezas decf33c0b7 small changes 2024-07-04 09:46:10 -03:00
Jon Elias 34c877bd64 Merge branch 'dev' into 6899_InvoiceOut_End 2024-07-04 12:05:09 +00:00
Jon Elias d4f70355a7 Merge branch '6899_InvoiceOut_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End 2024-07-04 14:03:59 +02:00
Jon Elias 90fbfd38e0 refcactor: refs #6899 deleted warnings 2024-07-04 14:03:33 +02:00
Jorge Penadés 8957141222 fix: refs #7197 responsive summary layout 2024-07-04 13:56:16 +02:00
William Buezas ad61bf61fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/TicketPhotos 2024-07-04 08:49:18 -03:00
William Buezas 9b1f73d30f Rename catalog item 2024-07-04 08:45:51 -03:00
Carlos Satorres d0276ae820 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration 2024-07-04 13:43:24 +02:00
Carlos Satorres c6ae1aec36 refs #7366 fix travel 2024-07-04 13:41:43 +02:00
Jon Elias 1b839a89f7 refactor: refs #6896 Order migration 2024-07-04 13:35:27 +02:00
Alex Moreno 31fa889d1f Merge branch 'VnTable_fix' of https://gitea.verdnatura.es/verdnatura/salix-front into VnTable_fix 2024-07-04 13:17:59 +02:00
Alex Moreno 699f09cfcf fix: where empty 2024-07-04 13:17:58 +02:00
Jorge Penadés 4d6e2e2774 chore: refs #7197 drop useless attr 2024-07-04 13:12:06 +02:00
Jorge Penadés 35fe28fff1 feat: refs #7197 add supplier activities filter option 2024-07-04 13:11:04 +02:00
Alex Moreno 47fe9b25e9 Merge branch 'dev' into VnTable_fix 2024-07-04 10:57:34 +00:00
Jon Elias aec43cb1c5 refactor: arrayData & VnCard refactor 2024-07-04 12:51:46 +02:00
Jorge Penadés 976f527107 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-04 12:15:42 +02:00
Javier Segarra d6cc447989 Merge branch 'dev' into feature/SaleTracking 2024-07-04 10:44:50 +02:00
Javier Segarra 4a01f1d930 perf: cleancode 2024-07-04 10:40:11 +02:00
Javier Segarra 6ce03287ef perf: remove justify-center CSS class 2024-07-04 09:53:06 +02:00
Javier Segarra 14e26f0285 Merge branch 'dev' into feature/TicketComponents 2024-07-04 09:40:00 +02:00
Jorge Penadés fbbeb200be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData 2024-07-04 09:29:28 +02:00
Jon Elias fcc8d59cb3 Merge branch 'dev' into 6899_InvoiceOut_End 2024-07-04 06:28:17 +00:00
Jon Elias 8dc1ec75b3 refactor: refs #6899 requested changes 2024-07-04 08:27:20 +02:00
Javier Segarra e2054c2eb7 fix: Itemdescriptor .link 2024-07-03 21:35:19 +02:00
Javier Segarra 2b0b470120 fix: TicketComponent Sales column 2024-07-03 21:30:29 +02:00
William Buezas 8baf5b1489 Apply right alignment to total and import columns 2024-07-03 16:14:47 -03:00
William Buezas 02ce4f2658 Small change 2024-07-03 15:12:20 -03:00
William Buezas 91eb966586 Ticket photos 2024-07-03 14:44:36 -03:00
Jorge Penadés c2333c9455 chore: refs #7300 reset arrayData 2024-07-03 17:53:37 +02:00
Jorge Penadés d6ff9a184b Merge branch 'dev' into 6943-fixCustomerGreuges 2024-07-03 15:40:45 +00:00
Jorge Penadés 6ad0b0994f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData 2024-07-03 17:15:40 +02:00
Jorge Penadés 8f11c82185 feat: refs #7197 summary responsive 2024-07-03 17:14:28 +02:00
Alex Moreno 2340aaba0b feat: list use vnTable, fix descriptor 2024-07-03 14:39:15 +02:00
Javier Segarra 83fa9a15b9 feat: redirect to login with current path 2024-07-03 14:20:01 +02:00
Javier Segarra 825e4497d2 feat: handle request when unauthorized 2024-07-03 14:19:54 +02:00
Jorge Penadés 076fbad20e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-03 14:11:29 +02:00
Jorge Penadés 7098ec03de Merge branch 'dev' into 6943-fixCustomerGreuges 2024-07-03 12:00:40 +00:00
Pablo Natek 1e7fcce26c Merge branch 'dev' into fix-supplierSearchTable 2024-07-03 11:56:47 +00:00
Jorge Penadés 869d134591 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6151-fix-searchbar 2024-07-03 13:48:06 +02:00
Jorge Penadés 95f488ba76 chore: refs #6151 rollback 2024-07-03 13:47:33 +02:00
Jorge Penadés 218cc47834 fix: refs #6151 searchbar 2024-07-03 13:44:35 +02:00
Carlos Satorres 161ebdc88a refs #6898 fix 2024-07-03 13:44:13 +02:00
Carlos Satorres 109544f475 fix searchbar 2024-07-03 13:18:17 +02:00
Jorge Penadés b0c5f19f1d merge dev 2024-07-03 12:31:01 +02:00
Carlos Satorres 92b8104b19 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration 2024-07-03 12:21:03 +02:00
Carlos Satorres 885decc700 Merge branch 'dev' into 6897-entryMigration2 2024-07-03 10:02:28 +00:00
Javier Segarra c25b04e075 improve QChebox 2024-07-03 11:48:51 +02:00
Jorge Penadés 2156692804 Merge branch 'dev' into 6449-updateVnLog 2024-07-03 08:39:11 +00:00
Alex Moreno 1463cc8904 Merge branch 'dev' into 7366-travelMigration2 2024-07-03 08:32:00 +00:00
Carlos Satorres 27876b0bab Merge branch 'dev' into 7366-travelMigration2 2024-07-03 08:30:56 +00:00
Pablo Natek 5b98e968ed remove: refs #7404 remove comments 2024-07-03 10:27:11 +02:00
Carlos Satorres 352580270b refs #6989 fix reload 2024-07-03 10:25:21 +02:00
Pablo Natek 29c4b1bcb8 Merge branch '7404-add-e2e-to-route' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route 2024-07-03 10:20:58 +02:00
Pablo Natek 937167ce95 remove: refs #7404 remove traductions 2024-07-03 10:19:47 +02:00
Carlos Satorres 94680a6c2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration 2024-07-03 10:07:34 +02:00
Pablo Natek f15fc0d6a7 Merge branch 'dev' into 7404-add-e2e-to-route 2024-07-03 08:07:15 +00:00
Pablo Natek 7d8f9d4072 fix: refs #7404 fix create 2024-07-03 10:06:54 +02:00
Carlos Satorres dff77277ac refs #6897 fix summary, list, inputs 2024-07-03 10:05:05 +02:00
Jon Elias f8d263c347 Merge branch 'dev' into 7543-StandarizeDescriptors 2024-07-03 07:52:35 +00:00
Jon Elias 7914387735 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End 2024-07-03 09:46:54 +02:00
Jon Elias 10f5323b9a refactor: refs #6899 fix negativeBases call 2024-07-03 09:45:59 +02:00
Carlos Satorres dc9463f249 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2 2024-07-03 09:38:37 +02:00
Pablo Natek 11266b602c refactor: refs #7404 route list add table 2024-07-03 09:33:48 +02:00
Pablo Natek 61bd1eaf04 merge dev 2024-07-03 09:33:04 +02:00
Jorge Penadés 79694b9d0c Merge branch 'dev' into 6449-updateVnLog 2024-07-03 07:15:16 +00:00
Jorge Penadés df55246a4a Merge branch 'dev' into 7652-fixPagination 2024-07-03 07:10:13 +00:00
Alex Moreno 6ac4649210 Merge branch 'dev' into 6917-inputDate_inpuTime 2024-07-03 06:51:38 +00:00
Alex Moreno 4272990a7a Merge branch 'dev' into 6917-inputDate_inpuTime 2024-07-03 06:48:59 +00:00
Carlos Satorres b40e3f2c7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2 2024-07-03 08:48:33 +02:00
Jon Elias 467ec08f3e Merge branch 'dev' into 6151-FixOrderModule 2024-07-03 06:48:33 +00:00
Carlos Satorres 21d5d6b986 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration2 2024-07-03 08:46:05 +02:00
Carlos Satorres ad2265fe7c refs #7366 fix travel migration 2024-07-03 08:43:23 +02:00
Javier Segarra f46443ee69 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-03 08:33:33 +02:00
Javier Segarra d15dc7336b Merge branch 'dev' into 7648_dev_customerEntries 2024-07-03 08:26:27 +02:00
Jon Elias e114bd7523 Merge branch '7543-StandarizeDescriptors' of https://gitea.verdnatura.es/verdnatura/salix-front into 7543-StandarizeDescriptors 2024-07-03 08:20:18 +02:00
Jon Elias 363abb899f fix: refs #7543 fix changed descriptors 2024-07-03 08:20:16 +02:00
Jon Elias e13f98dffb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7543-StandarizeDescriptors 2024-07-03 07:12:07 +02:00
Jon Elias d5b934a239 Merge branch 'dev' into 7030-FixTranslations 2024-07-03 05:06:01 +00:00
William Buezas 34ee92ac24 Small change 2024-07-02 21:46:45 -03:00
William Buezas 5c36ad14f4 Ticket components 2024-07-02 21:33:19 -03:00
Javier Segarra 147d17301f remove unnussed tags 2024-07-03 01:50:45 +02:00
Javier Segarra 7e374c258e test: test:e2e 2024-07-03 01:47:14 +02:00
Javier Segarra 0dcd2a861b Merge branch 'dev' into 7543-StandarizeDescriptors 2024-07-02 18:59:43 +00:00
Javier Segarra e70162d342 Merge branch 'dev' into 6917-inputDate_inpuTime 2024-07-02 18:42:29 +00:00
Javier Segarra 5c2c9d0805 perf: change field column 2024-07-02 20:41:37 +02:00
Javier Segarra 8a94701422 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-02 20:32:08 +02:00
Carlos Satorres ae01aa614b refs #7355 mail alias acls 2024-07-02 17:30:45 +02:00
Jorge Penadés 1c5583f439 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-02 16:08:04 +02:00
Jorge Penadés 96a3298280 Merge branch 'dev' into 7652-fixPagination 2024-07-02 14:04:19 +00:00
Jon Elias 06f8121ede Merge branch 'dev' into 6899_InvoiceOut_End 2024-07-02 15:24:52 +02:00
Alex Moreno 6d12c0f00c feat(VnTable): add selected funcitionality 2024-07-02 15:01:43 +02:00
Alex Moreno 22f42ca7f9 feat(VnTable): add slots for columns 2024-07-02 14:55:32 +02:00
Jon Elias cdbbd576e3 refactor: refs #6899 end invoiceOut migration with VnTable 2024-07-02 14:54:14 +02:00
William Buezas 9179dc7432 Ticket package 2024-07-02 09:35:18 -03:00
Alex Moreno 249aedeaf5 remove unnecessary translation 2024-07-02 13:51:33 +02:00
Alex Moreno 739be5fe7c fix(VnInputDate & VnInputTime): fix clearable 2024-07-02 13:49:29 +02:00
Alex Moreno 0384123564 fix: vntable filter where 2024-07-02 12:24:33 +02:00
Jon Elias c0e65ff3b7 fix: refs #7030 solve conflicts 2024-07-02 11:50:07 +02:00