Commit Graph

3003 Commits

Author SHA1 Message Date
Jorge Penadés 59b85f24ea fix: refs #6273 console error
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 14:19:10 +02:00
Jorge Penadés 8d89fc2d90 feat: refs #6273 set payMethod to 0
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 14:08:18 +02:00
William Buezas 4c84fd9326 resolve conflicts 2024-06-07 09:03:41 -03:00
Javier Segarra 21a412f688 Merge branch 'dev' into feature/MailAliases
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 10:53:17 +00:00
Alex Moreno dce95824be fix(AccountAlias): fix and optimization
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 12:51:38 +02:00
Jon Elias deb6b448fb Merge branch 'dev' into 7003-fixedPriceOrder
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 10:48:09 +00:00
Jon Elias d6bd3de971 refactor: refs #7003 fixed order param
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 12:47:18 +02:00
Jon Elias 290325b677 refactor: refs #7003 changed order filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 12:45:22 +02:00
Jorge Penadés 213ba4ba52 chore: refs #6273 Add default pay method for internal
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 12:24:48 +02:00
Jorge Penadés 8b93dbc57d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 12:15:04 +02:00
Jorge Penadés 6368342be1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 12:04:00 +02:00
Jorge Penadés d35f9c9468 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 12:03:52 +02:00
Alex Moreno c392b44195 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-06-07 12:03:41 +02:00
Javi Gallego 9ceac32d89 feat: refs #7548 grafana 2024-06-07 11:59:26 +02:00
Jorge Penadés bd7b3c2d06 feat: refs #7542 drop space
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-06-07 11:54:26 +02:00
Jorge Penadés 5922838fcd feat: refs #7542 empty
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-06-07 11:54:06 +02:00
Carlos Satorres 3729817c2b Merge branch 'dev' into 6905-fixUserPanelLocal
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 09:47:48 +00:00
Pablo Natek 5197211cf0 Merge branch 'dev' into 7499-refactorEntrys
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 09:38:51 +00:00
Pablo Natek d0dccddcf3 fix: refs #7499 id article
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 11:37:11 +02:00
Javier Segarra 5551077c92 fix: roles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 11:16:15 +02:00
Javier Segarra 6053d42442 fix: descriptor and i18n 2024-06-07 11:09:46 +02:00
Javier Segarra 567c9ad307 Merge branch 'dev' into feature/MailAliases
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 10:46:24 +02:00
Javier Segarra edad698f72 fix: update list when update record
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 10:21:41 +02:00
Javier Segarra 6c608e86e6 Merge branch 'feature/AccountAcls' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountAcls
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 10:19:55 +02:00
Javier Segarra 0ea44eb8db Merge branch 'dev' into feature/AccountAcls 2024-06-07 10:07:15 +02:00
Jorge Penadés c0c066fd98 fix: refs #7542 use right panel
gitea/salix-front/pipeline/pr-dev Build queued... Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-06-07 09:52:44 +02:00
Javier Segarra ec5d5e52f4 Merge branch 'dev' into feature/ZoneCalendar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 09:32:51 +02:00
Alex Moreno a56df46678 fix(AccountAcls): fix and optimization
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-07 09:07:58 +02:00
Javier Segarra 7880f66c6e Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 00:59:20 +02:00
Javier Segarra 2a85fe21b0 Merge branch 'dev' into 6911-saveOnEnter 2024-06-07 00:46:42 +02:00
Javier Segarra 1237dd5c10 fix: style workweek
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-07 00:13:49 +02:00
Javier Segarra 17c3a89264 fix: show exclusionEvent in Calendar
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-07 00:01:35 +02:00
Javier Segarra a26401d8eb feat: hide ID
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-06 23:51:45 +02:00
Javier Segarra e178778264 fix: styles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-06 23:46:26 +02:00
Javier Segarra fe3ad9dc08 fix: styles and i18n
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-06 23:40:52 +02:00
Javier Segarra 17924dfeb3 fix: styles and i18n
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-06 23:39:38 +02:00
William Buezas f305cee3ce Account view forms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-06 14:07:40 -03:00
Alex Moreno 985ce9a643 deploy: test to dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
2024-06-06 12:24:08 +02:00
Jorge Penadés 5d041e2d03 fix: refs #6942 fix emit on reset
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-06-06 12:14:00 +02:00
Jorge Penadés b27ae621f3 Merge branch 'dev' into 6891-addToggleFilterPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-06 08:45:12 +00:00
Jorge Penadés 97dc299cfe fix: refs #6942 fix emit on data saved
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-06-06 09:53:48 +02:00
Javier Segarra 26c7b09b8a perf: improve handleKeyUp method
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-06 07:50:24 +00:00
Alex Moreno 454527b0a7 remove console.log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-06 09:34:42 +02:00
Alex Moreno aee3c67ee0 clean code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-06 09:33:01 +02:00
Alex Moreno 395eb6bed7 Merge branch 'dev' into feature/AccountRoles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-06 07:32:15 +00:00
Jon Elias 516b905305 feat: refs #7502 new icons v1.73 2024-06-06 08:38:19 +02:00
Javier Segarra fe9adb7a3c perf: minor changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-06 08:09:05 +02:00
Javier Segarra f3ec9ea58d fix: VnPaginate order
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-06 08:03:57 +02:00
William Buezas 9ed297207b Make create form work
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-05 14:52:45 -03:00
Javier Segarra f453f42b06 feat: New and edit ACL from Popup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-05 19:37:53 +02:00
Javier Segarra 807460dfad fix: info icon
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-05 18:14:41 +02:00
Jorge Penadés 382591fb11 fix: refs #6273 set paymethodFk to 0 if it is external
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-05 17:13:52 +02:00
Carlos Satorres b852faf91f refs #6905 fix userPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-05 08:58:12 +02:00
William Buezas 9f6d0b4dc9 Remove roles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-04 15:15:12 -03:00
William Buezas 946aa6b24d Small changes 2024-06-04 15:10:00 -03:00
Jorge Penadés 7e0ceca623 feat: refs #6273 freelance form & vnRadio
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-04 17:38:04 +02:00
William Buezas c71877cdb1 Account connections
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-04 12:23:28 -03:00
Javi Gallego 857aca49dd feat: refs #4560 sin DeliveryMan
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-04 14:06:04 +02:00
William Buezas c96e6482f9 remove mail alias content 2024-06-04 08:42:32 -03:00
William Buezas 3efca6242d Account ACLs 2024-06-04 08:41:41 -03:00
Jon Elias 535798af25 feat: refs #7502 new Lilium icons
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-04 11:53:24 +02:00
Javi Gallego f1df969fa6 feat: refs #560 refactor descriptor 2024-06-04 10:52:00 +02:00
Javi Gallego 5f00f3bad4 Merge branch 'dev' into 4560-gastos-reparto 2024-06-04 09:42:44 +02:00
Jorge Penadés 0b0754f76e refactor: refs #6273 replace QBtnGroup with QRadio for worker type selection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-04 09:33:51 +02:00
Jorge Penadés de4ea6271b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-04 09:00:57 +02:00
Jorge Penadés 1bc99cbd22 feat: refs #6243 show all cmrs & filter by warehouse
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-03 16:30:59 +02:00
Jorge Penadés b93b630c6a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-03 15:21:44 +02:00
Jorge Penadés 0b92e98511 fix: refs #6891 show cross
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-03 15:19:33 +02:00
Javier Segarra ef47b34569 Merge branch 'dev' into feature/MailAliases
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-03 13:09:54 +00:00
Javier Segarra 0d1453ddeb feat: isPublic checkbox
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-03 15:09:34 +02:00
Javier Segarra 668dc5fd53 fix: List without limit 2024-06-03 15:09:21 +02:00
Jorge Penadés f55e9d7c32 fix: refs #6891 Optimize RightMenu component rendering
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-03 14:20:46 +02:00
Jorge Penadés e6f0e6b089 refactor: refs #6891 Remove unused i18n
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 14:12:49 +02:00
Jorge Penadés 2a61ca4dbb refactor: refs #6891 drop isHeaderMounted condition
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 14:11:40 +02:00
William Buezas 8320a75e61 make searchbar work
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-03 09:03:37 -03:00
Jorge Penadés 36ff4e9312 refactor: refs #6891 searchbar teleport 2024-06-03 12:58:26 +02:00
Jorge Penadés c78828d6a6 refactor: refs #6891 Move filter panel rendering to RightMenu component 2024-06-03 12:29:44 +02:00
Javi Gallego 56a46cd130 4560 2024-06-03 11:52:19 +02:00
Javi Gallego ca4193e11a Merge branch 'dev' into 4560-gastos-reparto 2024-06-03 11:31:33 +02:00
Jorge Penadés 217f9bd86c fix: refs #6891 rollback 2024-06-03 11:25:21 +02:00
Jorge Penadés 3a0f99ac22 feat: refs #6891 Add collapse menu button to filter panel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-03 11:10:46 +02: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
Jon Elias aabf5420b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7003-fixedPriceOrder
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-03 08:47:34 +02:00
William Buezas 1c14841233 Several changes 2024-05-31 14:02:50 -03:00
Javier Segarra 0ad839dfc6 src/pages/Order/Card/OrderCatalogItemDialog.vue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-31 14:40:16 +02:00
Javier Segarra e6a1c31119 fix: src/pages/InvoiceOut/InvoiceOutGlobalForm.vue 2024-05-31 14:31:41 +02:00
Javier Segarra 59f9cf4111 fix: src/pages/InvoiceIn/Card/InvoiceInBasicData.vue 2024-05-31 13:56:46 +02:00
Javier Segarra 25d5887a57 fix: src/pages/Entry/Card/EntryBuysImport.vue 2024-05-31 13:42:49 +02:00
Javier Segarra 492e333d2f fix: i18n VnNotes 2024-05-31 13:40:19 +02:00
Javier Segarra d8bf95008a fix: src/components/EditPictureForm.vue 2024-05-31 13:33:03 +02:00
Javier Segarra d5dc9d974c fix: ClaimBasicData form 2024-05-31 13:20:55 +02:00
Javier Segarra 5139bba5a0 fix: handle VnNotes keyup 2024-05-31 12:37:30 +02:00
Javier Segarra 0450986025 fix InvoiceInBasicdata 2024-05-31 12:01:18 +02:00
Javier Segarra d072fc858d Merge branch 'dev' into 6911-saveOnEnter 2024-05-31 11:59:29 +02:00
Javier Segarra 28173ddee2 Merge branch 'dev' into feature/AccountRoles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-31 10:24:37 +02:00
Javier Segarra 4268f15d30 perf: remove unnecessary submodules 2024-05-31 10:23:03 +02:00
Javier Segarra 2c9ff60399 Merge branch 'dev' into feature/ZoneCalendar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-31 09:28:48 +02:00
William Buezas 4bd78922af remove unnecesary files
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-30 15:43:26 -03:00
William Buezas 05b7df9168 Role submodules 2024-05-30 15:34:37 -03:00