Commit Graph

1891 Commits

Author SHA1 Message Date
Ivan Mas 019e29f3dd Merge branch 'dev' into 7393-Night_tcket_closing_report
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-17 11:48:57 +00:00
Alex Moreno ae2ddcb8c7 add console.log
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 12:20:58 +02:00
Alex Moreno e5bfb4af23 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 12:20:22 +02:00
Alex Moreno 4ff388198b fix(deletExpeditions): add try catch
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 10:14:41 +02:00
Robert Ferrús 4ff61a75e0 Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-17 06:26:26 +00:00
Pablo Natek f83dd37a28 fix: refs #6403 remove line
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-17 08:23:33 +02:00
Pablo Natek 0ea69427ec feat: refs #6403 add cancelShipment on deleteExpeditions
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-17 08:16:01 +02:00
Ivan Mas 1d10e61541 Merge branch 'dev' into 7393-Night_tcket_closing_report
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 17:14:08 +00:00
Pablo Natek d2f022ab64 Merge branch 'dev' into 6403-feat-add-mrw-delete-on-salix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 11:44:54 +00:00
Pablo Natek b7e84f43de feat: refs #6403 add delete
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 13:26:20 +02:00
Sergio De la torre dc5903421b refs newStatePartial refs #7642
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-15 16:21:19 +02:00
Sergio De la torre 87b0d3e8d1 refs newStatePartial refs #7642
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-15 16:18:30 +02:00
Robert Ferrús d85f40d725 Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 05:28:16 +00:00
Guillermo Bonet dcde6bb37a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 14:04:50 +02:00
Guillermo Bonet 1e264c2102 fix: refs #7704 Warehouse priority 2024-07-12 14:04:49 +02:00
Robert Ferrús 625ab07e48 Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 10:01:12 +00:00
Robert Ferrús 4da811cba6 Merge branch 'dev' into 7670-addSaleRenewPrice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 08:50:48 +00:00
Guillermo Bonet 910071bde0 refactor: refs #7704 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 09:11:55 +02:00
Guillermo Bonet 5c80a99543 feat: refs #7704 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 07:58:59 +02:00
Robert Ferrús 39b52e706a feat: refs #7615 setDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 14:51:34 +02:00
Guillermo Bonet 69e0d78537 feat: refs #7704 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 14:31:17 +02:00
Guillermo Bonet f1b0b95442 feat: refs #7704 Refactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 11:47:06 +02:00
Guillermo Bonet 2e48263636 feat: refs #7704 Fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 11:10:01 +02:00
Guillermo Bonet 823756d71a feat: refs #7704 Optimization
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 10:29:26 +02:00
Guillermo Bonet 7ba2e8d4c5 feat: refs #7704 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 09:48:31 +02:00
Guillermo Bonet 02bcfd9be3 feat: refs #7704 Major changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 08:57:45 +02:00
Robert Ferrús 36b1beeebf Merge branch 'dev' into 7670-addSaleRenewPrice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 09:44:54 +00:00
Guillermo Bonet 0b61a175ef Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-07-09 14:49:51 +02:00
Carlos Satorres 944cf3baa3 refs #7694 hotfix filter
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-09 11:44:43 +02:00
Carlos Satorres 02c2ccd62e stash filterState 2024-07-09 11:00:02 +02:00
Alex Moreno 776fd05648 fix: send rocket after commit cau 199307
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-04 12:45:52 +02:00
Robert Ferrús 1fff3aa681 feat: refs #7670 addSale
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-04 12:34:56 +02:00
Jorge Penadés 12f29aa50e Merge pull request '#6449 addColumnLogTables' (!2277) from 6449-addColumnLogTables into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2277
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-07-03 08:51:56 +00:00
Jon Elias 4bdbb3b08e Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 07:13:21 +00:00
Jorge Penadés 1c6dd17f90 Merge branch 'dev' into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 07:10:41 +00:00
Guillermo Bonet a23f485296 refactor: refs #7424 Component type refactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 11:11:16 +02:00
Alex Moreno 95a23ad9fc Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 11:43:42 +00:00
Guillermo Bonet 134c38b9fd refs #6753 Hotfix
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 08:57:21 +02:00
Jon Elias 419de69690 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-20 12:24:06 +02:00
Alex Moreno f84e85e443 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-20 09:48:34 +02:00
Carlos Andrés c596cae0c0 Merge pull request 'fix: asociar ticketRefund refs #7586' (!2592) from 7586---Proceso-abonar-tickets/facturas-desde-Salix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2592
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-19 12:22:32 +00:00
Javi Gallego df4b3add8d fix: refs #6408 quito state.js
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-19 07:59:45 +02:00
Carlos Andrés 9b118f83e5 fix: asociar ticketRefund refs #7586
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-14 17:56:24 +02:00
Jon Elias 0bf384b2ce Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-14 07:06:30 +00:00
Jon Elias d3f23a6d7a fix: refs #6436 fix filter test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-14 09:04:18 +02:00
Jon Elias 61a588b57c refactor: refs #6436 fixed test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-14 08:39:57 +02:00
Jon Elias 84a51d3e8d feat: refs #6436 changed tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 12:23:37 +02:00
Alex Moreno b5ecf2e3b5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-12 10:11:14 +02:00
Alex Moreno de0f0623e1 Merge branch 'master' into 6408-hotFix_updateQuantity
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-12 08:07:25 +00:00
Alex Moreno d9b0a1a75c fix(updateQuantity): fix rocket translation
gitea/salix/pipeline/pr-master Build queued... Details
2024-06-12 09:59:58 +02:00
Alex Moreno 789e0e65e3 fix(sale): rocket is only sent if it has sales
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-12 09:12:48 +02:00
Jon Elias 2b45c2c61a feat: refs #6436 new test changes, rollback order/filter and /ticket/clone
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 08:25:50 +02:00
Alex Moreno 1eee1d0e9b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-12 07:47:56 +02:00
Jorge Penadés d7d6de73c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 15:41:06 +02:00
Javi Gallego 4744f57269 Merge pull request 'feat: refs #7548 link a grafana' (!2568) from 7548-ticketSummaryCollection into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2568
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-11 12:54:06 +00:00
Javi Gallego 79c922300b hotfix #6408
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-11 14:50:47 +02:00
Jon Elias 944355d54f refactor: refs #6436 end first wave of changes in modules
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 13:17:19 +02:00
Jon Elias 665d03f048 refactor: refs #6436 user-config and some sections tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 12:35:44 +02:00
Jon Elias bd45352215 refactor: refs #6436 fourth wave
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 12:02:15 +02:00
Jorge Penadés 902a9ee51b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 10:43:33 +02:00
Alex Moreno 9c2ccc5df4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-11 09:59:09 +02:00
Jon Elias 7df7382346 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 09:41:26 +02:00
Guillermo Bonet 873f36fef6 refactor: refs #7503 Added relations and ACLs
gitea/salix/pipeline/head This commit looks good Details
2024-06-11 08:50:32 +02:00
Javi Gallego e081c4504d feat: refs #7548 link a grafana
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 14:51:48 +02:00
Javi Gallego f82f452423 Merge branch 'dev' into 7276_expeditionScanned
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 13:44:24 +00:00
Alex Moreno 379d7ef2ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-07 10:33:07 +02:00
Alex Moreno ca6afb9c10 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-07 10:32:49 +02:00
Sergio De la torre 268c0a984c feat isScanned refs #7276 2024-06-06 12:28:34 +02:00
Jon Elias c2e80060b3 Merge branch 'dev' into 6753-TicketsSaveSign
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 07:51:23 +00:00
Javi Gallego 143930bc86 fix: warmFix setDeleted checks ticketRequest not answered 2024-06-05 07:07:13 +02:00
Jorge Penadés 39dcb7d6a8 fix: refs #6889 check if has collection or sectorCollection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 10:30:20 +02:00
Jon Elias 340a8c119e refactor: refs #6753 fix saveSign
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 09:35:44 +02:00
Jorge Penadés dc8696b422 feat: refs #6889 add back tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 16:31:36 +02:00
Jorge Penadés 836cfcbd07 refactor: refs #6889 sale tests e2e
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-31 13:58:26 +02:00
Jorge Penadés 9578c506b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 12:58:05 +02:00
Alex Moreno bd82bb011a fix(transferInvoice): separate invoice functionality from generating PDF and adapt tests
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-31 08:44:30 +02:00
Jorge Penadés 002111d8d1 fix: refs #6889 allocate 'productionReviewer' role to revision dep. workers & check if is owner or reviewer
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-30 11:47:12 +02:00
Jorge Penadés 5158017edd fix: refs #6889 fix back tests 2024-05-30 11:21:42 +02:00
Jorge Penadés 05e6e10337 fix: refs #6889 fix back tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-30 10:04:34 +02:00
Javi Gallego 5e55f2d92d feat: refs # 6408 test ok
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-30 09:35:42 +02:00
Jorge Penadés a32db7840e feat: refs #6889 fixtures & models
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 16:54:24 +02:00
Jorge Penadés fc606f7e36 fix: refs #6889 rollback
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 10:22:22 +02:00
Jorge Penadés 885aa5208a feat : refs #6889 wip: check if is productionReviewer or owner
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-28 17:23:58 +02:00
Jorge Penadés 56407e12a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-28 13:22:33 +02:00
Javi Gallego 1bcd7a9665 Merge branch 'dev' into 6408-rocketChat
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-28 12:46:37 +02:00
Javi Gallego 9ee05860f6 feat: #6408 tests 2024-05-28 12:19:54 +02:00
Jorge Penadés 9ecba10446 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 13:57:35 +02:00
Guillermo Bonet d384c5624f refactor: refs #7486 Deleted unused debugAll
gitea/salix/pipeline/head This commit looks good Details
2024-05-27 13:57:27 +02:00
Guillermo Bonet 6e06891937 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 11:44:26 +02:00
Guillermo Bonet d672385776 hotfix: Rectificación Pepe
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 11:44:11 +02:00
Javier Casado d0bb9d7690 Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 05:50:49 +00:00
Ivan Mas 52400ab626 refs #7393 Modify night ticket closing report
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 15:17:41 +02:00
Robert Ferrús 34f48e46e7 feat: refs #7296 requested changes2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 13:19:01 +02:00
Jorge Penadés 40762ba4aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 12:34:37 +02:00
Robert Ferrús 996f14341d Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 10:31:13 +00:00
Robert Ferrús 62ca4885c4 feat: refs #7296 requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 12:28:27 +02:00
Alex Moreno 9cba2be00d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-20 11:31:24 +02:00
Carlos Satorres 6d66c0f71f hotfix TicketLog filter
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-20 11:14:30 +02:00
Jorge Penadés 741c995c31 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 10:30:38 +02:00
Robert Ferrús e67981b382 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 06:44:31 +00:00
Guillermo Bonet 18ce388944 Merge branch 'test' into dev 2024-05-20 06:59:42 +02:00
Jorge Penadés 1f1a49d0a5 refactor: refs #6889 use addSale
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 14:20:33 +02:00
Javier Casado 5ee550ebf7 Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 12:08:41 +00:00
Guillermo Bonet 968effc936 hotfix: ticket 135539 Unroute tickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-17 11:56:04 +02:00
Robert Ferrús 11a0b98495 feat: refs #7296 roadmapStop
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-16 10:20:08 +02:00
Alex Moreno 8260016da5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-15 13:53:07 +02:00
Carlos Satorres 4b8cad9aef hotfix accessScopes
gitea/salix/pipeline/head This commit looks good Details
2024-05-15 13:23:36 +02:00
Javier Casado 03f0de489e Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 05:40:25 +00:00
Carlos Satorres 0d43d9a982 refs #6877 remove restriction
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 13:20:45 +02:00
Carlos Satorres 5e8e09cbae refs #6877 add attenderFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 13:42:58 +02:00
Jorge Penadés 74b04d98f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-02 16:38:56 +02:00
Guillermo Bonet 0ab79728b5 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-02 08:10:20 +02:00
Guillermo Bonet 7eb2e8f218 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-05-02 08:09:59 +02:00
Jon Elias 2b9bfb5d85 Merge pull request 'fix: refs #6731 fix ticketRequest' (!2364) from 6731-fixTicketRequestLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2364
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-30 10:19:29 +00:00
Alex Moreno d18f08e676 hotFix(addSaleByCode) add userId
gitea/salix/pipeline/head This commit looks good Details
2024-04-30 12:15:27 +02:00
Guillermo Bonet c987bb6e66 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-30 11:47:35 +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
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
Jon Elias 6706974784 fix: refs #6731 fix ticketRequest
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 10:31:26 +02: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
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 322d91d814 feat(salix): refs #6930 Add DEFAULT scope 2024-04-19 10:49:57 +02: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
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
Javier Segarra 6214da2c42 feat(salix): refs #6930 Undo rollback salix-back 2024-04-17 09:52:53 +02:00
Jorge Penadés c161c122d0 feat: refs #6449 add column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-11 15:56:17 +02:00
Guillermo Bonet 2226922366 Merge branch 'master' into test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-04-11 14:52:16 +02:00
Alex Moreno 99d80d4d30 hotFix(closeAll): continue loop
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-11 13:51:33 +02:00
Alex Moreno 93000aaecf Merge branch 'dev' into 6549-ticket_close
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 12:20:09 +00:00
Carlos Andrés fe0afe30bf fix: closeTicket idem salix Refs: #6549
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 17:50:39 +02:00
Carlos Andrés 9fcad457a7 fix: closeTicket idem salix Refs: #6549
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 14:46:51 +02:00
Alex Moreno 20e4ab1d2c Merge pull request 'hotFix: handle mail error' (!2253) from hotFix_handleMailErrors into master
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2253
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-04-04 11:35:09 +00:00
Alex Moreno dd9c7283c3 hotFix: handle mail error
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-04 13:32:39 +02:00
Sergio De la torre 9423a2d043 refs #3520 hotFix: hasUncheckedTickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-04 10:38:55 +02:00
Guillermo Bonet c685000b47 hotfix: refs #6930 Rollback tokenMultimedia
gitea/salix/pipeline/head This commit looks good Details
2024-04-04 10:13:56 +02:00
Alex Moreno ff2e00c51c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-04-03 16:24:45 +02:00
Alex Moreno 59ead0c2e5 debug(closure): add log
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-03 15:29:56 +02:00
Javier Segarra 8ab9063b50 refs #6436 feat: use mocks
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-01 11:00:55 +02:00
Sergio De la torre 8e6416d59c refs #3520 feat:uncheckedTicket
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-28 08:08:32 +01:00
Sergio De la torre 483345666e refs #3520 feat:back WarehouseFk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-27 11:01:32 +01:00
Sergio De la torre 2cf572baf8 refs #3520 hasUncheckedTicket
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-27 07:48:16 +01:00
Sergio De la torre a983f25c57 refs #3520 hasUncheckedTicket 2024-03-27 07:47:36 +01:00
Sergio De la torre 39b1e9ff7b refs #3520 hasUncheckedTicket 2024-03-27 07:26:11 +01:00
Sergio De la torre eaf3749440 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3520_wareshouse_back 2024-03-27 07:11:16 +01:00
Javier Segarra 38c5209c33 refs #6930 fix more endpoints
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 15:01:28 +01:00
Sergio De la torre b805a5de0a refs #3520 feat:uncheckedTicket 2024-03-26 12:40:44 +01:00
Sergio De la torre caf99a9738 refs #3520 feat:uncheckedTicket 2024-03-26 11:06:14 +01:00
Sergio De la torre dc5f588c8e refs #3520 feat: backWarehouse in Salix 2024-03-26 10:13:57 +01:00
Alex Moreno 2212899400 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 08:35:38 +01:00
Alex Moreno dce0155c00 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-26 08:18:47 +01:00
Sergio De la torre 386bc1c934 refs #6276 hotFix: setUserError and return 2024-03-25 13:00:55 +01:00
Jorge Penadés 0867f4d501 fix: refs #6951 var names & procedure name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 16:01:22 +01:00
Jorge Penadés e8d1967e11 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 15:14:12 +01:00
Sergio De la torre 9e5e49c28f refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-22 06:56:27 +01:00
Pablo Natek 130fb68d27 Merge pull request 'feat: refs #6302 delete after add to turn' (!2187) from 6302-delete-ticket-after-add-to-turn into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2187
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-21 09:28:39 +00:00
Sergio De la torre 9eee26cbe9 refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 10:18:54 +01:00
Alex Moreno b087c35a36 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-21 08:01:05 +01:00
Pablo Natek da8fbb5a92 fix: refs #6302 spec
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 21:14:01 +01:00
Pablo Natek f7b458d368 feat: refs #6302 delete after add to turn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-20 20:54:24 +01:00
Alex Moreno adddcc96aa Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-20 15:01:17 +01:00
Alex Moreno 7895a51e33 hotFix(closeAll): fix debug
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-20 12:15:41 +01:00
Carlos Andrés 913b261f86 Merge branch 'dev' into 6549-ticket_close
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-18 17:55:54 +01:00
Jorge Penadés 3c3dd64da1 feat: refs #6951 test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-18 09:39:56 +01:00
Jorge Penadés f044809f30 feat: refs #6951 to create back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 15:45:47 +01:00
Alex Moreno 8119106e69 hotFix: try to debug closeAll
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-15 15:40:54 +01:00
Alex Moreno 0ad052c34a refs #7033 deploy(2412): dev to test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-14 08:36:19 +01:00
Carlos Satorres 33bd21d40b refs #6755 fix model
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 16:29:05 +01:00
Carlos Satorres 1315bfda88 refs #6755 fix test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 14:18:53 +01:00
Carlos Andrés ff459ea3be fix: closeTicket idem salix refs #6549
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 12:18:43 +01:00
Carlos Satorres 106296be7b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 12:55:56 +01:00
Carlos Satorres ed57212618 refs #6755 fix restore
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 12:55:14 +01:00
Alex Moreno 8cda12a9da feat: refs #6925 check incoterms in closure and makeInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-08 07:49:00 +01:00
Alex Moreno c2ecedca71 feat: refs #6925 check incoterms in closure and makeInvoice 2024-03-08 07:48:55 +01:00
Carlos Satorres d4d3fdceb5 refs #6755 fix canRestoreTicket 2024-03-07 11:36:30 +01:00
Carlos Satorres 64d82d92d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor 2024-03-07 09:28:32 +01:00
Carlos Satorres 2e4a5029b8 refs #6755 fix restore 2024-03-06 14:52:49 +01:00
Alex Moreno 9ab0228714 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction 2024-03-06 13:58:10 +01:00
Carlos Satorres 1b3a8ddbdd refs #6755 fix restore 2024-03-06 12:03:35 +01:00
Jorge Penadés f600a99708 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-03-06 10:55:05 +01:00
Carlos Satorres 70096e7a76 refs #6755 fix restore 2024-03-05 14:24:32 +01:00
Guillermo Bonet 85d3508848 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-03-05 12:37:06 +01:00
Carlos Satorres 16fc446b85 refs #6755 fix method 2024-03-05 10:46:15 +01:00
Carlos Satorres cac388f986 refs #6755 fix ticket 2024-03-05 09:43:07 +01:00
Carlos Satorres 893320b114 refs #6755 model ticketlog, restore 2024-03-04 15:00:43 +01:00
Jorge Penadés 854a9b62af fix: refs #6276 refactor updateInTime & changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 09:21:41 +01:00
Jorge Penadés 7d8d31022b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-01 12:29:55 +01:00
Alex Moreno e844a3f8fb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test Build started... Details
2024-02-29 09:45:07 +01:00
Alex Moreno 3f6ec13fa5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-29 09:43:44 +01:00
Javier Segarra 599e8761c1 hotfix fix: replace pdf with csv
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-29 06:26:21 +00:00
Jorge Penadés cbb7bd0028 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 15:50:47 +01:00
Alex Moreno 7874762da9 Merge pull request 'master' (!2102) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2102
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-02-27 11:38:02 +00:00
Sergio De la torre 699af5b9b7 refs #6531_hotFix_lastTickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-27 11:53:55 +01:00
Guillermo Bonet 89ebd36b9b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 11:50:23 +01:00
Guillermo Bonet 6339a59de0 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-02-27 11:49:58 +01:00
Guillermo Bonet a8065ab1a4 fix: refs #6184 hasFile false in saveSign and saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-02-27 09:43:53 +01:00
Jorge Penadés c875abf5e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 09:42:14 +01:00
Guillermo Bonet 554f6c4695 Merge branch 'test' 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-02-26 14:28:46 +01:00
Guillermo Bonet 3579c94268 fix: refs #6184 saveSign
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-26 14:09:53 +01:00
Guillermo Bonet 096987040e fix: refs #6184 saveSign
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-26 14:00:04 +01:00