1638 Commits

Author	SHA1	Message	Date
Jorge Penadés	df5961a2a2	feat: refs #7663 wip test	2024-09-04 11:41:47 +02:00
Jorge Penadés	544ddb0f15	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-04 10:39:46 +02:00
Guillermo Bonet	c5521ea021	Merge branch 'test' into dev	2024-09-04 07:06:22 +02:00
Jorge Penadés	9797d5e219	feat: refs #7663 return created invoice ids	2024-09-03 17:33:44 +02:00
Guillermo Bonet	3cc19549e4	fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems	2024-09-03 15:03:09 +02:00
Guillermo Bonet	790a44c62a	fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems	2024-09-03 13:29:01 +02:00
Jorge Penadés	b83e548feb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-02 17:02:00 +02:00
Robert Ferrús	48bf5004a6	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-09-02 08:09:43 +00:00
Javi Gallego	51535bfa6b	feat: refs #7277 refundInvoices	2024-08-30 13:50:51 +02:00
Javi Gallego	a8ee92f891	Merge branch 'dev' into 6760-transferClient	2024-08-28 10:36:17 +00:00
Guillermo Bonet	79e2424a41	Merge branch 'dev' into 7844-changeProblemsCalc	2024-08-27 08:04:21 +00:00
Jorge Penadés	4a3faebe7d	Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-08-26 16:59:40 +02:00
Javi Gallego	5f06ae5cf4	feat: refs #6760 refs #actualiza campo nickname	2024-08-26 15:57:39 +02:00
Javi Gallego	32d36cda21	feat: refs #7710 pr revision	2024-08-23 14:28:25 +02:00
Javi Gallego	340515968b	feat: refs #7710 test fixed	2024-08-23 10:57:35 +02:00
Javi Gallego	7f543e8d3a	Merge branch 'dev' into 7346	2024-08-14 10:32:32 +02:00
Jorge Penadés	6c9676ce9c	chore: refs #7663 fix logic	2024-08-13 14:52:26 +02:00
Jorge Penadés	52d62710e6	chore: refs #7663 fix logic	2024-08-13 13:49:00 +02:00
Jorge Penadés	c742f6f79d	Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-08-12 16:59:28 +02:00
Guillermo Bonet	09a0459a7b	refs #7844 Fix tests part 2/2	2024-08-07 13:52:41 +02:00
Guillermo Bonet	4cbea3bf7b	refs #7844 Fix tests part 2/2	2024-08-07 13:51:00 +02:00
Guillermo Bonet	8aa06e12b3	refs #7844 Fix tests part 1/2	2024-08-07 12:39:18 +02:00
Alex Moreno	6fb78e1599	test: hotFix saveSign	2024-08-06 08:59:20 +02:00
Guillermo Bonet	d6e09fcfc9	Merge branch 'master' into test	2024-08-05 12:59:37 +02:00
Guillermo Bonet	91253cc807	fix: refs #7835 transferSales	2024-08-05 12:57:38 +02:00
Jorge Penadés	57f6c6d9a1	chore: refs #7663 WIP setWeight	2024-07-31 10:43:55 +02:00
Pablo Natek	bc9fe220d5	fix: refs #6403 remove console log	2024-07-24 12:38:27 +02:00
Alex Moreno	8845f78383	test: refs #7615 add test to setDeleted	2024-07-23 12:23:31 +02:00
Robert Ferrús	4259339afb	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-23 10:00:21 +00:00
Guillermo Bonet	513b4583b3	fix(deletExpeditions): merge test → dev	2024-07-22 12:49:50 +02:00
Guillermo Bonet	b9c57c2f0e	Fix	2024-07-22 12:45:57 +02:00
Guillermo Bonet	169534568e	Merge branch 'test' into dev	2024-07-22 12:36:27 +02:00
Javi Gallego	8f623bd51e	feat: refs #7346 mas intuitivo	2024-07-22 10:26:40 +02:00
Robert Ferrús	d8f1368b32	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-22 05:07:01 +00:00
Guillermo Bonet	fd2bac713d	fix: #6184 Deleted unused params	2024-07-19 07:16:24 +02:00
Robert Ferrús	10a4831f95	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-19 05:09:41 +00:00
Ivan Mas	6d1663617f	Merge branch 'dev' into 7393-Night_tcket_closing_report	2024-07-18 12:51:34 +00:00
Jon Elias	150b3a276e	feat: refs #7356 new parameters in sql for Weekly tickets front	2024-07-18 10:51:24 +02:00
Ivan Mas	019e29f3dd	Merge branch 'dev' into 7393-Night_tcket_closing_report	2024-07-17 11:48:57 +00:00
Alex Moreno	ae2ddcb8c7	add console.log	2024-07-17 12:20:58 +02:00
Alex Moreno	e5bfb4af23	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-17 12:20:22 +02:00
Alex Moreno	4ff388198b	fix(deletExpeditions): add try catch	2024-07-17 10:14:41 +02:00
Robert Ferrús	4ff61a75e0	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-17 06:26:26 +00:00
Pablo Natek	f83dd37a28	fix: refs #6403 remove line	2024-07-17 08:23:33 +02:00
Pablo Natek	0ea69427ec	feat: refs #6403 add cancelShipment on deleteExpeditions	2024-07-17 08:16:01 +02:00
Ivan Mas	1d10e61541	Merge branch 'dev' into 7393-Night_tcket_closing_report	2024-07-16 17:14:08 +00:00
Pablo Natek	d2f022ab64	Merge branch 'dev' into 6403-feat-add-mrw-delete-on-salix	2024-07-16 11:44:54 +00:00
Pablo Natek	b7e84f43de	feat: refs #6403 add delete	2024-07-16 13:26:20 +02:00
Sergio De la torre	dc5903421b	refs newStatePartial refs #7642	2024-07-15 16:21:19 +02:00
Sergio De la torre	87b0d3e8d1	refs newStatePartial refs #7642	2024-07-15 16:18:30 +02:00
Robert Ferrús	625ab07e48	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-12 10:01:12 +00:00
Robert Ferrús	39b52e706a	feat: refs #7615 setDeleted	2024-07-11 14:51:34 +02:00
Robert Ferrús	36b1beeebf	Merge branch 'dev' into 7670-addSaleRenewPrice	2024-07-10 09:44:54 +00:00
Guillermo Bonet	0b61a175ef	Merge branch 'test' into dev	2024-07-09 14:49:51 +02:00
Carlos Satorres	944cf3baa3	refs #7694 hotfix filter	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	2024-07-04 12:45:52 +02:00
Robert Ferrús	1fff3aa681	feat: refs #7670 addSale	2024-07-04 12:34:56 +02:00
Alex Moreno	95a23ad9fc	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-06-25 11:43:42 +00:00
Guillermo Bonet	134c38b9fd	refs #6753 Hotfix	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	2024-06-20 12:24:06 +02:00
Alex Moreno	f84e85e443	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	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 ... 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	2024-06-19 07:59:45 +02:00
Carlos Andrés	9b118f83e5	fix: asociar ticketRefund refs #7586	2024-06-14 17:56:24 +02:00
Jon Elias	0bf384b2ce	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-06-14 07:06:30 +00:00
Jon Elias	d3f23a6d7a	fix: refs #6436 fix filter test	2024-06-14 09:04:18 +02:00
Jon Elias	61a588b57c	refactor: refs #6436 fixed test	2024-06-14 08:39:57 +02:00
Jon Elias	84a51d3e8d	feat: refs #6436 changed tests	2024-06-12 12:23:37 +02:00
Alex Moreno	b5ecf2e3b5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 10:11:14 +02:00
Alex Moreno	de0f0623e1	Merge branch 'master' into 6408-hotFix_updateQuantity	2024-06-12 08:07:25 +00:00
Alex Moreno	d9b0a1a75c	fix(updateQuantity): fix rocket translation	2024-06-12 09:59:58 +02:00
Alex Moreno	789e0e65e3	fix(sale): rocket is only sent if it has sales	2024-06-12 09:12:48 +02:00
Jon Elias	2b45c2c61a	feat: refs #6436 new test changes, rollback order/filter and /ticket/clone	2024-06-12 08:25:50 +02:00
Alex Moreno	1eee1d0e9b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 07:47:56 +02:00
Javi Gallego	79c922300b	hotfix #6408	2024-06-11 14:50:47 +02:00
Jon Elias	944355d54f	refactor: refs #6436 end first wave of changes in modules	2024-06-11 13:17:19 +02:00
Jon Elias	665d03f048	refactor: refs #6436 user-config and some sections tests	2024-06-11 12:35:44 +02:00
Jon Elias	bd45352215	refactor: refs #6436 fourth wave	2024-06-11 12:02:15 +02:00
Jon Elias	7df7382346	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll	2024-06-11 09:41:26 +02:00
Javi Gallego	e081c4504d	feat: refs #7548 link a grafana	2024-06-10 14:51:48 +02:00
Javi Gallego	f82f452423	Merge branch 'dev' into 7276_expeditionScanned	2024-06-07 13:44:24 +00:00
Alex Moreno	379d7ef2ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-07 10:33:07 +02:00
Alex Moreno	ca6afb9c10	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	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	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	2024-06-03 10:30:20 +02:00
Jon Elias	340a8c119e	refactor: refs #6753 fix saveSign	2024-06-03 09:35:44 +02:00
Jorge Penadés	9578c506b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-31 12:58:05 +02:00
Alex Moreno	bd82bb011a	fix(transferInvoice): separate invoice functionality from generating PDF and adapt tests	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	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	2024-05-30 10:04:34 +02:00
Javi Gallego	5e55f2d92d	feat: refs # 6408 test ok	2024-05-30 09:35:42 +02:00
Jorge Penadés	56407e12a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-28 13:22:33 +02:00
Javi Gallego	1bcd7a9665	Merge branch 'dev' into 6408-rocketChat	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	2024-05-27 13:57:35 +02:00
Guillermo Bonet	d384c5624f	refactor: refs #7486 Deleted unused debugAll	2024-05-27 13:57:27 +02:00
Guillermo Bonet	6e06891937	Merge branch 'master' into test	2024-05-21 11:44:26 +02:00
Guillermo Bonet	d672385776	hotfix: Rectificación Pepe	2024-05-21 11:44:11 +02:00
Javier Casado	d0bb9d7690	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-05-21 05:50:49 +00:00
Ivan Mas	52400ab626	refs #7393 Modify night ticket closing report	2024-05-20 15:17:41 +02:00
Jorge Penadés	741c995c31	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-20 10:30:38 +02: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	2024-05-17 14:20:33 +02:00
Javier Casado	5ee550ebf7	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-05-17 12:08:41 +00:00
Guillermo Bonet	968effc936	hotfix: ticket 135539 Unroute tickets	2024-05-17 11:56:04 +02:00
Alex Moreno	8260016da5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-15 13:53:07 +02:00
Carlos Satorres	4b8cad9aef	hotfix accessScopes	2024-05-15 13:23:36 +02:00
Javier Casado	03f0de489e	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-05-13 05:40:25 +00:00
Carlos Satorres	0d43d9a982	refs #6877 remove restriction	2024-05-08 13:20:45 +02:00
Carlos Satorres	5e8e09cbae	refs #6877 add attenderFk	2024-05-07 13:42:58 +02:00
Guillermo Bonet	0ab79728b5	Merge branch 'test' into dev	2024-05-02 08:10:20 +02:00
Guillermo Bonet	7eb2e8f218	Merge branch 'master' into test	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 ... 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	2024-04-30 12:15:27 +02:00
Guillermo Bonet	c987bb6e66	Merge branch 'master' into test	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 ... 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	2024-04-24 14:15:27 +02:00
Alex Moreno	0cd740ce0c	test: refs #7225 fix back test	2024-04-24 10:42:50 +02:00
Jon Elias	6706974784	fix: refs #6731 fix ticketRequest	2024-04-24 10:31:26 +02:00
Javier Segarra	0fd120676d	Actualizar modules/ticket/back/methods/ticket-request/filter.js	2024-04-23 12:29:40 +00:00
Sergio De la torre	23fa74a5ad	Merge branch 'dev' into 6921_addFromDelivery	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	2024-04-18 10:01:22 +02:00
Sergio De la torre	32e2827287	refs #6921 feat: addFromDelivery	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
Guillermo Bonet	2226922366	Merge branch 'master' into test	2024-04-11 14:52:16 +02:00
Alex Moreno	99d80d4d30	hotFix(closeAll): continue loop	2024-04-11 13:51:33 +02:00
Alex Moreno	93000aaecf	Merge branch 'dev' into 6549-ticket_close	2024-04-05 12:20:09 +00:00
Carlos Andrés	fe0afe30bf	fix: closeTicket idem salix Refs: #6549	2024-04-04 17:50:39 +02:00
Carlos Andrés	9fcad457a7	fix: closeTicket idem salix Refs: #6549	2024-04-04 14:46:51 +02:00
Alex Moreno	20e4ab1d2c	Merge pull request 'hotFix: handle mail error' (!2253) from hotFix_handleMailErrors into master ... 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	2024-04-04 13:32:39 +02:00
Sergio De la torre	9423a2d043	refs #3520 hotFix: hasUncheckedTickets	2024-04-04 10:38:55 +02:00
Guillermo Bonet	c685000b47	hotfix: refs #6930 Rollback tokenMultimedia	2024-04-04 10:13:56 +02:00
Alex Moreno	ff2e00c51c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-04-03 16:24:45 +02:00
Alex Moreno	59ead0c2e5	debug(closure): add log	2024-04-03 15:29:56 +02:00
Javier Segarra	8ab9063b50	refs #6436 feat: use mocks	2024-04-01 11:00:55 +02:00
Sergio De la torre	8e6416d59c	refs #3520 feat:uncheckedTicket	2024-03-28 08:08:32 +01:00
Sergio De la torre	2cf572baf8	refs #3520 hasUncheckedTicket	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	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