Commit Graph

8711 Commits

Author SHA1 Message Date
Javier Segarra ba3f6a79e6 style: customerList 2025-01-27 14:31:54 +01:00
Javier Segarra b266c44d34 fix: sage params 2025-01-27 14:30:59 +01:00
Javier Segarra 8cbb97af29 Merge branch 'test' into warmifx_customer_filters 2025-01-27 14:08:59 +01:00
Javier Segarra 0916afbe37 fix: changel i18n 2025-01-27 14:04:37 +01:00
Javier Segarra 9dd216269a fix: vnSelectWorker fix template 2025-01-27 14:03:38 +01:00
Javier Segarra d1ba6e580f fix: params 2025-01-27 13:52:44 +01:00
Javier Segarra 13cd59c6bb fix: socialName filter 2025-01-27 13:52:37 +01:00
Alex Moreno 1322dad63d fix(VnCardBeta): add userFilter 2025-01-27 08:29:42 +01:00
Alex Moreno 198db0df49 fix(VnCardBeta): add userFilter 2025-01-27 08:23:09 +01:00
Alex Moreno f7b1d7bd37 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-24 11:47:13 +01:00
Alex Moreno 658747d479 fix: empty store.order 2025-01-24 11:45:03 +01:00
Alex Moreno e6279ff261 build: merge master in test 2025-01-24 08:38:24 +01:00
Alex Moreno d0176303da Merge pull request 'fix: order when is string' () from hotFix_fixOrderStringArray into master
Reviewed-on: 
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-24 07:32:58 +00:00
Javier Segarra 2c6d3de784 Merge branch 'master' into hotFix_fixOrderStringArray 2025-01-24 07:25:46 +00:00
Javier Segarra c61e4d30f6 Merge pull request 'Replace GoToUser by NewOrder from CustomerDescriptor' () from hotfix_customerDescriptor_orderBtn into master
Reviewed-on: 
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-01-24 07:24:59 +00:00
Alex Moreno 5b448e5bb3 fix: order when is string 2025-01-24 08:24:12 +01:00
Javier Segarra f0dc7b4a41 fix: import component 2025-01-24 08:19:53 +01:00
Javier Segarra d5ea4fb46d perf: eslint 2025-01-24 00:26:31 +01:00
Javier Segarra 00c90b29e9 fix: remove "Go to module index" i18n value 2025-01-24 00:24:19 +01:00
Javier Segarra f4adedb4f1 fix: replace GoToUser by NewOrder 2025-01-24 00:23:31 +01:00
Alex Moreno a58f31f7d8 fix: change name 2025-01-23 07:18:28 +01:00
Javier Segarra 3ef43531c3 Merge pull request 'style: perf max-width rule' () from hotfix_checbox_css into master
Reviewed-on: 
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-01-22 13:09:48 +00:00
Javier Segarra 0658785a9a style: perf max-width rule 2025-01-22 13:03:23 +00:00
Jon Elias 3b0d0afddb Merge pull request 'Warmfix[WorkerDescriptor]: link to DepartmentDescriptor' () from Warmfix-WorkerDescriptorLink into test
Reviewed-on: 
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-22 10:03:34 +00:00
Jon Elias bb2c3fef51 fix: department descriptor link 2025-01-22 09:36:56 +01:00
Javier Segarra 4e0967a26c Merge pull request 'HOTFIX: use clientFk to filter data' () from hotfix_customerConsumption_clientFk into master
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 11:45:10 +00:00
Javier Segarra 61e410aa1d fix: use clientFk to filter data 2025-01-21 11:16:38 +00:00
Alex Moreno f3fbfe41bb Merge pull request '8448-devToTest' () from 8448-devToTest into test
Reviewed-on: 
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-01-21 10:44:45 +00:00
Alex Moreno 6c6e4ca950 fix: refs #8448 not use croppie 2025-01-21 10:58:46 +01:00
Jorge Penadés a0fc8a528c Merge pull request '#8087 hotfix-addFilterFields' (!1257) from 8087-hotfix-addFilterFields into master
Reviewed-on: #1257
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 09:52:21 +00:00
Jon Elias 96d1ef7f68 fix: refs #8448 e2e 2025-01-21 10:48:04 +01:00
Jorge Penadés ae507167b7 feat: refs #8087 add additional filter fields to TravelCard component 2025-01-21 10:43:44 +01:00
Carlos Satorres 836f40867c Merge pull request 'fix: refs #6896 hotfix search' (!1255) from 6896-hotfixOrdersSearch into master
Reviewed-on: #1255
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 08:25:53 +00:00
Alex Moreno e9555a6017 Merge branch 'master' into 6896-hotfixOrdersSearch 2025-01-21 07:52:20 +00:00
Alex Moreno e6c16356be Merge pull request 'Fix(TicketService): Sort by name in description' (!1253) from Fix-TicketServicesSortByName into dev
Reviewed-on: #1253
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 06:50:57 +00:00
Alex Moreno bee5a1e82d Merge branch 'dev' into Fix-TicketServicesSortByName 2025-01-21 06:49:28 +00:00
Javi Gallego 590b4d9ca6 Merge pull request 'feat: refs #8381 add initial and final temperature fields to entry forms and summaries' (!1202) from 8381-entryTemperature into dev
Reviewed-on: #1202
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 06:48:30 +00:00
Javi Gallego 545cb19dce feat: refs #8381 add initial and final temperature labels in English and Spanish locales 2025-01-21 07:46:14 +01:00
Javi Gallego d21e11cc3d Merge branch 'dev' into 8381-entryTemperature 2025-01-21 07:45:44 +01:00
Javi Gallego 45c4e08191 Merge branch 'dev' into 8381-entryTemperature 2025-01-21 07:45:20 +01:00
Alex Moreno 3cb21d7117 fix: use entryFilter 2025-01-21 07:34:48 +01:00
Alex Moreno 824b60df57 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-21 07:33:09 +01:00
Alex Moreno 7357559c48 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-21 07:32:21 +01:00
Alex Moreno 44d3fa7634 Merge pull request 'fix: remove departmentCode' (!1240) from fix_customerList_departmentCode into dev
Reviewed-on: #1240
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 06:31:42 +00:00
Javier Segarra c86dbcb456 Merge branch 'dev' into fix_customerList_departmentCode 2025-01-20 22:13:30 +00:00
Javier Segarra 0b52be2568 Merge branch 'dev' into Fix-TicketServicesSortByName 2025-01-20 21:33:13 +00:00
Javier Segarra 0f8edae458 Merge pull request 'perf: remove warning default value' (!1241) from warning_defaultValue_firstParam into dev
Reviewed-on: #1241
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-20 17:30:10 +00:00
Javier Segarra c0144e78c4 Merge branch 'dev' into warning_defaultValue_firstParam 2025-01-20 17:29:21 +00:00
Jorge Penadés e1b329db34 Merge pull request '#7936 update select model-value' (!1247) from 7936-hotfix-autoComplete into master
Reviewed-on: #1247
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-20 14:42:57 +00:00
Jorge Penadés 0a97d0504b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-autoComplete 2025-01-20 15:41:55 +01:00