1089 Commits

Author	SHA1	Message	Date
Carlos Satorres	ccaf56f842	fix: setDeleted	2024-09-11 08:35:19 +02:00
Jorge Penadés	91abf2eefe	refactor: refs #7663 accurate error	2024-09-10 09:50:02 +02:00
Jorge Penadés	e2ef3472b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-10 09:41:46 +02:00
Javier Segarra	f15b33778c	feat(salix): refs #5938 #5938 replace variables	2024-09-09 14:21:42 +02:00
Javier Segarra	2fef104954	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-09 10:48:20 +00:00
Guillermo Bonet	daf3dfd2ee	Merge branch 'test' into dev	2024-09-09 11:35:28 +02:00
Guillermo Bonet	723ec2b453	fix: refs #7844 Filter monitor	2024-09-09 11:34:42 +02:00
Javier Segarra	378ee1119f	Merge branch 'dev' of https: refs #6156//gitea.verdnatura.es/verdnatura/salix into 6156-advanceTicketsNewField	2024-09-09 10:18:10 +02:00
Alex Moreno	632d3190b1	feat: refs #7938 remove unnecessary insert in clientLog	2024-09-09 07:49:22 +02:00
Jorge Penadés	99ce158632	chore: refs #7663 return correct type	2024-09-06 11:33:15 +02:00
Jorge Penadés	26d47b3f38	Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-06 11:29:53 +02:00
Javi Gallego	40a1b24403	Merge pull request '#7277 - RefundInvoices' (!2904) from 7277-RefundInvoices into dev ... Reviewed-on: #2904 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-05 09:07:24 +00:00
Guillermo Bonet	6df817ea5d	Merge branch 'test' into dev	2024-09-05 09:25:00 +02:00
Guillermo Bonet	95d4c706d4	fix: refs #7346 multiple to quick in closure.js	2024-09-05 09:23:58 +02:00
Jorge Penadés	998d3865a3	chore: refs #7663 fix test	2024-09-05 08:56:15 +02:00
Robert Ferrús	4c96d57491	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-09-05 06:06:22 +00:00
Guillermo Bonet	2bb73af47d	Merge branch 'test' into dev	2024-09-04 14:12:50 +02:00
Guillermo Bonet	212e8d1a03	fix: refs #7346 invoiceSerial	2024-09-04 14:09:31 +02:00
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
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	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	4ff61a75e0	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-17 06:26:26 +00:00
Ivan Mas	1d10e61541	Merge branch 'dev' into 7393-Night_tcket_closing_report	2024-07-16 17:14:08 +00: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
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
Javi Gallego	df4b3add8d	fix: refs #6408 quito state.js	2024-06-19 07:59:45 +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	789e0e65e3	fix(sale): rocket is only sent if it has sales	2024-06-12 09:12:48 +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	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
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
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	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
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
Carlos Satorres	4b8cad9aef	hotfix accessScopes	2024-05-15 13:23:36 +02:00