1560 Commits

Author	SHA1	Message	Date
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
Javier Segarra	63d07cb082	Merge branch 'dev' into 6321_negative_tickets	2024-05-02 12:47:59 +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
Javier Segarra	cb76075bf8	Merge branch 'dev' into 6321_negative_tickets	2024-04-29 11:55:39 +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
Javier Segarra	68158f341d	feat(salix): refs #6321 #6331 publish negativeOrigin model	2024-04-22 14:09:27 +02:00
Javier Segarra	5a5032f6e6	Merge remote-tracking branch 'origin/dev' into 6321_negative_tickets	2024-04-22 13:34:06 +02: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
Javier Segarra	41f0b6aa93	Merge branch 'dev' into 6321_negative_tickets	2024-04-16 05:13:35 +00: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
Javier Segarra	e0712645a2	refs #6321 test: fix	2024-04-08 12:17:32 +02:00
Javier Segarra	3dd162b683	refs #6321 test: fix	2024-04-08 12:16:07 +02:00
Javier Segarra	25fc39ef2b	refs #6321 perf: change descriptions	2024-04-08 11:33:32 +02:00
Javier Segarra	134c468589	Merge branch 'dev' into 6321_negative_tickets	2024-04-08 11:30:48 +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	c4f8734d44	refs #6321 fix: param	2024-04-03 09:48:56 +02:00
Javier Segarra	cc3f2da639	refs #6321 perf: minor change	2024-04-02 15:02:33 +02:00
Javier Segarra	586f37afd2	refs #6321 perf: add arguments into procedure	2024-04-02 13:28:26 +02:00
Javier Segarra	d08535ac18	refs #6321 minor changes	2024-04-02 08:04:27 +02:00
Javier Segarra	601f5db080	refs #6321 test: spliy	2024-04-01 16:11:30 +02:00
Javier Segarra	59498179ec	refs #6321 test: itemLackDetail	2024-04-01 14:05:45 +02:00
Javier Segarra	d225821a41	refs #6321 test: itemLack	2024-04-01 13:59:35 +02:00
Javier Segarra	d62c55dc9f	refs #6321 test: negativeOrigin	2024-04-01 13:11:58 +02:00
Javier Segarra	8ab9063b50	refs #6436 feat: use mocks	2024-04-01 11:00:55 +02:00
Javier Segarra	2cff160c6a	Merge branch 'dev' into 6321_negative_tickets	2024-03-28 23:50:51 +00:00
Javier Segarra	65a6174e2b	refs #6321 updates	2024-03-28 12:01:06 +01:00
Sergio De la torre	8e6416d59c	refs #3520 feat:uncheckedTicket	2024-03-28 08:08:32 +01:00
Javier Segarra	e6fe245b27	refs #6321 feat: new split method	2024-03-27 14:09:25 +01:00
Javier Segarra	d8d0ced918	Merge branch 'dev' into 6321_negative_tickets	2024-03-27 09:54:02 +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
Alex Moreno	2212899400	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-26 08:35:38 +01:00
Alex Moreno	dce0155c00	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	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
Javier Segarra	a943e39ba7	refs #6321 feat: negativeOrigin	2024-03-22 22:44:37 +01:00
Jorge Penadés	0867f4d501	fix: refs #6951 var names & procedure name	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	2024-03-22 15:14:12 +01:00
Sergio De la torre	9e5e49c28f	refs #6276 feat:newWarehouse	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 ... 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	2024-03-21 10:18:54 +01:00
Alex Moreno	b087c35a36	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-21 08:01:05 +01:00
Pablo Natek	da8fbb5a92	fix: refs #6302 spec	2024-03-20 21:14:01 +01:00
Alex Moreno	adddcc96aa	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-20 15:01:17 +01:00
Alex Moreno	7895a51e33	hotFix(closeAll): fix debug	2024-03-20 12:15:41 +01:00
Carlos Andrés	913b261f86	Merge branch 'dev' into 6549-ticket_close	2024-03-18 17:55:54 +01:00
Jorge Penadés	3c3dd64da1	feat: refs #6951 test	2024-03-18 09:39:56 +01:00
Jorge Penadés	f044809f30	feat: refs #6951 to create back	2024-03-15 15:45:47 +01:00
Alex Moreno	8119106e69	hotFix: try to debug closeAll	2024-03-15 15:40:54 +01:00
Javier Segarra	44c4e6a16e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2024-03-15 09:47:10 +01:00
Javier Segarra	6c0706cc56	refs #6321 perf: query to retrieve results	2024-03-15 09:33:06 +01:00
Javier Segarra	f83f7808c8	refs #6321 feat: negativeOrigin method	2024-03-15 09:32:36 +01:00
Javier Segarra	6a12af2eb9	refs #6321 feat: add producerFk	2024-03-14 15:26:30 +01:00
Alex Moreno	0ad052c34a	refs #7033 deploy(2412): dev to test	2024-03-14 08:36:19 +01:00
Javier Segarra	ed6b25455b	refs #5858 feat: improve itemLackDetail	2024-03-13 14:27:45 +01:00
Carlos Satorres	1315bfda88	refs #6755 fix test	2024-03-13 14:18:53 +01:00
Carlos Andrés	ff459ea3be	fix: closeTicket idem salix refs #6549	2024-03-13 12:18:43 +01:00
Javier Segarra	c8446eb9a1	refs #6321 perf: updatemethod	2024-03-13 09:20:32 +01:00
Carlos Satorres	106296be7b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor	2024-03-12 12:55:56 +01:00
Carlos Satorres	ed57212618	refs #6755 fix restore	2024-03-12 12:55:14 +01:00
Alex Moreno	8cda12a9da	feat: refs #6925 check incoterms in closure and makeInvoice	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
Javier Segarra	7c8fa52da0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2024-03-06 14:30:02 +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	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
Javier Segarra	871447cc6e	refs #6321 feat: updates	2024-03-05 08:07:54 +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	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	2024-03-01 12:29:55 +01:00
Alex Moreno	e844a3f8fb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-29 09:45:07 +01:00
Alex Moreno	3f6ec13fa5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-29 09:43:44 +01:00
Javier Segarra	599e8761c1	hotfix fix: replace pdf with csv	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	2024-02-27 15:50:47 +01:00
Alex Moreno	7874762da9	Merge pull request 'master' (!2102) from master into test ... 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	2024-02-27 11:53:55 +01:00
Guillermo Bonet	89ebd36b9b	Merge branch 'test' into dev	2024-02-27 11:50:23 +01:00
Guillermo Bonet	6339a59de0	Merge branch 'master' into test	2024-02-27 11:49:58 +01:00
Guillermo Bonet	a8065ab1a4	fix: refs #6184 hasFile false in saveSign and saveCmr	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	2024-02-27 09:42:14 +01:00
Guillermo Bonet	554f6c4695	Merge branch 'test' into dev	2024-02-26 14:28:46 +01:00
Guillermo Bonet	3579c94268	fix: refs #6184 saveSign	2024-02-26 14:09:53 +01:00
Guillermo Bonet	096987040e	fix: refs #6184 saveSign	2024-02-26 14:00:04 +01:00
Guillermo Bonet	a4419a2542	fix: refs #6184 saveSign	2024-02-26 13:57:07 +01:00
Guillermo Bonet	c1c64d0f89	fix: refs #6184 saveSign	2024-02-26 13:39:57 +01:00
Guillermo Bonet	817f685621	fix: refs #6184 saveSign	2024-02-26 13:00:35 +01:00
Guillermo Bonet	a359ace1b8	fix: refs #6184 saveSign	2024-02-26 12:57:49 +01:00
Guillermo Bonet	413f7eb8c8	fix: refs #6184 saveSign	2024-02-26 12:45:38 +01:00
Alex Moreno	b1a8fcf968	refs #6925 fix(invoice): incoterms error	2024-02-26 11:50:46 +01:00
Jorge Penadés	70c400c5f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-23 12:51:22 +01:00
Ivan Mas	03fc7cfb4e	Merge branch 'dev' into 6784-delete-clientTypeFk	2024-02-23 08:24:12 +00:00
Alex Moreno	c7dd81e53d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-23 07:12:24 +01:00
Guillermo Bonet	df5e9bc830	fix: refs #6184 Rollback saveSign.js	2024-02-22 14:46:10 +01:00
Guillermo Bonet	80fc9e4472	fix: refs #6184 Quitadas transacciones en los SELECT en saveSign.js	2024-02-22 10:16:29 +01:00
Alex Moreno	60dfe8ec05	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_master24_8	2024-02-21 15:12:48 +01:00
Alex Moreno	01f1bd0088	Revert "Merge branch 'dev' into test" ... This reverts commit c4a64b93cc, reversing changes made to 2ab1cebb31.	2024-02-21 14:44:34 +01:00
Ivan Mas	f592045925	refs #6784 Delete clientType.id and modify relationships in json and js	2024-02-21 11:49:27 +01:00
Jorge Penadés	9ce162da71	fix: refs #6776 back	2024-02-20 10:59:13 +01:00
Jorge Penadés	55b490160b	fix: refs #6776 back	2024-02-20 09:27:37 +01:00
Jorge Penadés	072280cc9c	fix: refs #6776 method names	2024-02-20 08:48:47 +01:00
Jorge Penadés	e9f7fbed86	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-19 14:46:56 +01:00
Jorge Penadés	d5a3413307	fix: refs #6776 method names & chanmges	2024-02-19 14:46:42 +01:00
Pablo Natek	011880eb72	fix(spec): refs #6879 remove f from describe	2024-02-19 14:15:44 +01:00
Pablo Natek	7b0dd6975d	fix(usesMana): refs #6879 add mana excluded worker	2024-02-19 14:13:36 +01:00
Sergio De la torre	7a0320270a	Merge pull request 'test' (!2048) from test into dev ... Reviewed-on: #2048 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-19 10:25:33 +00:00
Sergio De la torre	adeca2bb22	refs #6531 feat:modify name	2024-02-19 09:17:57 +01:00
Sergio De la torre	5b541aa804	refs #6531 feat:modify name	2024-02-19 09:13:03 +01:00
Sergio De la torre	15de4f0b73	refs #6531 feat:showLastTickets	2024-02-16 15:56:40 +01:00
Jorge Penadés	030f42d03f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-16 13:11:02 +01:00
Jorge Penadés	1767ce426a	fix: refs #6276 collection_addItem	2024-02-16 11:54:59 +01:00
Jorge Penadés	89970e39d0	fix: refs #6276 back tests	2024-02-16 10:47:41 +01:00
Jorge Penadés	63c615655b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-16 08:34:05 +01:00
Jorge Penadés	78583751ec	refactor: refs #6760 ticketsIds improved	2024-02-15 16:22:13 +01:00
Jorge Penadés	32f8d13359	fix: refs #6760 back modified & revoke update on ticket.clientFk	2024-02-14 13:15:31 +01:00
Guillermo Bonet	744171dd4c	fix: refs #6184 Requested changes	2024-02-13 09:41:26 +01:00