7863-devToTest_2434 #2852

Merged

alexm merged 129 commits from 7863-devToTest_2434 into test 2024-08-13 06:50:25 +00:00

Conversation 0 Commits 129 Files Changed 147 +676 -7659

129 Commits

Author	SHA1	Message	Date
Jorge Penadés	462f9a95b7	Merge pull request '#7283 item subsections migration' (!2830) from 7283-itemSectionsMigration into dev ... Reviewed-on: #2830 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-12 12:06:24 +00:00
Jorge Penadés	82da7bff9b	Merge branch 'dev' into 7283-itemSectionsMigration	2024-08-12 09:28:11 +00:00
Guillermo Bonet	ece8bee45c	Merge pull request 'feat: refs #7774 ticket_cloneWeekly' (!2781) from 7774-ticket_cloneWeekly into dev ... Reviewed-on: #2781 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-12 08:32:32 +00:00
Jorge Penadés	1602c12200	fix: refs #7283 sql	2024-08-12 09:13:30 +02:00
Jorge Penadés	6f26dc4990	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-12 09:06:28 +02:00
Guillermo Bonet	931c13d8ab	feat: refs #7774 #7774 Changes ticket_cloneWeekly	2024-08-12 09:06:24 +02:00
Guillermo Bonet	3cf2cec946	feat: refs #7774 #7774 Changes ticket_cloneWeekly	2024-08-12 09:02:38 +02:00
Guillermo Bonet	c4e8202261	feat: refs #7774 #7774 Changes ticket_cloneWeekly	2024-08-12 08:53:24 +02:00
Guillermo Bonet	5b2200a134	Merge branch 'dev' into 7774-ticket_cloneWeekly	2024-08-12 08:53:02 +02:00
Guillermo Bonet	f0a273395d	Merge pull request 'feat: refs #7646 delete scannableCodeType' (!2782) from 7646-deleteColumnsProductionConfig into dev ... Reviewed-on: #2782 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-12 06:06:59 +00:00
Guillermo Bonet	8655ca0a21	Merge branch 'dev' into 7646-deleteColumnsProductionConfig	2024-08-12 06:04:06 +00:00
Guillermo Bonet	00845c0534	refactor: refs #7646 #7646 Deleted scannable* variables productionConfig	2024-08-12 08:03:49 +02:00
Jorge Penadés	9ece46ee46	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-09 15:29:21 +02:00
Guillermo Bonet	5339dcbf19	Merge branch 'test' into dev	2024-08-09 13:53:56 +02:00
Alex Moreno	64fb097086	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-09 12:54:34 +02:00
Alex Moreno	af65ef2536	fix(orders_filter): add sourceApp accepts	2024-08-09 12:54:33 +02:00
Jorge Penadés	4a76a7554e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-09 12:33:13 +02:00
Jorge Penadés	d6bea43731	Merge pull request '#6900 rectificative filter' (!2845) from 6900-fineTunningInvoiceIn into dev ... Reviewed-on: #2845 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-09 10:32:13 +00:00
Jorge Penadés	a512fe75ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-09 12:12:25 +02:00
Jorge Penadés	8ab049be0d	chore: refs #6900 beautify code	2024-08-09 11:48:22 +02:00
Jorge Penadés	a4a45274af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6900-fineTunningInvoiceIn	2024-08-09 08:44:37 +02:00
Guillermo Bonet	d60f8a5319	Merge branch 'test' into dev	2024-08-09 08:26:22 +02:00
Pako Natek	d9c0b849ad	Merge pull request '7836-futureEntries' (!2844) from 7836-futureEntries into dev ... Reviewed-on: #2844 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-09 06:15:29 +00:00
Pako Natek	cd1eec7e29	Merge branch 'dev' into 7836-futureEntries	2024-08-09 06:14:15 +00:00
Pako Natek	98f4cb1de5	dropping proc	2024-08-09 08:04:36 +02:00
Jorge Penadés	5dfdb458a6	#6900 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6900-fineTunningInvoiceIn	2024-08-08 15:27:42 +02:00
Alex Moreno	1c75c429cc	test: husky	2024-08-08 13:29:02 +02:00
Pablo Natek	7ca768582f	Merge pull request 'fix: refs #6130 commit lint' (!2846) from 6130-fix-husky-lint into dev ... Reviewed-on: #2846 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-08 10:55:40 +00:00
Pablo Natek	62cee3a07a	fix: refs #6130 commit lint	2024-08-08 12:49:36 +02:00
Alex Moreno	141e116401	Merge pull request 'BREACKING CHANGE: claim redirect to lilium' (!2843) from 6336-claim-redirectToLilium into dev ... Reviewed-on: #2843 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-08-08 10:43:38 +00:00
Alex Moreno	30e1b7280a	Merge branch 'dev' into 6336-claim-redirectToLilium	2024-08-08 10:38:33 +00:00
Jorge Penadés	853a57ec63	#6900 fix: empty commit	2024-08-08 12:37:29 +02:00
Jorge Penadés	660ebfbe15	#6900 feat: empty commit	2024-08-08 12:36:06 +02:00
Jorge Penadés	4af881a8d9	#6900 feat: clear empty	2024-08-08 12:35:11 +02:00
Jorge Penadés	b4ea7819f8	#6900 feat: clear empty	2024-08-08 12:18:42 +02:00
Jorge Penadés	1ccfd8731f	#6900 feat: empty commit	2024-08-08 12:17:56 +02:00
Jorge Penadés	afc5615140	#6900 fix: #6900 rectificative filter	2024-08-08 12:14:44 +02:00
Alex Moreno	dd6aa6b1dd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-08 11:52:06 +02:00
Sergio De la torre	09d93caddb	Merge pull request 'refs #6078 - workerAct' (!2814) from 6078_workerAct into dev ... Reviewed-on: #2814 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-08 08:26:11 +00:00
Alex Moreno	17d05ecfe2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-08 10:07:26 +02:00
Alex Moreno	f0f4610be5	Merge branch '6336-claim-redirectToLilium' of https://gitea.verdnatura.es/verdnatura/salix into 6336-claim-redirectToLilium	2024-08-08 09:05:08 +02:00
Alex Moreno	4fb82dc944	test: fix ticket sale e2e	2024-08-08 09:05:08 +02:00
Jorge Penadés	00ba0bbe6d	Merge pull request '#7323 redirect woker module to Lilium' (!2825) from Worker_Migration into dev ... Reviewed-on: #2825 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-08 06:54:55 +00:00
Jorge Penadés	2c1eb6ee42	Merge branch 'dev' into Worker_Migration	2024-08-08 06:49:08 +00:00
Pako Natek	1154e9f55c	Merge branch 'dev' into 7836-futureEntries	2024-08-08 06:28:30 +00:00
Pako Natek	a01794f9cd	Merge branch '7836-futureEntries' of https://gitea.verdnatura.es/verdnatura/salix into 7836-futureEntries	2024-08-08 08:27:52 +02:00
Pako Natek	41942783aa	dropOldProc	2024-08-08 08:27:50 +02:00
Alex Moreno	8112797918	Merge branch 'dev' into 6336-claim-redirectToLilium	2024-08-08 06:23:59 +00:00
Alex Moreno	715439ae38	test: fix claim descriptor redirect to lilium	2024-08-08 08:23:17 +02:00
Alex Moreno	c768fa113e	test: fix ticket redirect to lilium	2024-08-08 08:20:26 +02:00
Pako Natek	c3da3b9bf3	Merge pull request '7836-futureEntries' (!2839) from 7836-futureEntries into dev ... Reviewed-on: #2839 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-08 06:06:22 +00:00
Pako Natek	a9cdbb1255	Merge branch 'dev' into 7836-futureEntries	2024-08-08 06:01:35 +00:00
Jorge Penadés	8241a6c22a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into Worker_Migration	2024-08-07 15:48:41 +02:00
Alex Moreno	4e831dc1bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6336-claim-redirectToLilium	2024-08-07 11:17:09 +02:00
Sergio De la torre	22c3a632e2	feat workerActivity refs #6078	2024-08-07 10:48:12 +02:00
Pako Natek	9b2cbcd5cc	reviewed	2024-08-07 10:42:14 +02:00
Jorge Penadés	4b8b7e3a18	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-07 10:16:53 +02:00
Sergio De la torre	849989afa8	feat workerActivity refs #6078	2024-08-07 08:19:44 +02:00
Sergio De la torre	f9e9181637	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6078_workerAct	2024-08-07 08:15:27 +02:00
Sergio De la torre	163faf983e	feat workerActivity refs #6078	2024-08-06 16:34:46 +02:00
Guillermo Bonet	fc102eff7b	Merge branch 'test' into dev	2024-08-06 14:12:32 +02:00
Pako Natek	fc7c7beef7	Merge branch 'dev' into 7836-futureEntries	2024-08-06 11:23:56 +00:00
Guillermo Bonet	184cbb2800	Merge branch 'test' into dev	2024-08-06 12:58:08 +02:00
Guillermo Bonet	28b848930e	Merge branch 'test' into dev	2024-08-06 12:45:55 +02:00
Jorge Penadés	b1b7f6639c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-06 09:52:43 +02:00
Alex Moreno	f1b55ff75b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-06 09:44:27 +02:00
Alex Moreno	afbba83969	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-06 09:17:16 +02:00
Alex Moreno	89ba79053a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-06 09:17:11 +02:00
Guillermo Bonet	58677dca56	Merge pull request 'refactor: refs #7820 Deprecated silexACL' (!2833) from 7820-silexAcl into dev ... Reviewed-on: #2833 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-06 07:15:20 +00:00
Jorge Penadés	eaea1f3559	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-06 08:47:23 +02:00
Guillermo Bonet	1e41f5d533	Merge pull request 'feat: refs #7713 Created ACLLog' (!2783) from 7713-AclLog into dev ... Reviewed-on: #2783 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-06 05:05:19 +00:00
Pako Natek	dcdbb0bf93	Merge branch 'dev' into 7836-futureEntries	2024-08-05 12:29:30 +00:00
Pako Natek	be5859b8cf	prototipo	2024-08-05 14:28:29 +02:00
Guillermo Bonet	ea65a13cfb	Merge branch 'test' into dev	2024-08-05 12:59:44 +02:00
Guillermo Bonet	fa3a7aa931	refactor: refs #7820 Deprecated silexACL	2024-08-05 12:49:04 +02:00
Guillermo Bonet	21423d3b48	Merge branch 'test' into dev	2024-08-05 12:00:01 +02:00
Jorge Penadés	09783ae576	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-02 15:38:49 +02:00
Jorge Penadés	bf7cd1530c	feat: refs #7283 order by desc date	2024-08-02 15:36:02 +02:00
Guillermo Bonet	abd8bc9639	fix: refs #6453 order_confirmWithUser	2024-08-02 12:20:50 +02:00
Guillermo Bonet	ae9472e092	Merge pull request 'refactor: refs #6453 order_confirmWithUser' (!2694) from 6453-orderConfirm into dev ... Reviewed-on: #2694 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-02 10:14:58 +00:00
Guillermo Bonet	6acba08a91	Merge branch 'test' into dev	2024-08-02 12:08:40 +02:00
Guillermo Bonet	afb2f8d111	Merge branch 'test' into dev	2024-08-02 11:50:26 +02:00
Guillermo Bonet	879d48eb27	Merge branch 'test' into dev	2024-08-02 10:00:35 +02:00
Guillermo Bonet	b56260af36	feat: refs #6453 Requested changes	2024-08-02 07:58:45 +02:00
Alex Moreno	20caa5d9a1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-01 14:11:00 +02:00
Jon Elias	6620a1d119	Merge branch 'dev' into Worker_Migration	2024-08-01 11:56:06 +00:00
Jon Elias	ed283cac46	feat: deleted worker module code & redirect to Lilium	2024-08-01 13:15:11 +02:00
Guillermo Bonet	574529b920	Merge branch 'test' into dev	2024-07-31 09:00:31 +02:00
Robert Ferrús	1d22dc46f0	Merge branch 'dev' into 7646-deleteColumnsProductionConfig	2024-07-31 06:20:10 +00:00
Alex Moreno	fd00bfd175	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-31 08:11:21 +02:00
Sergio De la torre	3c62046277	feat workerActivity refs #6078	2024-07-31 06:43:19 +02:00
Sergio De la torre	eec7790a02	Merge pull request 'test' (!2815) from test into dev ... Reviewed-on: #2815 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-30 16:13:13 +00:00
Sergio De la torre	59df0b3886	feat workerActivity refs #6078	2024-07-30 17:46:21 +02:00
Guillermo Bonet	057174ae6a	Merge branch 'test' into dev	2024-07-30 13:53:58 +02:00
Sergio De la torre	eaa366ff39	feat workerActivity refs #6078	2024-07-30 12:36:02 +02:00
Guillermo Bonet	bcf08db6d6	Merge pull request 'refs #7531 Modify zone_getAddresses' (!2675) from 7531-Modify-zone_getAddresses into dev ... Reviewed-on: #2675 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-30 10:02:10 +00:00
Guillermo Bonet	857b1e9939	Merge branch 'test' into dev	2024-07-30 10:26:33 +02:00
Guillermo Bonet	b6abcbe090	feat: refs #6453 Requested changes	2024-07-30 10:14:20 +02:00
Jorge Penadés	c84f57ab6a	Merge pull request 'chore: refs #6989 add config model' (!2798) from 6989-showClientName into dev ... Reviewed-on: #2798 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-30 08:07:19 +00:00
Jorge Penadés	587b34f090	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6989-showClientName	2024-07-30 10:05:00 +02:00
Alex Moreno	fcd26784bf	build: init version 2434	2024-07-30 08:37:35 +02:00
Jorge Penadés	254cced550	chore: refs #6989 add config model	2024-07-29 13:40:30 +02:00
Guillermo Bonet	6ad3d5a5eb	feat: refs #6453 Minor changes	2024-07-29 12:36:08 +02:00
Guillermo Bonet	e53b12d51b	feat: refs #6453 Fixes	2024-07-29 12:31:44 +02:00
Guillermo Bonet	4c602800ea	feat: refs #6453 Added new ticket search	2024-07-29 11:46:59 +02:00
Robert Ferrús	d0dfb95718	feat: refs #7774	2024-07-24 13:56:21 +02:00
Guillermo Bonet	ffd65d700d	Merge branch 'dev' into 7713-AclLog	2024-07-24 08:07:07 +00:00
Guillermo Bonet	cf3ee07dd2	feat: refs #7713 Created ACLLog	2024-07-24 10:03:51 +02:00
Robert Ferrús	896e76016d	Merge branch 'dev' into 7646-deleteColumnsProductionConfig	2024-07-24 07:14:52 +00:00
Robert Ferrús	5a9ab84356	feat: refs #7646 delete scannableCodeType	2024-07-24 09:14:28 +02:00
Robert Ferrús	49888cc3b9	Merge branch 'dev' into 7774-ticket_cloneWeekly	2024-07-24 05:27:34 +00:00
Robert Ferrús	a7f725a194	feat: refs #7774 ticket_cloneWeekly	2024-07-24 07:25:43 +02:00
Alex Moreno	15e1f9763a	BREACKING CHANGE: claim redirect to lilium	2024-07-19 12:58:34 +02:00
Guillermo Bonet	578de51f7e	feat: #6453 Refactor	2024-07-19 10:54:40 +02:00
Guillermo Bonet	5f29384389	feat: #6453 Rollback always split by itemPackingType	2024-07-19 10:49:45 +02:00
Ivan Mas	c44bf909b2	Merge branch 'dev' into 7531-Modify-zone_getAddresses	2024-07-18 13:23:38 +00:00
Ivan Mas	a6e6f435f7	refs #7531 No assigned department	2024-07-18 15:21:59 +02:00
Ivan Mas	350e4b4c53	Merge branch 'dev' into 7531-Modify-zone_getAddresses	2024-07-16 16:57:50 +00:00
Ivan Mas	50e2c03d3e	refs #7531 Requested modifications in redmine	2024-07-16 18:56:00 +02:00
Guillermo Bonet	6dc464d26b	refactor: refs #6453 Minor changes	2024-07-11 07:14:02 +02:00
Guillermo Bonet	15f580508b	refactor: refs #6453 Minor changes	2024-07-10 11:29:14 +02:00
Guillermo Bonet	7e415181c2	refactor: refs #6453 Major changes	2024-07-10 11:26:45 +02:00
Guillermo Bonet	a1d3d2f2f8	refactor: refs #6453 Major changes	2024-07-10 10:30:24 +02:00
Guillermo Bonet	0e760ba505	refactor: refs #6453 order_confirmWithUser	2024-07-10 08:23:43 +02:00
Guillermo Bonet	a8d0345073	refactor: refs #6453 order_confirmWithUser	2024-07-10 08:18:33 +02:00
Guillermo Bonet	b75bdc07c2	refactor: refs #6453 order_confirmWithUser	2024-07-10 08:10:34 +02:00
Guillermo Bonet	b068327352	refactor: refs #6453 order_confirmWithUser	2024-07-08 10:49:39 +02:00
Guillermo Bonet	460723bd7a	refactor: refs #6453 order_confirmWithUser	2024-07-08 10:08:04 +02:00
Ivan Mas	4bef3e9107	refs #7531 Modify zone_getAddresses	2024-07-03 17:09:10 +02:00