Commit Graph

6337 Commits

Author SHA1 Message Date
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 d072a11c1b Merge pull request 'refs #6156 new field' (!688) from 6156-advanceTicketsNewField into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #688
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-11 10:34:47 +00: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
Carlos Satorres 98056b2bcb Merge pull request 'refs #7962 fix claimSummary' (!698) from 7962-hotfixClaimLines into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #698
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-11 09:34:32 +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 aa5ef76dcf Merge pull request '#7663 ticket setWeight' (!612) from 7663-setWeight into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #612
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-11 07:42:17 +00: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 b9c721728f Merge pull request 'fix(ClaimLines): not reload when change quantity' (!696) from hotFix_claimLine_noReload into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #696
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-09-11 07:31:31 +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 568fd9ae1a Merge pull request '#6772 warmfix fix e2e' (!695) from 6772-warmfix-fixE2e into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #695
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-11 07:12:34 +00: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 3781ee97cb 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-11 08:33:32 +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 a0eea16c35 Merge pull request '#5938 Fix & Fine Advance Tickets' (!690) from 5938_fine_ticketAdvance into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #690
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-11 06:30:11 +00: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
Jorge Penadés a8d4457365 Merge pull request '#4074 useAcls' (!584) from 4074-useAcls into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #584
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-10 11:50:43 +00:00
Jorge Penadés 05c91e2a29 Merge branch 'dev' into 4074-useAcls
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-10 11:45:15 +00: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 8e35737c8e 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-10 11:47:40 +02:00
Jon Elias e7a89138ba fix: refs #7553 fix conflicts 2024-09-10 11:47:38 +02:00
Carlos Satorres 1ba66bcba2 Merge pull request 'hotfix cau #218919 accountPrivileges fix' (!694) from hotfix218919-accountPrivilegesFix into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #694
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-10 08:40:02 +00: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
Alex Moreno 6d017d8c99 build: init version 2440
gitea/salix-front/pipeline/head This commit looks good Details
2024-09-10 10:33:55 +02:00
Alex Moreno 1094daf530 Merge pull request '7953-devToTest_2438' (!693) from 7953-devToTest_2438 into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #693
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-09-10 08:31:28 +00: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