7525-devToTest #419

Merged
alexm merged 177 commits from 7525-devToTest into test 2024-06-04 08:06:27 +00:00

177 Commits

Author SHA1 Message Date
Jorge Penadés 76f858ba7e Merge pull request '#6600 create photo comment' (!416) from 6600-itemPhotoComment into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
Reviewed-on: #416
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-03 08:07:44 +00:00
Jorge Penadés d2180c67f7 refactor: refs #6600 replace QInput to VnInput
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-03 09:35:59 +02:00
Jorge Penadés f58b072964 feat: refs #6600 Add option to add comment for photo motivation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-03 09:30:37 +02:00
Alex Moreno 5799a1121b fix: searchbar redirect
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-30 10:22:13 +02:00
Alex Moreno 2cf0a717ac deploy: increase version
gitea/salix-front/pipeline/head This commit looks good Details
2024-05-30 09:23:17 +02:00
Alex Moreno 15223971f1 fix: defaulter icon
gitea/salix-front/pipeline/head This commit looks good Details
2024-05-29 12:53:12 +02:00
Jorge Penadés f15e8e42b3 Merge pull request '#6942 improve invoiceIn' (!220) from 6942-improveInvoceIn into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #220
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-05-29 07:03:45 +00:00
Jorge Penadés 0de575bb6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-28 13:14:11 +02:00
Jorge Penadés 3b3e7e7e03 fix: refs #6942 tests & summary table spacing
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-28 13:11:38 +02:00
Javier Segarra d98717f253 Merge pull request 'Zone Locations' (!390) from hyervoni/salix-front-mindshore:feature/ZoneLocations into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #390
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-28 10:53:26 +00:00
Javier Segarra 909c545106 Merge branch 'dev' into feature/ZoneLocations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-28 10:46:53 +00:00
Alex Moreno c88934218a Merge pull request 'feat: refs #7494 new icons' (!409) from 7494-icons into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #409
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-05-28 10:20:52 +00:00
Alex Moreno d15f31de03 Merge branch 'dev' into 7494-icons
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-28 10:19:49 +00:00
Alex Moreno 93fb3096e0 feat: refs #7494 new icons
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-28 12:17:51 +02:00
Alex Moreno 35f7a6036e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-05-28 12:13:06 +02:00
Jorge Penadés 5aa3b14014 refactor: refs #6942 WIP summary layout
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-28 11:39:49 +02:00
Jorge Penadés 3c0936b2ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-28 09:01:24 +02:00
Alex Moreno 9f18c12c33 feat: refs #7494 new icons
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-28 08:56:59 +02:00
Alex Moreno 8304dcb0a5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-05-28 07:48:51 +02:00
William Buezas 8d7568d9a2 Search childs fix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-27 14:40:33 -03:00
William Buezas fcaca42b1f resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-27 12:35:59 -03:00
William Buezas a2df7b5cf7 small fix
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 12:32:13 -03:00
Jorge Penadés 4c3a64bfa6 refactor: refs #6942 new summary layout 2024-05-27 17:14:37 +02:00
William Buezas f2df252a94 improvement 2024-05-27 10:32:10 -03:00
Jorge Penadés df6e6c66a9 fix: refs #6942 import
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 14:53:50 +02:00
Jorge Penadés 90cebb85fe reafactor: refs #6942 use meta moduleName
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 14:51:23 +02:00
Jorge Penadés 332e96f184 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-27 14:36:57 +02:00
Carlos Satorres ff251fbb85 Merge pull request 'refs #7391 fix textarea' (!402) from 7391-defaulterMods into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #402
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-27 11:59:10 +00:00
Carlos Satorres 4162e040cc Merge branch 'dev' into 7391-defaulterMods
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-27 11:58:11 +00:00
Jorge Penadés 30cec965e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-27 13:36:34 +02:00
Jorge Penadés ef9f8b8705 refactor: refs #6942 store key & actions
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-27 13:36:16 +02:00
Juan Ferrer 24c0a62edf Merge branch 'test' into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-05-27 13:32:19 +02:00
William Buezas b408e0daaf remove on selected 2024-05-27 08:29:52 -03:00
William Buezas c304c68c9e Zone tree abstraction 2024-05-27 08:29:24 -03:00
Jorge Penadés b6f11096f3 feat: refs #6942 url update
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-27 09:07:22 +02:00
Jorge Penadés 3b799efa22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-27 08:57:34 +02:00
Jorge Penadés 66c6c857db fix: refs #6942 drop console.log 2024-05-27 08:57:21 +02:00
William Buezas d9e6baf7e3 Move container card to parent view 2024-05-26 20:57:45 -03:00
Javier Segarra cedc3e5c83 Merge pull request '#6957 - Change color FetechedTags' (!407) from 6957_changeColorFetechedTags into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #407
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-24 16:10:46 +00:00
William Buezas b4331ab2d2 remove import
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-24 13:02:28 -03:00
William Buezas 66955dbc90 mini fix
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-24 12:33:29 -03:00
William Buezas 9e264e6f1f Improvement 2024-05-24 12:27:15 -03:00
Javier Segarra 5c711c1bcb perf: 6957 add color as new shared variable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-24 14:34:57 +02:00
Javier Segarra f25385961b perf: 6957 change fetchedTags color 2024-05-24 14:34:44 +02:00
Carlos Satorres c7d7ae5373 Merge pull request 'refs #7396 fix summary' (!406) from fix-basicDataWorker into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #406
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-05-24 12:02:11 +00:00
Carlos Satorres ba5407310f refs #7396 fix summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-24 13:40:00 +02:00
Jorge Penadés 933e0be028 fix: refs #6942 e2e tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-24 12:10:27 +02:00
Jorge Penadés d460b198a4 fix: refs #6942 skip e2e tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-24 11:43:54 +02:00
Carlos Satorres f1c688af89 refs #7391 fix textarea
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-24 10:08:10 +02:00
Jorge Penadés 1c76d86710 fix: refs #6942 e2e tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-24 09:56:16 +02:00
Jorge Penadés 12016f8653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-24 09:02:24 +02:00
Alex Moreno b531370e2c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-05-24 08:33:27 +02:00
Carlos Satorres 70e5b207e5 Merge pull request 'fix: refs #6095 add reFfk null on search' (!383) from 6095-add-refFk-null-on-search into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #383
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-24 06:29:58 +00:00
Carlos Satorres 4bacc8d836 Merge branch 'dev' into 6095-add-refFk-null-on-search
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-24 06:28:34 +00:00
Javier Segarra 515561b75d Merge pull request '#6957: FetchedTags refactor template' (!382) from 6957_refactorFetechedTags into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #382
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-05-24 06:18:24 +00:00
Javier Segarra d015a2e217 Merge branch 'dev' into 6957_refactorFetechedTags
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-24 08:15:11 +02:00
Javier Segarra 4b9e9a84c5 Merge pull request 'Zone Upcoming deliveries' (!381) from hyervoni/salix-front-mindshore:feature/UpcomingDeliveries into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #381
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-05-24 06:14:43 +00:00
Javier Segarra cabee09052 Merge branch 'feature/UpcomingDeliveries' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/UpcomingDeliveries
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-24 08:13:40 +02:00
Javier Segarra 286fe0d20c Merge branch 'dev' into feature/UpcomingDeliveries 2024-05-24 08:13:37 +02:00
Alex Moreno f12c9d5a9e refactor: add flat
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-24 07:55:54 +02:00
Jorge Penadés 75c2800e55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-23 16:49:18 +02:00
Jorge Penadés b6638e3545 refactor: refs #6942 use router hook
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-23 16:48:50 +02:00
Carlos Satorres a603f37144 refs #7391 fix textarea
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-23 15:54:57 +02:00
Carlos Satorres 4bf4d754a2 Merge pull request 'refs #6111 fix qtable, actions, scroll' (!264) from 6111-modsRouteList into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #264
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-23 12:48:28 +00:00
Carlos Satorres 6388f08ffb Merge branch 'dev' into 6111-modsRouteList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-23 12:47:38 +00:00
Carlos Satorres 0dfd00dbfc Merge pull request '#6332 - calendarMods' (!391) from 6332-calendarMods into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #391
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-23 12:39:51 +00:00
Carlos Satorres bfdd319366 Merge branch 'dev' into 6332-calendarMods
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-23 12:36:36 +00:00
Jorge Penadés d153cc9c24 fix: refs #6942 unit tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-23 14:19:39 +02:00
Jorge Penadés 4a6d09ae2c feat: refs #6942 use correct currency in InvoiceIn components
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-23 14:04:35 +02:00
Carlos Satorres 8b8033cb3d refs #6095 remove limit
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-23 13:21:54 +02:00
Jorge Penadés e8fed46dd1 fix: refs #6942 cardDescriptor use store if its popup or different source data
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-23 12:33:13 +02:00
Carlos Satorres 74f25f54ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6095-add-refFk-null-on-search
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-23 11:55:49 +02:00
Jorge Penadés af32c4b79c fix: refs #6942 drop console 2024-05-23 11:24:29 +02:00
Carlos Satorres 2432a37211 refs #6111 fix sticky
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-23 10:26:54 +02:00
Jorge Penadés c6477af493 fix: refs #6942 formModel watch changes & invoiceInCreate 2024-05-23 09:29:50 +02:00
Carlos Satorres 6ea942bf31 refs #6111 fix merge, fix column
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-23 09:24:50 +02:00
Carlos Satorres 66c841114b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6111-modsRouteList 2024-05-23 09:23:11 +02:00
Jorge Penadés c73599692b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-23 09:00:45 +02:00
Jon Elias 406c095ed2 Merge pull request '#6652 improved defaulter section' (!394) from 6652-improveCustomerDefaulter into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #394
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-23 06:34:59 +00:00
Jon Elias 566ef90cbe Merge branch 'dev' into 6652-improveCustomerDefaulter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-23 06:34:10 +00:00
Jorge Penadés 7685c38fb7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-22 16:45:58 +02:00
Javier Segarra 722f1e8a03 Merge branch 'dev' into feature/ZoneLocations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 14:00:06 +00:00
William Buezas e43485f19c resolve conflict
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 10:57:33 -03:00
William Buezas 1347e4ec40 Handle params search on mounted 2024-05-22 10:56:37 -03:00
Carlos Satorres 1a4d8bb0c0 Merge pull request '6820-changeKmroute' (!395) from 6820-changeKmroute into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #395
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-22 13:56:18 +00:00
Javier Segarra e2b72f132c Merge remote-tracking branch 'origin/dev' into feature/ZoneLocations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 15:49:23 +02:00
Javier Segarra 3fded533a6 perf: remove local tree variable 2024-05-22 15:49:11 +02:00
William Buezas f4807d887f Improve node management when using search bar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 10:20:36 -03:00
Carlos Satorres 6b474bfd06 Merge branch 'dev' into 6820-changeKmroute
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 12:53:40 +00:00
Jorge Penadés 3db3d04bc9 fix: refs #6942 formModel & CardDescriptor 2024-05-22 13:57:12 +02:00
Carlos Satorres e4ebf4c4db refs #6820 fix traduction
gitea/salix-front/pipeline/pr-dev Build queued... Details
2024-05-22 13:44:53 +02:00
Carlos Satorres 2746ea7f5e Merge pull request 'remove right' (!389) from fix-CalendarTimeControlRightPanel into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #389
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-22 10:56:10 +00:00
Carlos Satorres 499e104daa Merge branch 'dev' into fix-CalendarTimeControlRightPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 10:49:43 +00:00
Carlos Satorres 506b5dd9c2 refs #6820 fix error front
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 12:24:08 +02:00
Jorge Penadés 5bddc6e04d fix: refs #6942 wip: formModel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-22 11:22:46 +02:00
Carlos Satorres 98449b0c1e refs #6111 scroll horizontal
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-22 10:23:10 +02:00
Javier Segarra d900ed3764 Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 10:22:05 +02:00
Javier Segarra f6051472ef style: color transparent when is fetive 2024-05-22 10:21:06 +02:00
Jon Elias 77e3104047 Merge branch 'dev' into 6652-improveCustomerDefaulter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 08:10:52 +00:00
Jon Elias 2af4df8ded refactor: refs #6652 improved defaulter section
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 10:07:58 +02:00
Carlos Satorres c1bcc0379d refs #6332 fix festive
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 09:35:56 +02:00
Javier Segarra eaa0288f25 update 2024-05-22 09:27:48 +02:00
Jorge Penadés 467531d029 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 09:17:18 +02:00
Javier Segarra a0ca26ad9b Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 08:56:10 +02:00
Javier Segarra 0e0f649ff9 fix: 9-12 2024-05-22 08:54:37 +02:00
Carlos Satorres 81f7e06143 refs #6332 fix calendar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 08:35:01 +02:00
Javier Segarra 3d6fac5338 Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 08:28:51 +02:00
Javier Segarra 2094506baf fix: WorkerCalendarItem 2024-05-22 08:27:09 +02:00
Alex Moreno 56804900d9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-05-22 08:05:23 +02:00
Javier Segarra ad328d9c51 Merge branch 'dev' into 6957_refactorFetechedTags
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 00:00:58 +02:00
Carlos Satorres 27c86288e1 refs #6332 color red button
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-21 16:14:55 +02:00
William Buezas 990e3f6e75 handle searchbar dataKey change
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-21 09:13:36 -03:00
Carlos Satorres bacc07a4ca remove right
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-21 12:04:56 +02:00
Carlos Satorres 99d16d215f refs #6332 colors 2024-05-21 11:56:30 +02:00
Alex Moreno a8fef3fa84 deploy: init version
gitea/salix-front/pipeline/head This commit looks good Details
2024-05-21 11:30:00 +02:00
Jorge Penadés 5f10d25630 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-21 09:04:17 +02:00
William Buezas b26bf10e70 Apply searchbar logic 2024-05-20 15:53:38 -03:00
William Buezas 7466d03f15 resolve conflicts 2024-05-20 08:46:08 -03:00
Carlos Satorres 9f517eb59d refs #6820 fix BasicData Tickets 2024-05-20 12:40:47 +02:00
Javier Segarra febc88203d style: fix color when is empty
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 11:16:05 +02:00
Jorge Penadés c1a6bca508 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-20 09:31:58 +02:00
Jorge Penadés cda9e71197 refactor: refs #6942 Fix getTotalAmount function to correctly calculate the total amount in InvoiceInDueDay.vue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-20 09:31:31 +02:00
Jorge Penadés 2366ef772f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-20 08:55:35 +02:00
William Buezas 202473158c resolve conflicts 2024-05-19 14:21:32 -03:00
Javier Segarra 7197881cdd style: reset poc style
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-18 08:53:46 +02:00
Javier Segarra 632acc13ac style: reset poc style
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-18 08:53:08 +02:00
Jorge Penadés 81998a4137 refactor: refs #6942 summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-17 17:26:58 +02:00
Jorge Penadés 7f880b397c fix: refs #6942 fix vncard 2024-05-17 17:26:00 +02:00
Jorge Penadés 1abcb4796f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-17 14:36:22 +02:00
Javier Segarra 41e2462b49 Merge branch 'dev' into 6957_refactorFetechedTags
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-17 11:58:38 +00:00
Javier Segarra 08e6703853 style updates
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-17 13:57:01 +02:00
Javier Segarra 24eeb5519a style updates 2024-05-17 13:52:45 +02:00
Javier Segarra 49b562ca44 Merge branch 'dev' into feature/UpcomingDeliveries
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-17 12:30:55 +02:00
Javier Segarra 8e4c74c1cc fix: style 2024-05-17 12:26:45 +02:00
Pablo Natek 676e020928 fix: refs #6095 add reFfk null on search
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-17 10:55:43 +02:00
Javier Segarra dba42a6001 feat: #6957: Rename FetchedTags instance tag
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-16 23:02:49 +02:00
Javier Segarra 38d7c96c00 feat: #6957: Rename FetchedTags instance tag 2024-05-16 23:01:55 +02:00
Javier Segarra 77a454b590 feat: refactor template
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-16 20:59:51 +00:00
William Buezas a35ccb5b51 Zone Locations 2024-05-16 16:38:27 -03:00
Carlos Satorres adde8d1ab8 refs #6332 fix colors 2024-05-15 16:00:56 +02:00
William Buezas cbe44c97f6 Upcoming deliveries
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-14 12:03:43 -03:00
Carlos Satorres 40a3815e85 refs #6111 clean code fix changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-12 10:27:30 +02:00
Carlos Satorres 2eaa184fe0 refs #6111 fix trad remove logs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-10 13:20:56 +02:00
Carlos Satorres a78e86a0b9 refs #6111 routeList fix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-05 14:25:32 +02:00
Carlos Satorres da24b4d836 refs #6111 onMounted
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-05 13:39:43 +02:00
Carlos Satorres cddef039d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6111-modsRouteList 2024-04-05 13:29:59 +02:00
Carlos Satorres ce02d21b3b refs #6111 fix routeList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-05 08:50:33 +02:00
Carlos Satorres 0cfcda7062 refs #6111 fix visibleColumns
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-03 15:00:36 +02:00
Carlos Satorres 9833a5946a refs #6111 create visible columns 2024-04-02 12:48:39 +02:00
Carlos Satorres c0c94ff924 refs #6111 fix qtable, actions, scroll 2024-03-27 13:09:10 +01:00
Jorge Penadés 4216839d96 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-25 14:58:11 +01:00
Jorge Penadés 9f4f268603 Merge branch '6942-improveInvoceIn' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-15 09:34:49 +01:00
Jorge Penadés 15efff6855 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-03-15 09:31:55 +01:00
Javi Gallego c0a7574cbf feat: 6942 hashtag in key : value summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-13 07:50:51 +01:00
Jorge Penadés 252d9e3a50 fix: refs #6942 table bottom highlight & drop isBooked field
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-12 10:22:40 +01:00
Jorge Penadés de6f85eba7 fix: refs #5186 validation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-11 13:49:23 +01:00
Jorge Penadés 0b44d08808 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-03-11 13:49:02 +01:00
Jorge Penadés 058b21669f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-11 08:23:56 +01:00
Jorge Penadés db632f3c11 feat: refs #6942 to book summary button & reactive value
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-08 16:52:58 +01:00
Jorge Penadés 24700b5441 fix: refs #6942 drop comments
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-07 15:49:01 +01:00
Jorge Penadés 6ed6e4150a feat: refs #6942 test e2e tobook & toUnbook
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-07 15:46:38 +01:00
Jorge Penadés 92dcff6d49 fix: refs #6942 tests e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-07 14:54:20 +01:00
Jorge Penadés 3b0d3b4998 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-03-07 14:29:33 +01:00
Jorge Penadés bf92a3681d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-03-07 09:45:18 +01:00
Jorge Penadés 862194b454 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 16:24:14 +01:00
Jorge Penadés 9cbffff627 fear: refs #6942 save and continue btn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 16:23:19 +01:00
Jorge Penadés 2e19194a08 fix: refs #6942 reloading
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 14:36:37 +01:00
Jorge Penadés 3d5674128f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 12:31:33 +01:00
Jorge Penadés ec3b44654e fix: refs #6942 vnLocation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 10:24:20 +01:00
Jorge Penadés 110fd3b7a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 10:22:33 +01:00
Jorge Penadés c1804790a8 fix: refs #6942 vnLocation
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 10:19:14 +01:00
Jorge Penadés 48bde504c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-03-06 09:35:21 +01:00
Jorge Penadés 5551781bac feat: refs #6942 to unbook
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-05 16:26:56 +01:00
Jorge Penadés 87d458e196 feat: refs #6942 vat rate total
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-05 09:23:14 +01:00
Jorge Penadés 0fd83cf435 fix: refs #6942 changes and new features
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-05 08:59:06 +01:00
Jorge Penadés c8ba7f5214 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-04 13:37:06 +01:00
Jorge Penadés e10e06bcd4 fix: refs #6942 selectable expense
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-04 08:25:43 +01:00