Commit Graph

8922 Commits

Author SHA1 Message Date
Jorge Penadés b9de2b3ce6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 17:18:37 +02:00
Jorge Penadés 32da39899a fix: refs #7211 test e2e
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 17:16:43 +02:00
Jorge Penadés 180a484c55 fix: refs #7211 rollback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 16:14:34 +02:00
Jorge Penadés f7cdbd39f0 fix: refs #7211 tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 16:08:52 +02:00
Jorge Penadés edeed037a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7211-fixWorkerTimeControl 2024-04-25 15:38:40 +02:00
Jorge Penadés 4e864fed52 fix: refs #7211 tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 15:38:21 +02:00
Javier Casado a9e4b2cd36 Merge branch 'dev' into 6697-removeClaimQuantity
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 11:46:53 +00:00
Jorge Penadés 931c2c4f5e feat: refs #7211 error & locale
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 13:12:06 +02:00
Jorge Penadés 6749722634 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 10:10:06 +02:00
Jorge Penadés c9dfccbc53 feat: refs #7211 add test & changelog
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 09:35:53 +02:00
Alex Moreno 917592cdad Merge pull request '7225-hotFix_ticket_advanced_movable a dev para probar' (!2366) from 7225-hotFix_ticket_advanced_movable into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2366
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-24 12:34:46 +00:00
Alex Moreno 69486fb29f fix(componentUpdate): refs #7225 fix transfer all lines to newTicket
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:15:27 +02:00
jcasado aeee012c2b refs #6697 fix sql test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 11:43:10 +02:00
jcasado 87d5e0a311 Merge branch '6697-removeClaimQuantity' of https://gitea.verdnatura.es/verdnatura/salix into 6697-removeClaimQuantity
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 11:19:17 +02:00
jcasado d1659ce04c refs #6697 fix claimQuantity 2024-04-24 11:19:15 +02:00
Alex Moreno 0cd740ce0c test: refs #7225 fix back test
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-24 10:42:50 +02:00
Javier Segarra f7d9cc8102 Merge pull request 'FIX bug Ticket-Request Filter' (!2355) from fix_itemFk_ticketRequest_filter into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2355
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-24 07:56:03 +00:00
Jon Elias 88ba6833be Merge pull request 'refactor: refs #6899 corrected Lilium styles and functionalities' (!2322) from 6899-endInvoiceOutMigration into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2322
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-24 07:36:55 +00:00
Javier Segarra 0fd120676d Actualizar modules/ticket/back/methods/ticket-request/filter.js
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 12:29:40 +00:00
Javier Casado 69ea518a49 Merge branch 'dev' into 6697-removeClaimQuantity
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-23 10:55:45 +00:00
Alex Moreno 60d5b9e4aa test: refs #7173 fix sql, adding alias
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-23 08:47:52 +02:00
Alex Moreno 85491613b0 test: refs #7173 fix fixtures 2024-04-23 08:47:28 +02:00
Sergio De la torre 23fa74a5ad Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 08:11:37 +00:00
Javier Segarra f6199f8f8e Actualizar modules/worker/back/models/worker.json
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 06:56:05 +00:00
Javier Segarra 283d27e1c5 Actualizar modules/worker/back/models/worker.json
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 06:22:36 +00:00
Jon Elias fa653f630c Merge branch '6899-endInvoiceOutMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6899-endInvoiceOutMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 07:37:49 +02:00
Jon Elias 9759ee4bd0 refactor: refs #6899 requested changes 2024-04-22 07:37:47 +02:00
Javier Segarra b4503afc47 Merge branch 'dev' into 6930_scope_Default_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 10:50:45 +02:00
Javier Segarra 30d0db163e feat(salix): refs #6930 minor updates 2024-04-19 10:50:14 +02:00
Javier Segarra 322d91d814 feat(salix): refs #6930 Add DEFAULT scope 2024-04-19 10:49:57 +02:00
Alex Moreno da7ab00c73 Merge branch 'dev' into 6899-endInvoiceOutMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 07:22:33 +00:00
Alex Moreno 5b5ec11973 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 08:58:17 +02:00
Jon Elias 9dedd5383c Merge branch 'dev' into 6899-endInvoiceOutMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 06:10:49 +00:00
Jon Elias f40c730f6e refactor: refs #6899 changed comercial value in negativeBases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 07:52:43 +02:00
Sergio De la torre f4afda8cb2 Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 14:52:57 +00:00
Alex Moreno 87e23b49e7 hotFix: change require to import
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-18 15:19:19 +02:00
Jon Elias 08ca1a302b Merge pull request 'refactor: refs #7139 replace warehouse with ticket' (!2323) from 7139-changeColumnsInRouteSummary into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Reviewed-on: #2323
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-18 12:55:58 +00:00
Sergio De la torre 279c300fbf Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 11:08:15 +00:00
Guillermo Bonet 2b11f85b67 Merge pull request 'feat: refs #6724 permissions to vn.entry.isBooked' (!2147) from 6724-permisos-vn.entry.isBooked into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2147
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-18 11:06:47 +00:00
Jon Elias f7a6d47c04 Merge pull request 'feat: #7130 added "served" field to RouteList table(Salix).' (!2219) from 7130-addFieldInRoutes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2219
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-18 09:34:35 +00:00
Sergio De la torre 958759dc80 Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 08:12:46 +00:00
Sergio De la torre e909d64757 refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 10:01:22 +02:00
Alex Moreno 9143447eb8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 09:27:46 +02:00
Alex Moreno af06ef30d4 hotFix(workerDms): document.isDocuware
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 08:50:17 +02:00
Jon Elias d42aab346f refactor: refs #7139 replace warehouse with ticket
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 08:17:43 +02:00
Jon Elias f41177643f refactor: refs #6899 corrected Lilium styles and functionalities
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 08:01:16 +02:00
Sergio De la torre 32e2827287 refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-17 13:55:07 +02:00
Sergio De la torre a3c8532661 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-17 13:27:00 +02:00
Javier Segarra 6214da2c42 feat(salix): refs #6930 Undo rollback salix-back 2024-04-17 09:52:53 +02:00
Guillermo Bonet 9f9662924d Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!2306) from 6968-groupingModeRefactor into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2306
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-17 06:48:43 +00:00