1502 Commits

Author	SHA1	Message	Date
Sergio De la torre	c777b8dbf1	Merge pull request 'feat checkExpeditionPrintOut refs #7751' (!2762) from 7751_boxPicking_check into dev ... Reviewed-on: #2762 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 20:33:47 +00:00
Guillermo Bonet	169534568e	Merge branch 'test' into dev	2024-07-22 12:36:27 +02:00
Alex Moreno	b8244b48e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security	2024-07-19 09:08:47 +02:00
Guillermo Bonet	69a8b8ef49	fix: refs #7511 Minor change	2024-07-19 08:34:25 +02:00
Sergio De la torre	f19f107971	feat checkExpeditionPrintOut refs #7751	2024-07-19 08:27:22 +02:00
Guillermo Bonet	3525c878b6	Merge pull request 'feat: refs #7511 Rename to multiConfig tables' (!2711) from 7511-multiConfig into dev ... Reviewed-on: #2711 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-19 05:46:42 +00:00
Guillermo Bonet	3449aeb673	refactor: refs #7511 Minor change	2024-07-19 07:45:17 +02:00
Javier Segarra	304405a8a3	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-07-18 15:21:12 +02:00
Guillermo Bonet	f18b165e4a	Merge branch 'master' into test	2024-07-18 13:45:23 +02:00
Pablo Natek	409daaf584	feat: refs #6403 add address mobile	2024-07-18 10:13:21 +02: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	563c70c65d	fix(cancelShipment): fix	2024-07-17 11:18:12 +02:00
Pablo Natek	0ea69427ec	feat: refs #6403 add cancelShipment on deleteExpeditions	2024-07-17 08:16:01 +02: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	9e007bfb8a	fix: refs #6403 fix mrw cancel shipment return type	2024-07-16 13:43:36 +02:00
Pablo Natek	b7e84f43de	feat: refs #6403 add delete	2024-07-16 13:26:20 +02:00
Javier Segarra	c5cb4d84f1	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-07-16 09:23:30 +02:00
Alex Moreno	4fa9f057de	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-16 07:41:21 +02:00
Pablo Natek	08ba1acc3c	fix: refs #6403 fix delivery observation	2024-07-15 13:35:24 +02:00
Sergio De la torre	cb107215b6	feat itemShelvingSale refs #6861	2024-07-12 13:14:00 +02:00
Pablo Natek	64bddd4f63	feat: refs #6403 add dynamic clientType	2024-07-10 10:41:52 +02:00
Guillermo Bonet	d660043df2	feat: refs #7511 Fix tests	2024-07-10 07:48:42 +02:00
Guillermo Bonet	46e8f5b811	feat: refs #7511 Rename to multiConfig tables	2024-07-10 07:46:18 +02:00
Javier Segarra	1be04babe4	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-07-09 12:18:55 +02:00
Alex Moreno	1866c16727	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-08 14:33:12 +02:00
Alex Moreno	30d118f9df	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-08 14:32:43 +02:00
Pablo Natek	62045756e6	fix: refs #6403 extend length to 6 digits for mrw clientType	2024-07-08 10:50:15 +02:00
Pablo Natek	816b111f79	feat: refs #6403 add dynamic clientType	2024-07-08 09:20:39 +02:00
Alex Moreno	706288f227	Merge pull request 'test' (!2687) from test into dev ... Reviewed-on: #2687 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-05 08:59:39 +00:00
Sergio De la torre	f3f450463b	warmFix getSales refs #6861	2024-07-05 10:47:26 +02:00
Javier Segarra	2064107897	feat(salix): #7671 define isDestiny field in model	2024-07-04 15:25:21 +00:00
Alex Moreno	4535795515	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-03 10:08:15 +02:00
Sergio De la torre	1561e15d5e	feat roadmap refs #7195	2024-07-03 09:21:58 +02:00
Jon Elias	4bdbb3b08e	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-07-03 07:13:21 +00:00
Jon Elias	0e84749c07	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-07-01 10:22:11 +00:00
Sergio De la torre	22959db0ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmap2	2024-07-01 11:28:14 +02:00
Guillermo Bonet	df4e5deae6	Merge branch 'test' into dev	2024-06-28 13:33:43 +02:00
Jon Elias	0917fc318a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity	2024-06-28 13:19:38 +02:00
Pablo Natek	94a73294cb	fix: refs #6404 get label	2024-06-28 09:11:20 +02:00
Javier Segarra	b4afb883fc	feat(salix): refs #6436 #6436 remove unnecessary object.assign	2024-06-26 09:35:18 +02:00
Pablo Natek	478a38b0ab	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-26 05:14:37 +00:00
Alex Moreno	95a23ad9fc	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-06-25 11:43:42 +00:00
Carlos Andrés	ff1918ef06	Merge pull request 'feat: previas con sitema de reservas refs #6861' (!2176) from 6861-Pasar-modo-trabajo-de-previa-a-reservas into dev ... Reviewed-on: #2176 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-25 11:21:02 +00:00
Alex Moreno	0284f3b1ce	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-25 07:30:20 +02:00
Alex Moreno	f2ee1df8ac	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-25 07:29:56 +02:00
Alex Moreno	7f278269a5	feat(AccessToken&ACL): refs #7547 upgrade security	2024-06-21 14:28:55 +02:00
Sergio De la torre	da40b705c7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7357_dipole_review	2024-06-21 07:20:00 +02:00
Sergio De la torre	13952f60e1	feat boxPicking refs #7357	2024-06-21 07:18:10 +02:00
Javier Segarra	ba48d93c1e	perf(salix): refs #6264 #6264 remove save token as debug row	2024-06-20 23:28:11 +02:00
Javier Segarra	bfb6689835	test: add CALL util.debugAdd	2024-06-20 15:15:56 +02:00
Javier Segarra	31a75956c0	feat: add CALL util.debugAdd	2024-06-20 15:15:51 +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	f99b1beb86	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-20 09:48:57 +02:00
Sergio De la torre	c87f060d51	feat boxPicking refs #7357	2024-06-20 09:21:27 +02:00
Sergio De la torre	239814e6b4	feat hasItemOlder refs#6964	2024-06-18 10:08:40 +02:00
Pablo Natek	25afa80bab	fix: refs #6404 remove fixtures after test	2024-06-17 09:09:45 +02:00
Pablo Natek	c3d64b2358	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6404-sendMailOnDeadLine	2024-06-17 08:49:26 +02:00
Pablo Natek	a30ff44837	fix: refs #6404 fix notification	2024-06-14 17:40:08 +02:00
Jon Elias	ee75068e9c	refactor: refs #6436 fixed test	2024-06-14 08:57:11 +02:00
Jon Elias	711fad6b72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity	2024-06-14 08:50:32 +02:00
Jon Elias	61a588b57c	refactor: refs #6436 fixed test	2024-06-14 08:39:57 +02:00
Jon Elias	324d7ef7ae	refactor: refs #6436 changed test config	2024-06-12 14:54:43 +02:00
Carlos Satorres	ba67acb72b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration	2024-06-12 14:33:11 +02:00
Jon Elias	84a51d3e8d	feat: refs #6436 changed tests	2024-06-12 12:23:37 +02:00
Alex Moreno	671978ec02	Merge branch 'dev' into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-06-12 10:21:36 +00:00
Jon Elias	665d03f048	refactor: refs #6436 user-config and some sections tests	2024-06-11 12:35:44 +02:00
Carlos Satorres	5d7a570c3f	refs #6897 fix redirection	2024-06-11 12:28:49 +02:00
Jon Elias	b3fa869757	refactor: refs #6436 second wave	2024-06-11 10:00:30 +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
Jon Elias	f0ad012835	refactor: refs #6436 first wave	2024-06-11 09:39:06 +02:00
Jorge Penadés	d30cd68417	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls	2024-06-11 09:11:56 +02:00
Pablo Natek	d41f1ff561	fix: refs #6404 remove focus from test	2024-06-10 12:36:15 +02:00
Pablo Natek	c5227d6cf6	feat: refs #6404 add mail notification	2024-06-10 12:24:23 +02:00
Carlos Satorres	48550bd986	refs #6897 fix remove	2024-06-07 11:35:03 +02:00
Sergio De la torre	f70605e565	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps	2024-06-04 16:03:37 +02:00
Alex Moreno	7a803cce37	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-04 09:38:50 +02:00
Sergio De la torre	94aef434a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps	2024-06-04 07:17:37 +02:00
Pablo Natek	b9b0651069	fix: refs #6404 fix agency service selection	2024-06-03 12:38:57 +02:00
Pablo Natek	b1a4b42028	fix: refs #6404 change db language on local	2024-06-03 10:29:38 +02:00
Jon Elias	cf5b8a27a7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity	2024-06-03 10:04:38 +02:00
Sergio De la torre	b9a9f52514	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps	2024-06-03 07:56:43 +02:00
Sergio De la torre	2985e1c9e8	feat: roadMap refs #7195	2024-05-31 13:08:48 +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
Guillermo Bonet	7dc17cd4f6	Merge branch 'test' into dev	2024-05-31 12:29:32 +02:00
Pablo Natek	988b3cbbee	fix: refs #6404 ref #6404 remove console.log	2024-05-31 11:53:55 +02:00
Pablo Natek	884b5f8475	feat: refs #6404 add cero filler to counter	2024-05-31 11:51:32 +02:00
Pablo Natek	d901584c3f	feat: refs #6404 add deadline field	2024-05-30 18:39:06 +02:00
Jorge Penadés	9d58c67b4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-29 09:16:25 +02:00
Guillermo Bonet	f87ee5cb91	Merge branch 'test' into dev	2024-05-29 08:09:53 +02:00
Jorge Penadés	885aa5208a	feat : refs #6889 wip: check if is productionReviewer or owner	2024-05-28 17:23:58 +02:00
Pablo Natek	33e823675e	feat: refs #6404 default weight	2024-05-28 10:08:15 +02:00
Sergio De la torre	2d876fa1a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-27 11:33:22 +02:00
Sergio De la torre	74b71079f2	refs #6861 feat: obsrevation	2024-05-27 11:33:04 +02:00
Sergio De la torre	2cd7133a8c	refs #6861 feat: skipTest	2024-05-27 08:15:57 +02:00
Sergio De la torre	64f71e0f9d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-27 07:46:21 +02:00
Javier Segarra	ab1797ebec	Merge branch 'dev' into 7272_bug_redirectToLogin	2024-05-24 11:59:30 +00:00
Jon Elias	e902a84d10	refactor: refs #5447 changed models	2024-05-23 09:22:19 +02:00
Carlos Satorres	4c5f46eb9b	Merge pull request 'refs #6820 fix back' (!2480) from 6820-fixMaxKmRoute into dev ... Reviewed-on: #2480 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-22 13:55:53 +00:00
Carlos Satorres	4dee90ff57	refs #6820 fix pr	2024-05-22 14:56:46 +02:00
Alex Moreno	28279b0782	Merge branch 'dev' into 7421-fix_checking_NODE_ENV	2024-05-21 13:12:30 +00:00
Alex Moreno	ff33c926af	fix: move to boot	2024-05-21 15:11:32 +02:00
Alex Moreno	d884192066	fix: checking process.env.NODE_ENV	2024-05-21 13:52:50 +02:00
Alex Moreno	18bb8a4ea5	fix: checking process.env.NODE_ENV	2024-05-21 13:50:45 +02:00
Javier Casado	d0bb9d7690	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-05-21 05:50:49 +00:00
Pablo Natek	3fa557f90d	fix: refs #6404 create shipment	2024-05-20 13:58:32 +02:00
Pablo Natek	143f9cf0bb	fix: refs #6404 fix return	2024-05-20 12:17:10 +02:00
Pablo Natek	d51c9fc120	fix: refs #6404 fix cancel shipment	2024-05-20 12:14:59 +02:00
Carlos Satorres	7f1210e712	refs #6820 fix back	2024-05-20 10:26:09 +02:00
Javier Casado	5ee550ebf7	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-05-17 12:08:41 +00:00
Jorge Penadés	0e51fa861c	fix: refs #6598 drop variables	2024-05-17 11:35:29 +02:00
Jorge Penadés	5abc95af51	feat: refs #6598 back test	2024-05-17 11:29:16 +02:00
Sergio De la torre	75bb08a0c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-16 07:08:47 +02:00
Jorge Penadés	c6242cc2e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls	2024-05-15 16:41:15 +02:00
Javier Casado	03f0de489e	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-05-13 05:40:25 +00:00
Sergio De la torre	e8a30c1df8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-06 10:30:19 +02:00
Jorge Penadés	411933a608	feat: refs #6598 acls back	2024-05-03 12:17:51 +02:00
Javier Segarra	ae91486641	test(salix): refs #7272 #7272 fix renew-token.spec	2024-05-02 10:36:18 +02:00
Javier Segarra	be3ee43b06	fix(salix): refs #7272 #7272 Back validateToken endpoint	2024-04-30 11:35:30 +02:00
Robert Ferrús	d2c3034ec6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country	2024-04-26 12:07:53 +02:00
Robert Ferrús	fd7dcf2781	fix: refs #7039 fixpr	2024-04-26 10:26:20 +02:00
Robert Ferrús	2d0d4b5643	Merge branch 'dev' into 7039-country-country	2024-04-26 06:48:01 +00:00
Pablo Natek	51c42d09b2	fix: refs #4988 agency hook	2024-04-26 08:39:05 +02:00
Pablo Natek	4693ba13fa	Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-26 08:37:51 +02:00
Pablo Natek	4e11e46fff	feat: refs #4988 capture error on duplicate	2024-04-25 12:40:54 +02:00
Robert Ferrús	8153a526ce	feat: refs #7039 country-name	2024-04-25 12:35:21 +02:00
Pablo Natek	c5b02dc239	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-25 09:46:53 +02:00
Javi Gallego	dcc46494bc	Merge branch 'dev' into 7108-exchange-rate	2024-04-24 07:45:02 +02:00
Javier Segarra	83d89d13ad	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-23 08:26:23 +00:00
Pablo Natek	adc3b413f5	feat: refs #4988 agency add module	2024-04-22 17:17:17 +02:00
Javi Gallego	b0c4f7fd3c	feat: moved files to invoiceIn	2024-04-22 11:45:58 +02:00
Javi Gallego	4416790ce1	Merge branch 'dev' into 7108-exchange-rate	2024-04-22 11:45:02 +02:00
Javier Segarra	d2aba88a34	feat(salix): refs #7190 minor change salix-back	2024-04-19 11:36:34 +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
Sergio De la torre	ad13ad856b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-04-18 09:13:48 +02:00
Pablo Natek	77f7348acb	feat(workcenter): refs #4988 add workcenter config menu	2024-04-18 09:02:01 +02:00
Javier Segarra	6214da2c42	feat(salix): refs #6930 Undo rollback salix-back	2024-04-17 09:52:53 +02:00
Pablo Natek	d0dfdc668b	feat(agency): refs #4988 add new agency	2024-04-16 16:25:27 +02:00
Javi Gallego	58baa45e09	Merge branch 'dev' into 7108-exchange-rate	2024-04-16 09:47:21 +02:00
Javi Gallego	77a1aa4de6	feat: @7108 test	2024-04-16 08:45:03 +02:00
Pablo Natek	0418540ef9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-16 07:39:13 +02:00
Pablo Natek	336c3274ea	feat(agency): refs #4988 add summary	2024-04-16 07:38:48 +02:00
Javier Segarra	6db0eba72c	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-15 06:51:03 +00:00
Javier Segarra	25b5c35dc6	refs #6835 fix: issue	2024-04-15 08:47:49 +02:00
Javier Segarra	253465cf13	refs #7190 feat: renewToken for multimedia	2024-04-15 08:47:27 +02:00
Javi Gallego	e8001b72e4	feat: minor changes	2024-04-13 09:05:54 +02:00
Javi Gallego	bb6ea31bf7	feat: funcional a falta de test	2024-04-12 10:26:32 +02:00
Sergio De la torre	13415b1ef0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-04-12 09:49:18 +02:00
Pablo Natek	726b1ddc07	Merge branch 'dev' into 6005-backupLabeler	2024-04-12 05:14:29 +00:00