Commit Graph

4994 Commits

Author SHA1 Message Date
Jorge Penadés ed4a4e1e59 fix: refs #7353 rollback
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-17 12:57:43 +02:00
Jorge Penadés 2cb2ce16ef fix: refs #7353 locale
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-17 12:56:50 +02:00
Jorge Penadés 3f03f0d4e9 fix: refs #7353 show unremovable params
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-17 12:41:57 +02:00
Javier Segarra 29e4c723c9 Merge branch 'dev' into 6943_fix_customer_module 2024-09-17 12:12:41 +02:00
Jorge Penadés 4edcff41f1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixFilter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-17 11:39:07 +02:00
Jorge Penadés 56f8cbe615 fix: refs #7353 sales person filter and locale
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-17 11:37:44 +02:00
Jon Elias 58cd0b54cf Merge branch 'dev' into 6346-WagonTypeToCard
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-17 09:08:00 +00:00
Carlos Satorres 044156356c hotfix searchbar
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-17 10:37:22 +02:00
Alex Moreno 3d1bb0c67a fix(itemDescriptor): fix redirection to itemDiary
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-17 10:20:44 +02:00
Pablo Natek 7faa0c240f Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-17 10:10:40 +02:00
Javier Segarra e4adbfa9f7 Merge branch 'dev' into 7677_vnLocation_perf
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-17 07:29:00 +00:00
Alex Moreno 37b6a03288 fix(itemDescriptor): fix redirection to itemDiary
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-17 09:25:53 +02:00
Alex Moreno b4cee6b02f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-09-16 14:24:22 +02:00
Javier Segarra 603fb1de71 Merge branch 'dev' into 7017_formModel_validations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-16 11:58:15 +00:00
Javier Segarra cf95cd7db7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customer_module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-16 13:33:28 +02:00
Javier Segarra 6ffd985575 perf: CustomerBasicData.salesPersonFk 2024-09-16 13:33:07 +02:00
Jon Elias cb87f4dce1 Merge branch 'dev' into 6346-WagonTypeToCard
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-16 11:04:29 +00:00
Jon Elias ae76bd0b0e refactor: refs #6346 wagons to VnTable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-16 12:58:06 +02:00
Javier Segarra eb8690a422 fix: remove promise execution
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-16 10:30:04 +00:00
Javier Segarra d384894bf0 fix: rule
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-16 10:29:36 +00:00
Jorge Penadés 8577f33599 Merge branch 'dev' into 7828-makeCorrectCalls
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-16 10:24:45 +00:00
Pablo Natek 263dc29d7a fix: refs #7404 remove console.log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-16 12:19:03 +02:00
Javier Segarra 27069e56b8 Merge branch 'dev' into 6943_fix_customer_module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-16 10:11:29 +00:00
Alex Moreno 4c8238455f fix(ClaimList): fix summary
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-16 10:03:12 +02:00
Alex Moreno 8c4e4a16af fix(VnSectionMain): add QPage
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-16 09:19:08 +02:00
Pablo Natek c59c8127cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-16 08:59:46 +02:00
Pablo Natek deb30ee955 feat: refs #7404 travel m3 form
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-16 08:59:36 +02:00
Guillermo Bonet 07e45f2051 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-09-16 07:17:38 +02:00
Guillermo Bonet 57b939bdd5 Merge branch 'test' into dev 2024-09-16 07:17:25 +02:00
Guillermo Bonet b6ee1ac2bc Merge branch 'master' into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-09-16 07:17:12 +02:00
Javier Segarra 93488a5750 fix: styles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 23:19:16 +02:00
Javier Segarra b6cce74449 fix: merge conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 23:11:18 +02:00
Javier Segarra 401400bdcf fix: remove FetchData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 22:52:26 +02:00
Javier Segarra ed5ba1dd1a Merge branch 'dev' into 7017_formModel_validations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 22:50:13 +02:00
Javier Segarra 9c36a113e1 Merge branch 'dev' into 7671_dense_itemFixedPrices
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 20:17:01 +00:00
Javier Segarra 6e6af0af80 perf: improve style
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 15:16:40 +02:00
Guillermo Bonet eca34e2c0f feat: refs #7644 Icon
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-13 14:57:33 +02:00
Jon Elias 6f9e46f7a0 fix: refs #7553 deleted log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 13:01:07 +02:00
Carlos Satorres 842fb9de5f refs #7155 scopeDays fix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 12:52:25 +02:00
Jon Elias c291ea267c refactor: refs #7553 added clickable event in transfer sales like Salix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 12:07:45 +02:00
Jorge Penadés 48a5c15b9d feat: refs #7828 create axios instance which no manage errors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 10:54:09 +02:00
Javier Segarra 5796bc9c0a fix: emit:updateModelValue 2024-09-13 10:32:40 +02:00
Javier Segarra 025436b4b8 Merge branch 'dev' into 7677_vnLocation_perf
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 09:27:38 +02:00
Javier Segarra a5ea940dd8 fix: Customer module find salesPersons out of first get
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 09:23:15 +02:00
Jorge Penadés 46fb7d0c73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 09:20:14 +02:00
Jorge Penadés dcde6a1b9d Merge branch 'test' into 7353-warmfix-fixSearchbar
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-13 07:19:42 +00:00
Jon Elias 4a0b92eded Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-13 09:05:26 +02:00
Alex Moreno 0dbcc4be3d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-09-13 08:57:27 +02:00
Alex Moreno f731e4f1a6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-09-13 08:57:14 +02:00
Carlos Satorres 8be1833f9e refs #7155 scopeDays
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 08:49:36 +02:00
Jon Elias ed5987630f Merge branch 'dev' into 6346-fixWagonModule
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 06:14:05 +00:00
Jon Elias eca4b02022 Merge branch 'dev' into 7500_ChangeEntryDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 06:10:34 +00:00
Javier Segarra b36f072b24 Merge branch 'dev' into 6943_fix_customer_module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 21:26:43 +02:00
Javier Segarra aca13d9119 fix: CustomerBillingData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 21:26:28 +02:00
Javier Segarra fa408dc226 fix: CustomerAddress mobile 2024-09-12 21:20:30 +02:00
Javier Segarra 6e784bb290 fix: address-create i18n 2024-09-12 21:11:51 +02:00
Javier Segarra 54fc7f6394 fix: CustomerRecovery transalate label 2024-09-12 21:10:06 +02:00
Javier Segarra 39f2deafc4 fix: CustomerCreditOpinion workerDescriptor 2024-09-12 21:08:41 +02:00
Javier Segarra 70d0132710 fix: CustomerWebPayment 2024-09-12 21:03:19 +02:00
Javier Segarra 24f4af712e fix: CustomerMandates 2024-09-12 20:59:35 +02:00
Javier Segarra 8fc7e3cfb4 fix: CustomerSamples 2024-09-12 20:43:50 +02:00
Javier Segarra a29ee42b9e fix: CustomerBasicData show id assigned 2024-09-12 20:41:50 +02:00
Jorge Penadés 6adcaff5d8 fix: refs #7524 dynamic load
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-12 16:48:39 +02:00
Alex Moreno dcb8c5daad fix: workerDms filter workerFk
gitea/salix-front/pipeline/head This commit looks good Details
2024-09-12 13:27:28 +02:00
Jon Elias bb1eb30a25 fix: refs #7553 changed fields in order in purchase request table
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 13:22:53 +02:00
Javier Segarra cfdfc7f531 fix: CustomerSamples 2024-09-12 13:19:37 +02:00
Jorge Penadés 44fd356d63 feat: refs #7828 useAcl & cherry pick mail data worker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 13:19:31 +02:00
Jon Elias b4c46dc153 refactor: refs #7553 modified ticketSummary QChips, deleted useless code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 13:13:56 +02:00
Jorge Penadés adb9cac360 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 13:11:11 +02:00
Jon Elias b8f6bc26ad Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 12:34:55 +02:00
Jon Elias d00a88a3f4 refactor: refs #7500 deleted useless code 2024-09-12 12:34:54 +02:00
Jon Elias be389c6736 Merge branch 'dev' into 7500_ChangeEntryDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 10:32:47 +00:00
Jon Elias 35247007f0 Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 12:31:03 +02:00
Jon Elias e5056c45c0 fix: refs #7500 fixed showing images wrongly 2024-09-12 12:31:00 +02:00
Javier Segarra 058039fd61 Merge branch 'dev' into 5938_filterGrouped
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 10:27:36 +00:00
Javier Segarra a3afe790b9 fix: CustomerGreuges 2024-09-12 12:00:07 +02:00
Javier Segarra c22f8f1069 fix: stop call back event hasMoreData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 09:57:31 +00:00
Javier Segarra c7adb91912 feat: use disableInifiniteScroll property
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 09:56:37 +00:00
Javier Segarra 3892df250c fix: #5938 grouped filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 08:53:46 +00:00
Jon Elias 4a1f5e922c refactor: refs #7553 align ticket sale qdrawer fields
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 10:19:21 +02:00
Jon Elias 6a5f31ff1e fix: refs #7553 fixed conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 10:14:38 +02:00
Javier Segarra 9941975683 fix: infiniteScroll
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 08:07:53 +00:00
Alex Moreno 368e013f54 Merge branch 'master' into hotFix_claimList_attenderFk
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-12 07:59:16 +00:00
Jorge Penadés 1dffa8865e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 09:55:30 +02:00
Jorge Penadés 59f6913a74 fix: refs #7323 add correct label
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-12 09:43:08 +02:00
Jorge Penadés d92659289b fix: refs #7323 add correct label
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-12 09:41:29 +02:00
Jorge Penadés 22bc8f2414 fix: refs #7323 show user name
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-12 09:33:06 +02:00
Alex Moreno 9d055a48c4 Merge branch 'dev' into 7792-accountBasicData_twoFactorFk
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 07:29:47 +00:00
Jorge Penadés 6b79d70551 refactor: refs #7828 wip 2024-09-12 09:14:55 +02:00
Alex Moreno d822bb6f20 fix(ClaimList): attenderFk filter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-12 09:12:36 +02:00
Pablo Natek e2dbe0fd38 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-12 09:09:21 +02:00
Alex Moreno 4a234dd875 fix: duplicate code
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 08:31:57 +02:00
Alex Moreno 8bf7b729d4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
2024-09-12 08:26:10 +02:00
Alex Moreno 8d04d50a13 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-09-12 08:26:01 +02:00
Jon Elias 18fc5e241c fix: refs #7903 fixed ticket's search bar and keybinding tooltip
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-11 14:07:31 +02:00
Javier Segarra 8d96539b24 perf: solve reload CardSummary component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-11 13:18:54 +02:00
Javier Segarra c3108b4335 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-11 12:48:38 +02:00
Javier Segarra f02ca7437c Merge branch 'dev' into 6156-advanceTicketsNewField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-11 10:27:12 +00:00
Jorge Penadés 9219fa07f5 fix: refs #7353 hide search param
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-11 11:23:14 +02:00
Jon Elias 422907447b refactor: refs #7553 merge conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-11 10:27:08 +02:00
Jon Elias d1138529b2 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-11 10:26:52 +02:00
Carlos Satorres 1c9e13fe15 refs #7962 fix claimSummary
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-11 10:23:27 +02:00
Jorge Penadés b559f2f18c refactor: refs #7353 use global locales
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-11 10:18:11 +02:00
Jon Elias ff7bcfb00a refactor: refs #7553 modified ticket sale to create a row in the table
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-11 10:16:42 +02:00
Jorge Penadés 2b012d2de4 fix: refs #7353 use same datakey 2024-09-11 10:04:40 +02:00
Jorge Penadés 2d5602e784 Merge branch 'dev' into 7663-setWeight
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-11 07:40:36 +00:00
Alex Moreno e2d3154878 fix(ClaimLines): not reload when change quantity
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-11 09:21:30 +02:00
Javier Segarra 2d8322c6da fix: remove FIXME
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-11 09:20:54 +02:00
Jorge Penadés 49f90801a8 Merge branch 'test' into 6772-warmfix-fixE2e
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-11 07:09:46 +00:00
Javier Segarra 19eb770893 feat: remove cli warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-11 08:41:16 +02:00
Alex Moreno 97da106522 hotFix: keyBinding toUpperCase if is null
gitea/salix-front/pipeline/head This commit looks good Details
2024-09-11 08:33:25 +02:00
Alex Moreno e7fb6a7963 hotFix: keyBinding toUpperCase if is null
gitea/salix-front/pipeline/head This commit looks good Details
2024-09-11 08:32:59 +02:00
Javier Segarra b2535dedcf Merge branch 'dev' into 5938_fine_ticketAdvance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-11 06:29:27 +00:00
Pablo Natek c7e717c611 feat: refs #7404 add travel m3 to reserves form
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-11 07:55:12 +02:00
Javier Segarra b5dcc865e0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-10 15:17:25 +02:00
Javier Segarra 622afca9be feat: CustomerSample to VnTable 2024-09-10 15:17:10 +02:00
Jorge Penadés a41143b410 chore: refs #6772 fix e2e
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-10 14:43:35 +02:00
Jorge Penadés 77f2a4d825 fix: refs #6900 rollback 2024-09-10 14:36:44 +02:00
Jorge Penadés 070c9ca25f fix: refs #6900 e2e error 2024-09-10 14:17:59 +02:00
Carlos Satorres 7b2545798c fix(account_privileges): fix url update
gitea/salix-front/pipeline/head This commit looks good Details
2024-09-10 12:38:09 +02:00
Javier Segarra bcfa67baec Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-09-10 12:26:17 +02:00
Javier Segarra 113ebd23a6 Merge branch 'dev' into 5938_fine_ticketAdvance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-10 09:49:23 +00:00
Jon Elias e7a89138ba fix: refs #7553 fix conflicts 2024-09-10 11:47:38 +02:00
Carlos Satorres 8c57bca4e0 hotfix cau #218919 accountPrivileges fix
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-10 10:36:41 +02:00
Jorge Penadés 5cc1d0cec4 chore: refs #7663 drop useless code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-10 10:04:40 +02:00
Jorge Penadés f9adc49284 Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-10 09:41:34 +02:00
Jorge Penadés 3fafb15eb8 refactor: refs #4074 use fn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-10 09:18:57 +02:00
Jorge Penadés f7975069d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-10 08:59:01 +02:00
Jon Elias b4fb9ceb2e Merge branch 'dev' into 6346-fixWagonModule
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-10 06:29:51 +00:00
Jon Elias abc39633bf Merge branch '6346-fixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-10 08:28:49 +02:00
Jon Elias 30ffb2428e perf: refs #6346 previous changes 2024-09-10 08:28:48 +02:00
Alex Moreno 3164209bef Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-10 08:13:56 +02:00
Jon Elias 6790067a89 Merge branch 'dev' into 6346-fixWagonModule
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-10 06:02:18 +00:00
Jon Elias e1adb1a8dd refactor: refs #6346 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-10 08:01:28 +02:00
Javier Segarra d347a81d74 Merge branch 'dev' into 7671_dense_itemFixedPrices
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-10 05:19:02 +00:00
Jon Elias 4786a0e277 Merge branch 'dev' into 7889-KeyShortcuts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-10 04:45:24 +00:00
Javier Segarra 7e74123459 Merge branch '7671_dense_itemFixedPrices' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-10 00:18:12 +02:00
Javier Segarra d734674eb6 fix: minor changes 2024-09-10 00:18:09 +02:00
Javier Segarra b4b65ad0fd fix: minor error whit dates 2024-09-10 00:17:59 +02:00
Javier Segarra 41939315be style: show subName value 2024-09-10 00:17:39 +02:00
Javier Segarra 9c86fd0ed5 perf: order by 2024-09-10 00:17:13 +02:00
Javier Segarra 7358dab1d0 fix: call upsert when crudModel haschanges 2024-09-10 00:16:01 +02:00
Jorge Penadés f3471fe5ab fix: refs #4074 await to watch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 17:20:16 +02:00
Jorge Penadés f8cbb0a762 chore: refs #4074 fix tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 17:10:35 +02:00
Jorge Penadés 26c7dfde35 chore: refs #4074 fix tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 16:44:43 +02:00
Javier Segarra 67b2cd3a0b feat: stateGroupedFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 14:58:26 +02:00
Javier Segarra b3f305a3fd Merge branch 'dev' into 7671_dense_itemFixedPrices
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 12:17:59 +00:00
Jorge Penadés ee62f85250 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 13:59:13 +02:00
Jon Elias 6248a4117d refactor: refs #7553 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 13:52:41 +02:00
Jorge Penadés ac421344d0 fix: refs #7909 add originFk
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-09 13:41:04 +02:00
Jorge Penadés 803c02b80d fix: refs #7909 rollback scroll 2024-09-09 13:38:27 +02:00
Javi Gallego 7c22a5d0ac feat: fix refund parameters
gitea/salix-front/pipeline/head This commit looks good Details
2024-09-09 13:18:51 +02:00
Javier Segarra 52d8ff8ae2 fix: isFullMovable checkbox 2024-09-09 13:15:45 +02:00
Javier Segarra 7bc288ad71 fix: state cell 2024-09-09 13:15:37 +02:00
Jorge Penadés 5ce3ef8bea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7909-hotfix-addScroll 2024-09-09 13:03:39 +02:00
Jorge Penadés 381b236a18 refactor: refs #4074 use acl & drop useless roles
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 12:56:37 +02:00
Alex Moreno 070f0da757 Merge branch 'dev' into 7547-accessToken-security
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 10:55:22 +00:00
Javier Segarra 83d3246377 Merge branch 'dev' into 6156-advanceTicketsNewField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 10:48:44 +00:00
Carlos Satorres 15a764d1cf refs #7283 fix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 12:35:47 +02:00
Jorge Penadés 6438f36eca refactor: refs #4074 accept array
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 12:28:14 +02:00
Javier Segarra 2667d3afae feat: show preparation field
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 12:07:22 +02:00
Carlos Satorres 6c78fb1bee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor 2024-09-09 12:06:01 +02:00
Carlos Satorres 3004d77d34 refs #7283 fix ItemDescriptor warehouse
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 12:05:08 +02:00
Jorge Penadés 803ce3b909 refactor: refs #4074 rollback
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 11:53:59 +02:00
Jorge Penadés c978cca8c5 refactor: refs #4074 useAcl in navigationStore & router
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 11:35:49 +02:00
Jon Elias f78ca3f357 Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule 2024-09-09 10:04:44 +02:00
Jorge Penadés bef9b05b45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 10:03:51 +02:00
Jon Elias 5f546a47bf Merge branch 'dev' into 7500_ChangeEntryDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 08:02:17 +00:00
Alex Moreno 684215fc46 feat(AccountBasicData): add twoFactorFk
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 09:59:22 +02:00
Jon Elias 6a96b252b4 Merge branch 'dev' into 7889-KeyShortcuts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 07:47:40 +00:00
Jon Elias 0b961050a0 refactor: refs #7553 rollback ticket advance due to slot problems
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 08:14:53 +02:00
Jon Elias 94ae74ca7f Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 08:10:06 +02:00
Jon Elias 4630496361 refactor: refs #7553 changed fields in ticket component & ticket filter 2024-09-09 08:10:05 +02:00
Jon Elias 459551b16e Merge branch 'dev' into 7889-KeyShortcuts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 05:30:14 +00:00
Jon Elias b61e2a5c28 Merge branch 'dev' into 7500_ChangeEntryDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 05:27:53 +00:00
Javier Segarra 53e6c67ff9 perf: minor clean code 2024-09-08 12:56:40 +02:00
Pablo Natek e083d6a802 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-08 07:54:26 +02:00
Javier Segarra 754f047943 perf: order components 2024-09-07 21:55:08 +02:00
Javier Segarra 0c1cd47d38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices 2024-09-07 16:38:06 +02:00
Jorge Penadés 18c952c0fc refactor: refs #7323 drop useless code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 17:51:13 +02:00
Jorge Penadés b87e7ce750 refactor: refs #4074 use VnTitle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 17:01:23 +02:00
Jorge Penadés d0131dd552 fix: refs #4074 drop wrong acl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 15:52:06 +02:00
Jorge Penadés 3693ba0c99 feat: refs #4074 drop useless code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 15:37:33 +02:00
Carlos Satorres 27f25f611f refs #7283 fix ItemDescriptor warehouse
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 14:57:10 +02:00
Javier Segarra 3276548f88 fix: editTableOptions
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 14:47:29 +02:00
Javier Segarra 31b8088b5f perf: improve ItemFixedPricefilterPanel 2024-09-06 14:41:38 +02:00
Jorge Penadés 86e1396da4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 14:23:04 +02:00
Javier Segarra a8057b47dc feat: updates 2024-09-06 14:06:30 +02:00
Jon Elias 4636e2f2e6 Merge branch 'dev' into 7553_FixTicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 12:05:07 +00:00
Jorge Penadés 635cc94652 Merge branch 'dev' into 7323-fetchFromScope
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 12:01:24 +00:00
Jon Elias 04f4521a59 Merge branch 'dev' into 7553_FixTicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 12:00:41 +00:00
Jon Elias 0e5607d685 feat: refs #7553 ticket component to vntable and fixed minor errors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 13:59:50 +02:00
Jorge Penadés 34a9b4d4d0 Merge branch 'dev' of https: refs #4074//gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 13:23:02 +02:00
Javier Segarra 9bb298bbeb feat: handle create row 2024-09-06 13:14:46 +02:00
Jorge Penadés 2f7dd3c22e feat: refs #7847 remove reload fn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 12:49:33 +02:00
Jorge Penadés 64752bbace feat: refs #7847 remove reload btn 2024-09-06 12:44:20 +02:00
Jorge Penadés b13874e8a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 11:30:24 +02:00
Javier Segarra e592a76946 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices 2024-09-06 10:42:07 +02:00
Jon Elias ef98f60486 refactor: refs #7889 modified shortcut and dashboard, and added tootlip in LeftMenu
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 10:30:32 +02:00
Jon Elias 5d78f564dd refactor: refs #7889 deleted subtitle attr and use keyBinding instead
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 10:00:07 +02:00
Jorge Penadés 5d91b03f9a fix: dynamic fetch
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-06 09:27:55 +02:00
Jon Elias 585919a4d9 feat: refs #7889 added shortcuts to modules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 09:19:38 +02:00
Jorge Penadés f0351b0417 chore: refs #7323 worker changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 09:05:29 +02:00
Carlos Satorres d6d5039f48 Merge branch '7283-fixItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 07:50:42 +02:00
Carlos Satorres 6db1c8f083 fix traduction 2024-09-06 07:50:39 +02:00
Pablo Natek cd12343302 feat: refs #7404 add some style to the form and reorganize fields
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 07:26:04 +02:00
Jon Elias 8ff9dae1d8 refactor: refs #7553 requested changes 2024-09-06 07:16:03 +02:00
Jon Elias 102f7fb13e Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-06 07:15:48 +02:00
Javier Segarra 1f96f5c09a feat: orderCreateDialog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 22:20:57 +02:00
Javier Segarra b3391ab522 perf: minor comments
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 20:51:33 +02:00
Javier Segarra 31abd8b4c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 19:45:41 +02:00
Javier Segarra af91ca43e0 Merge branch 'dev' into 7283-fixItemDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 13:57:53 +00:00
Javier Segarra 6476a8307a perf: i18n 2024-09-05 15:08:59 +02:00
Javier Segarra 62cdc1d527 feat: CustomerCreateTicket
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-05 14:56:50 +02:00
Jon Elias db6f4fd15a refactor: refs #7553 deleted logs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 14:32:22 +02:00
Jon Elias 6321ed4ee2 Merge branch 'dev' into plus_key_shortcut
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 11:08:52 +00:00
Jon Elias b6e14c4e6a fix: refs #7911 fixed shortcut and related files
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 13:08:02 +02:00
Carlos Satorres c8d6a67011 fix tootltip
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 12:49:17 +02:00
Carlos Satorres d4da8fc69f fix branch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 12:48:31 +02:00
Carlos Satorres 99b65c564c fix branch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 12:41:21 +02:00
Carlos Satorres fc7cc86362 fix branch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 12:39:55 +02:00
Carlos Satorres 8fe6fad4a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 12:07:18 +02:00
Carlos Satorres 83969f1d57 fix traduction
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-05 12:05:53 +02:00
Carlos Satorres 3999936ec1 Merge branch 'master' into 6943-fixCustomerSamples
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-05 08:58:20 +00:00
Carlos Satorres 95b19b5cce refs #7283 refactor fix ItemDescriptor
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-05 10:04:58 +02:00
Jon Elias 70806769ce feat: refs #7911 added shortcut to modules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 08:25:28 +02:00
Jon Elias 96cdb85258 Merge branch 'dev' of https: refs #7911//gitea.verdnatura.es/verdnatura/salix-front into 7911-plus_key_shortcut
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 07:42:55 +02:00
Javi Gallego c2e2d5ca81 feat: minor fixes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 18:30:20 +02:00
Javi Gallego 91164da2eb feat: refuncInvoiceForm component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 18:16:40 +02:00
Javier Segarra cf3b9b2ef8 perf: CustomerSummary 2024-09-04 17:55:27 +02:00
Javi Gallego 5d7e6be17c Merge branch 'dev' into 7277-RefundInvoices 2024-09-04 17:51:02 +02:00
Jorge Penadés af5e47ed3e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 16:06:31 +02:00
Carlos Satorres 716270ef92 Merge branch 'dev' into 7407-MedicalWorker2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 12:53:09 +00:00
Carlos Satorres 61c0f63eaf refs #6943 add try catch get
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-04 14:46:21 +02:00
Carlos Satorres bcdd6965e6 refs #6943 add try catch
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-04 14:43:48 +02:00
Carlos Satorres d08748b1a4 refs #6943 fix sampleType
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-04 14:41:35 +02:00
Pablo Natek 717bf1c3e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-04 14:40:53 +02:00
Pablo Natek 3dc720e2d0 feat: refs #7404 add m3 and fix detail
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-04 14:40:36 +02:00
Carlos Satorres b29a56d7dd refs #6943 remake, refactor, clean code Samples
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-04 14:37:39 +02:00
Jon Elias 65e3fd874d Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 14:15:58 +02:00
Jon Elias f5eacea483 refactor: refs #7553 modified QDrawer and table columns
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-04 14:12:27 +02:00
Jon Elias 4602f4c7b3 refactor: deleted useless prop
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 12:25:05 +02:00
Jon Elias 1889aa85b5 refactor: refs #7553 deleted expedition code and slot in VnTable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 11:49:49 +02:00
Jorge Penadés 763cf2e345 refactor: refs #6900 create setRectificative composable
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-04 10:30:14 +02:00
Carlos Satorres 1f9d1b79ab refs #7283 refactor ItexDescriptor 2024-09-04 10:17:57 +02:00
Jon Elias 19ae1f9d80 refactor: deleted useless prop in FetchedTags 2024-09-04 10:05:18 +02:00
Jon Elias beaa9ab5c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderMissingDetails 2024-09-04 09:53:47 +02:00
Carlos Satorres 3a703141c6 Merge branch 'dev' into 7407-MedicalWorker2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 07:49:14 +00:00
Jon Elias 5edea7cad1 Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 09:11:06 +02:00
Jon Elias 0d9773a30f refactor: refs #7553 added default date in new expedition modal 2024-09-04 09:11:05 +02:00