refs #6915 test_master24_8 #2067

Merged

alexm merged 561 commits from test_master24_8 into master 2024-02-22 07:31:34 +00:00

Conversation 0 Commits 561 Files Changed 306 +21719 -34798

561 Commits

Author	SHA1	Message	Date
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	cbe23d8df5	Merge pull request 'Revert "Merge branch 'dev' into test"' (!2064) from test_revert into test ... Reviewed-on: #2064 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-02-21 13:47:38 +00: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
Alex Moreno	c4a64b93cc	Merge branch 'dev' into test	2024-02-21 13:32:54 +00:00
Ivan Mas	4a8707e327	Merge pull request '6626-Restricción-en-invoiceInTax' (!2060) from 6626-Restricción-en-invoiceInTax into dev ... Reviewed-on: #2060 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-21 13:14:48 +00:00
Robert Ferrús	2ab1cebb31	Merge pull request 'feat: refs #6371 restore Proveedores_cargueras' (!2061) from 6371-restoreProveedoresCargueras into test ... Reviewed-on: #2061 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-21 13:02:28 +00:00
Robert Ferrús	fba353f8e4	feat: refs #6371 restore Proveedores_cargueras	2024-02-21 13:43:33 +01:00
Ivan Mas	84270d29b8	refs #6626 modify invoiceInTax	2024-02-21 13:15:46 +01:00
Ivan Mas	f30a5a7597	refs #6626 invoiceInTax different transactions	2024-02-21 13:13:28 +01:00
Carlos Satorres	b4a0688bfc	Merge pull request 'refs #6414 tback' (!2051) from 6414-testBackClient into dev ... Reviewed-on: #2051 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-21 11:09:39 +00:00
Carlos Satorres	94359ea3db	Merge branch 'dev' into 6414-testBackClient	2024-02-21 11:08:16 +00:00
Sergio De la torre	1328a8fa96	Merge pull request 'refs #6834 feat:handle Error' (!2057) from 6834_sectorCollectionSaleGroup_add into dev ... Reviewed-on: #2057 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-21 11:06:53 +00:00
Carlos Satorres	7514348d13	Merge branch 'dev' into 6414-testBackClient	2024-02-21 09:29:45 +00:00
Sergio De la torre	448763ee72	refs #6834 feat:handle Error	2024-02-21 07:15:43 +01:00
Sergio De la torre	614652c357	refs #6834 feat:handle Error	2024-02-21 07:08:45 +01:00
Sergio De la torre	be81835474	refs #6834 feat:handle Error	2024-02-20 16:11:59 +01:00
Sergio De la torre	b9fe990003	refs #6834 feat:handle Error	2024-02-20 16:10:16 +01:00
Carlos Satorres	f3511d4a43	refs #6414 tback	2024-02-20 09:53:28 +01:00
Alex Moreno	06445f3ec1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-20 09:04:53 +01:00
Alex Moreno	4952e0be20	hotFix(getUrl): fix prop name environment	2024-02-20 09:04:50 +01:00
Guillermo Bonet	4d2637764e	Merge pull request 'refactor: refs #5586 Optimized SQL negativeBases' (!2007) from 5586-optimizeNegativeBases into dev ... Reviewed-on: #2007 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-20 06:28:04 +00:00
Guillermo Bonet	6daa7a03ff	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-20 06:26:16 +00:00
Javi Gallego	175f141fbe	Merge pull request '6392-balance-produccion-propia' (!2009) from 6392-balance-produccion-propia into dev ... Reviewed-on: #2009 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-19 14:10:35 +00:00
Javi Gallego	a7c48e9132	feat: #6392 quito de fixtures para que no falle la fk	2024-02-19 15:05:11 +01:00
Javi Gallego	c53ff1243f	feat: #6392 no es necesario agencyTermConfig	2024-02-19 14:37:36 +01:00
Javi Gallego	2c1172bd88	feat: #6392 sin gastos	2024-02-19 13:56:16 +01:00
Javi Gallego	8642ddcd7f	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-19 13:34:27 +01:00
Jorge Penadés	6720ef89b9	Merge pull request '#6776 makeMulti & itemShelvin_add refactor' (!1970) from 6776-makeMulti into dev ... Reviewed-on: #1970 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-19 12:23:44 +00:00
Jorge Penadés	d127354905	Merge branch 'dev' into 6776-makeMulti	2024-02-19 12:21:48 +00:00
Pako Natek	84a93cafd2	Merge pull request 'packing' (!2046) from 6358-boxPicking-BluePinguin into dev ... Reviewed-on: #2046 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-02-19 10:56:20 +00:00
Pako Natek	f0d59f12e6	Merge branch 'dev' into 6358-boxPicking-BluePinguin	2024-02-19 10:55:11 +00:00
Sergio De la torre	7e9d222b35	Merge pull request 'refs #6669 fix:ticket_isOutClosureZone' (!1984) from 6669_ticketClosure into dev ... Reviewed-on: #1984 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-19 10:33:51 +00:00
Sergio De la torre	a656447fdb	Merge branch 'dev' into 6669_ticketClosure	2024-02-19 10:31:49 +00: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
Jorge Penadés	fc6e34ddfd	fix: refs #6776 replace name	2024-02-19 11:18:05 +01:00
Jorge Penadés	882c179e89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti	2024-02-19 11:14:02 +01:00
Sergio De la torre	3a4463d0a4	Merge pull request 'refs #6531 feat:showLastTickets' (!2045) from 6531-showTickets into test ... Reviewed-on: #2045 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-19 10:00:32 +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	3193d17b5d	Merge branch 'dev' into 6669_ticketClosure	2024-02-19 08:11:28 +00:00
Pako Natek	ad1010f3fc	Merge branch 'dev' into 6358-boxPicking-BluePinguin	2024-02-19 07:37:54 +00:00
Pako Natek	3ef26bfd7d	packing	2024-02-19 08:34:17 +01:00
Sergio De la torre	dff70e57c1	Merge pull request '#6559 _getSectors' (!2014) from 6559_getSectors into dev ... Reviewed-on: #2014 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-19 06:01:04 +00:00
Sergio De la torre	15de4f0b73	refs #6531 feat:showLastTickets	2024-02-16 15:56:40 +01:00
Sergio De la torre	f4ea220578	Merge branch 'dev' into 6559_getSectors	2024-02-16 12:54:45 +00:00
Jorge Penadés	69acebb43c	fix: refs #6776 replace name	2024-02-16 13:48:55 +01:00
Jorge Penadés	8cecff36ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti	2024-02-16 13:14:59 +01:00
Carlos Satorres	59ea47a8c3	refs #6414 tback	2024-02-16 13:06:33 +01:00
Jorge Penadés	3cf61537b3	Merge pull request '#6760 modify transferClient' (!2035) from 6760-modifyTransferClient into dev ... Reviewed-on: #2035 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-16 12:00:09 +00:00
Jorge Penadés	f8ceca3575	Merge branch 'dev' into 6760-modifyTransferClient	2024-02-16 11:58:39 +00:00
Pablo Natek	a79ddc1c6c	Merge pull request '6358-boxPicking_ultimate' (!2044) from 6358-boxPicking_ultimate into dev ... Reviewed-on: #2044 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-02-16 11:17:25 +00:00
Pako Natek	f048412ad5	Merge branch 'dev' into 6358-boxPicking_ultimate	2024-02-16 11:13:10 +00:00
Pako Natek	bf67c2348d	refactor proc	2024-02-16 12:05:47 +01:00
Jorge Penadés	556a67ecfc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient	2024-02-16 08:26:32 +01:00
Sergio De la torre	a76872a082	refs #6669 fix:ticket_isOutClosureZone	2024-02-16 07:08:01 +01:00
Sergio De la torre	ca438c7c7f	Merge branch 'dev' into 6669_ticketClosure	2024-02-16 05:57:29 +00:00
Jorge Penadés	78583751ec	refactor: refs #6760 ticketsIds improved	2024-02-15 16:22:13 +01:00
Jorge Penadés	3d25b599ed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti	2024-02-15 14:49:21 +01:00
Jorge Penadés	f11aa2605b	feat: refs #6776 back & procedure modified	2024-02-15 14:48:30 +01:00
Javi Gallego	27627017c5	feat: #6392 fk que faltan	2024-02-15 14:21:49 +01:00
Guillermo Bonet	98ad133afd	Merge pull request 'refactor: refs #6775 Deleted proc itemProposal_Add' (!2034) from 6775-itemProposalAdd into dev ... Reviewed-on: #2034 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-15 12:21:23 +00:00
Guillermo Bonet	4b568bc41e	Merge branch 'dev' into 6775-itemProposalAdd	2024-02-15 13:19:58 +01:00
Alex Moreno	8cb17762f8	refs #6863 deployt: init version 24.10	2024-02-15 12:21:45 +01:00
Juan Ferrer	acc9d05530	build: refs #6859 pnpm-lock.yaml updated	2024-02-15 11:49:25 +01:00
Juan Ferrer	38cfb6e03e	build: refs #6859 Merge from test	2024-02-15 11:47:33 +01:00
Juan Ferrer	a9ccbfc1d4	Merge branch 'test' into dev	2024-02-15 11:41:01 +01:00
Jorge Penadés	be7a570314	fix: refs #6776 test	2024-02-15 11:18:01 +01:00
Guillermo Bonet	f63abc1a6e	fix: refs #6859 zoneEstimatedDelivery	2024-02-15 11:07:47 +01:00
Jorge Penadés	bec574ff99	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti	2024-02-15 11:03:33 +01:00
Guillermo Bonet	256aa76e23	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-15 09:18:13 +00:00
Alex Moreno	625922275c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-15 10:14:19 +01:00
Guillermo Bonet	5a0ce700b3	fix: refs #5586 Requested changes	2024-02-15 09:38:34 +01:00
Jorge Penadés	fa7b94590d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient	2024-02-15 08:36:00 +01:00
Javi Gallego	6691155217	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-15 08:14:56 +01:00
Guillermo Bonet	8c262df31e	Merge branch '5586-optimizeNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix into 5586-optimizeNegativeBases	2024-02-15 07:52:34 +01:00
Guillermo Bonet	10bfb7a7d7	fix: refs #5586 Minor change	2024-02-15 07:52:33 +01:00
Guillermo Bonet	46a1ad35b5	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-15 06:50:03 +00:00
Guillermo Bonet	05b7c37b94	fix: refs #5586 Rollback	2024-02-15 07:49:17 +01:00
Alex Moreno	b08dd95e92	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-15 07:30:42 +01:00
Javi Gallego	798bd10303	Merge pull request 'feat: refs #5720 vehicle nuevos campos' (!2029) from 5720-poolbancario into dev ... Reviewed-on: #2029 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-14 14:02:21 +00:00
Robert Ferrús	e21f8aafe0	Merge pull request 'fix: refs #6371 balanceNestTree add constraint' (!2039) from 6371-fixCreateConstraint into dev ... Reviewed-on: #2039 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-14 13:48:57 +00:00
Javi Gallego	d7efdacab3	Merge branch 'dev' into 5720-poolbancario	2024-02-14 13:47:13 +00:00
Robert Ferrús	88f508a424	fix: refs #6371 balanceNestTree add constraint	2024-02-14 14:42:04 +01:00
Guillermo Bonet	a690401b33	Merge pull request 'refactor: refs #6778 Migrated views of vn2008 to vn' (!1996) from 6778-changeViewDependencesVn2008 into dev ... Reviewed-on: #1996 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-14 13:17:46 +00: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	8ee8fe1851	Merge branch '6778-changeViewDependencesVn2008' of https://gitea.verdnatura.es/verdnatura/salix into 6778-changeViewDependencesVn2008	2024-02-14 12:12:41 +01:00
Guillermo Bonet	35fc8930ce	fix: refs #6778 Fix and tested	2024-02-14 12:12:40 +01:00
Guillermo Bonet	18c10e2dd7	refactor: refs #6778 Requested changes	2024-02-14 11:39:15 +01:00
Guillermo Bonet	2c82a64029	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-14 10:38:33 +00:00
Guillermo Bonet	267fd8beb8	Merge pull request 'refactor: refs #6501 Migrated procs from vn2008 to vn' (!2016) from 6501-procMigration into dev ... Reviewed-on: #2016 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-14 10:31:12 +00:00
Guillermo Bonet	b46087b75c	refactor: refs #6501 Requested changes	2024-02-14 11:21:22 +01:00
Guillermo Bonet	b815677a1f	Merge branch '6501-procMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6501-procMigration	2024-02-14 11:16:53 +01:00
Guillermo Bonet	b64637254b	refactor: refs #6501 Requested changes	2024-02-14 11:16:52 +01:00
Guillermo Bonet	08db19bf4e	Merge branch 'dev' into 6501-procMigration	2024-02-14 10:11:12 +00:00
Robert Ferrús	0ee5226dcb	Merge pull request 'feat: refs #6371 cleanTablesFix' (!2011) from 6371-limpiezaTablasVn2008Part1Fix into dev ... Reviewed-on: #2011 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-14 10:10:10 +00:00
Guillermo Bonet	cddb8dc216	Merge branch 'dev' into 6501-procMigration	2024-02-14 10:06:23 +00:00
Guillermo Bonet	874f776498	refactor: refs #6501 Requested changes	2024-02-14 11:05:16 +01:00
Robert Ferrús	fb44052a09	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix	2024-02-14 10:01:36 +00:00
Javier Segarra	f608eb1859	Merge pull request '#6386 - Download method add file with extension' (!1993) from 6386_imageWithNoFormat into dev ... Reviewed-on: #1993 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-02-14 08:13:55 +00:00
Javi Gallego	3665db359e	feat: #63922 actualiza usando las fk	2024-02-14 09:02:39 +01:00
Robert Ferrús	4cfe4cf96d	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix	2024-02-14 07:39:18 +00:00
Juanjo Breso	f765fcca2c	Merge pull request 'feat: refs #6693 revisar triggers' (!2033) from 6693-revisarTriggersPendientes into dev ... Reviewed-on: #2033 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-02-14 07:12:02 +00:00
Juanjo Breso	6fe6e35607	Merge branch 'dev' into 6693-revisarTriggersPendientes	2024-02-14 07:10:08 +00:00
Juanjo Breso	c2dadc09a2	feat: refs #6693 comprobar triggers	2024-02-14 07:36:38 +01:00
Guillermo Bonet	d83823ed0e	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-14 07:07:00 +01:00
Guillermo Bonet	9dd5b725e1	Merge branch 'dev' into 6501-procMigration	2024-02-14 06:04:25 +00:00
Guillermo Bonet	142c1bf7bd	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-14 06:03:46 +00:00
Juan Ferrer	19bbb4a4bf	fix: refs#6706 package.json deprecated scripts removed	2024-02-13 17:20:04 +01:00
Juan Ferrer	27d7a114e6	fix: refs#6706 package.json dbtest script removed	2024-02-13 17:16:10 +01:00
Juan Ferrer	a5d1597884	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-13 16:21:02 +01:00
Juan Ferrer	999d9a0f9c	fix: refs#6706 E2E show parameter fix	2024-02-13 16:21:01 +01:00
Ivan Mas	11bbab6288	Merge pull request 'feat: refs #6830 item_getLack origin' (!2025) from 6830-item_getLackOrigin into dev ... Reviewed-on: #2025 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-13 13:14:02 +00:00
Ivan Mas	add5fedc4e	Merge branch 'dev' into 6830-item_getLackOrigin	2024-02-13 13:12:02 +00:00
Juanjo Breso	c9294680a5	Merge branch 'dev' into 6693-revisarTriggersPendientes	2024-02-13 12:53:13 +00:00
Pako Natek	cf0d7e04a1	rounding stickers down	2024-02-13 13:43:31 +01:00
Sergio De la torre	9f40cbc123	Merge branch 'dev' into 6669_ticketClosure	2024-02-13 12:32:13 +00:00
Guillermo Bonet	92261ebe0d	fix: refs #5586 Tests fix	2024-02-13 13:09:12 +01:00
Guillermo Bonet	bdc6192a7c	refactor: refs #5586 Optimized SQL negativeBases	2024-02-13 12:50:39 +01:00
Guillermo Bonet	42de1a7e51	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-13 12:29:46 +01:00
Jorge Penadés	9bd8c21660	Merge pull request '#6813 fix creditClient' (!2026) from 6813-fixCreditClient into dev ... Reviewed-on: #2026 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>	2024-02-13 10:53:38 +00:00
Jorge Penadés	76b4f8f46f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6813-fixCreditClient	2024-02-13 11:46:47 +01:00
Guillermo Bonet	bf6d068830	Merge pull request 'refactor: refs #6781 Deleted timeControlDevice' (!2032) from 6781-timeControlDevice into dev ... Reviewed-on: #2032 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-13 10:16:43 +00:00
Jorge Penadés	579f2abe5b	fix: refs #6813 remove quotation marks	2024-02-13 11:16:00 +01:00
Guillermo Bonet	3c6e3a9856	Merge branch 'dev' into 6501-procMigration	2024-02-13 10:15:46 +00:00
Guillermo Bonet	ed67b1168f	refactor: refs #6501 Requested changes	2024-02-13 11:14:35 +01:00
Jorge Penadés	db2919b482	fix: refs #6813 procedure	2024-02-13 11:05:21 +01:00
Jorge Penadés	d7fb31ee60	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6813-fixCreditClient	2024-02-13 10:16:12 +01:00
Guillermo Bonet	d3755d6aa2	Merge branch 'dev' into 6775-itemProposalAdd	2024-02-13 09:11:55 +00:00
Guillermo Bonet	b1fa834626	refactor: refs #6775 Deleted proc itemProposal_Add	2024-02-13 10:12:08 +01:00
Josep Domingo	51b336d9f7	Merge pull request 'refs#6685 RestoreViewCredit' (!2030) from 6685-fixRestoreViewCredit into dev ... Reviewed-on: #2030 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-13 09:00:03 +00:00
Josep Domingo	68034fc404	Merge branch 'dev' into 6685-fixRestoreViewCredit	2024-02-13 08:56:05 +00:00
Javi Gallego	51afb87122	feat: #6392 cambia gasto	2024-02-13 09:54:26 +01:00
Juanjo Breso	185cc4f17f	feat: refs #6693 revisar triggers	2024-02-13 09:50:07 +01:00
Juan Ferrer	4f9b46346f	fix: refs#6706 back tests spec timeout reduced	2024-02-13 09:49:33 +01:00
Guillermo Bonet	bbb3f3807a	Merge pull request 'fix: refs #6184 Minor change' (!2031) from 6184-externalCmr into dev ... Reviewed-on: #2031 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-13 08:45:03 +00:00
Guillermo Bonet	b449da28ef	Merge branch 'dev' into 6184-externalCmr	2024-02-13 08:42:31 +00:00
Jorge Penadés	995e249495	Merge pull request '#6106 where filter' (!2024) from 6106-fixSignView into dev ... Reviewed-on: #2024 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-13 08:42:14 +00:00
Guillermo Bonet	744171dd4c	fix: refs #6184 Requested changes	2024-02-13 09:41:26 +01:00
Jorge Penadés	c8e13fa858	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6106-fixSignView	2024-02-13 09:36:07 +01:00
Jorge Penadés	6116ada156	fix: refs #6813 remove inserts	2024-02-13 09:35:39 +01:00
Guillermo Bonet	41db1c924f	refactor: refs #6781 Deleted timeControlDevice	2024-02-13 09:20:21 +01:00
Guillermo Bonet	e08fb3d229	fix: refs #6184 Minor change	2024-02-13 08:59:58 +01:00
Josep Domingo	4feae72ee3	Merge branch 'dev' into 6685-fixRestoreViewCredit	2024-02-13 07:58:41 +00:00
Josep Domingo	3b35e4dae8	refs#6685 RestoreViewCredit	2024-02-13 08:57:49 +01:00
Josep Domingo	5b137ad825	Merge pull request 'feat: refs #6685 RestoreViewCredit' (!2028) from 6685-fixRestoreViewCredit into dev ... Reviewed-on: #2028 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-13 07:46:18 +00:00
Javi Gallego	118fbcb94f	feat: #5720 vehicle nuevos campos	2024-02-13 07:55:40 +01:00
Josep Domingo	a897a05e8b	feat: refs#6685RestoreViewCredit	2024-02-13 07:52:09 +01:00
Guillermo Bonet	8f4b901818	Merge pull request 'refs #6184 saveCmr' (!1788) from 6184-saveCmr into dev ... Reviewed-on: #1788 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-13 06:47:05 +00:00
Guillermo Bonet	97f02187e3	Merge branch 'dev' into 6184-saveCmr	2024-02-13 07:35:07 +01:00
Guillermo Bonet	c4528a9eac	Merge branch 'dev' into 6501-procMigration	2024-02-13 06:16:13 +00:00
Guillermo Bonet	fb84fe4b97	refactor: refs #6501 Requested changes	2024-02-13 07:16:32 +01:00
Robert Ferrús	3c7fda87c8	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix	2024-02-12 12:59:24 +00:00
Ivan Mas	0ed5a0ff16	Merge pull request 'refs #6446 Delete function nz from db' (!2022) from 6446-Delete-function-nz-from-DB into dev ... Reviewed-on: #2022 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-12 12:56:05 +00:00
Ivan Mas	474c616b86	Merge branch 'dev' into 6446-Delete-function-nz-from-DB	2024-02-12 12:54:21 +00:00
Guillermo Bonet	00109e86af	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-12 12:20:03 +00:00
Guillermo Bonet	96d6637a3f	refactor: refs #6501 Minor change	2024-02-12 11:32:07 +01:00
Guillermo Bonet	ee67a02bf0	refactor: refs #6501 Minor change	2024-02-12 11:28:54 +01:00
Jorge Penadés	534b5bb05a	fix: refs #6106 where filter	2024-02-12 11:26:00 +01:00
Robert Ferrús	ead206bd92	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix	2024-02-12 10:16:06 +00:00
Robert Ferrús	8a7441be57	feat: refs #6371	2024-02-12 11:14:17 +01:00
Guillermo Bonet	fb76381624	refactor: refs #6501 Minor change	2024-02-12 11:02:24 +01:00
Guillermo Bonet	4b5802202d	refactor: refs #6501 Minor change	2024-02-12 10:36:09 +01:00
Guillermo Bonet	23bf9b2750	refactor: refs #6501 Minor change	2024-02-12 10:28:25 +01:00
Guillermo Bonet	f89ae0aad9	refactor: refs #6501 Minor change	2024-02-12 10:18:31 +01:00
Guillermo Bonet	212bf58932	refactor: refs #6501 Minor change	2024-02-12 10:08:56 +01:00
Guillermo Bonet	fc5daf119c	Merge branch 'dev' into 6501-procMigration	2024-02-12 07:56:38 +00:00
Jorge Penadés	d7e51e01a2	Merge pull request '#6379 fixDriverRouteEmail' (!2018) from 6379-fixDriverRouteEmail into dev ... Reviewed-on: #2018 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-12 07:46:55 +00:00
Javi Gallego	a18ddc8e9a	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-12 08:45:53 +01:00
Javi Gallego	c818601552	feat: #6392 constraint solved	2024-02-12 08:45:47 +01:00
Jorge Penadés	d60a95feaa	fix: refs #6379 await & locale	2024-02-12 08:34:25 +01:00
Jorge Penadés	80bae4fdac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail	2024-02-12 08:31:59 +01:00
Ivan Mas	b06f80e091	refs #6446 Delete function nz from db	2024-02-12 08:11:49 +01:00
Sergio De la torre	278337dc97	Merge pull request 'refs #6651 feat:add urlImage' (!2015) from 6651_itemShelving_get into dev ... Reviewed-on: #2015 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-12 06:24:55 +00:00
Sergio De la torre	1f99450ecb	Merge branch 'dev' into 6651_itemShelving_get	2024-02-12 05:57:02 +00:00
Ivan Mas	a0599403c8	Merge pull request 'fix: refs #6443 #6444 #6445 ChangeRevokeToGrant' (!2019) from 6443-6444-6445-fix-permissions into dev ... Reviewed-on: #2019 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-09 13:02:38 +00:00
Jorge Penadés	1be1990936	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail	2024-02-09 14:01:24 +01:00
Ivan Mas	222335809e	Merge branch 'dev' into 6443-6444-6445-fix-permissions	2024-02-09 13:00:47 +00:00
Jorge Penadés	e96b14ad04	Merge pull request '#6806 fix lastEntriesFilter' (!2013) from 6806-fixEntryFilter into dev ... Reviewed-on: #2013 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-09 12:47:17 +00:00
Jorge Penadés	9cf5edb26e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail	2024-02-09 13:45:33 +01:00
Jorge Penadés	c3b0a8260a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6806-fixEntryFilter	2024-02-09 13:38:59 +01:00
Ivan Mas	362d825202	fix: refs #6443 #6444 #6445 ChangeRevokeToGrant	2024-02-09 13:38:09 +01:00
Jorge Penadés	e61b6b0c13	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail	2024-02-09 13:36:53 +01:00
Jorge Penadés	e0de498f65	fix: refs #6379 add Error & locale	2024-02-09 13:04:27 +01:00
Carlos Satorres	3ee63e489e	Merge pull request 'refs #6791 remake negativeBases' (!2017) from 6791-negativeNickname into dev ... Reviewed-on: #2017 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-09 11:49:37 +00:00
Carlos Satorres	e03e871529	Merge branch 'dev' into 6791-negativeNickname	2024-02-09 11:47:36 +00:00
Carlos Satorres	1597f17230	refs #6791 remove intro	2024-02-09 12:47:17 +01:00
Jorge Penadés	4075375d6e	fix: refs #6379 get mail	2024-02-09 12:12:10 +01:00
Carlos Satorres	3e57bf2b34	refs #6791 remake negativeBases	2024-02-09 11:49:29 +01:00
Guillermo Bonet	dbe63ad11b	refactor: refs #6501 Fix grant errors	2024-02-09 11:45:31 +01:00
Guillermo Bonet	2d6c56cd26	Merge branch '6501-procMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6501-procMigration	2024-02-09 11:41:24 +01:00
Guillermo Bonet	22e6f547fa	refactor: refs #6501 Migrated procs from vn2008 to vn	2024-02-09 11:41:23 +01:00
Guillermo Bonet	cc863a65f6	refactor: refs #6501 Migrated procs from vn2008 to vn	2024-02-09 11:40:20 +01:00
Guillermo Bonet	0cea80ad46	Merge branch 'dev' into 6501-procMigration	2024-02-09 10:39:47 +00:00
Javi Gallego	463b3fb6f3	feat: #6392 solveConflicts	2024-02-09 11:35:47 +01:00
Sergio De la torre	dcefc9d382	refs #6651 feat:add urlImage	2024-02-09 11:14:30 +01:00
Jorge Penadés	3f08cdd51c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6806-fixEntryFilter	2024-02-09 09:45:10 +01:00
Jorge Penadés	e5f2be9f9c	Merge pull request '#6272 updateFiscalData' (!2001) from 6272-updateFiscalData into dev ... Reviewed-on: #2001 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-09 08:41:41 +00:00
Jorge Penadés	8cef56f4f8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6272-updateFiscalData	2024-02-09 09:35:28 +01:00
Juan Ferrer	26d4dbbe34	fix: refs#6706 docker-compose.yml fixes	2024-02-09 09:26:46 +01:00
Juan Ferrer	f18191d6e9	refactor: refs#6706 root dir clean, minimist dep removed	2024-02-09 09:23:00 +01:00
Robert Ferrús	02bf78d00a	feat: refs #6830 item_getLack origin	2024-02-09 09:22:24 +01:00
Sergio De la torre	08728d3162	refs #6651 feat:add urlImage	2024-02-09 07:51:51 +01:00
Jorge Penadés	4f9c1b8c95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6272-updateFiscalData	2024-02-09 07:49:32 +01:00
Sergio De la torre	36683597ec	refs #6559 feat:quit call get_sectors	2024-02-09 07:02:00 +01:00
Sergio De la torre	c2360ca154	refs #6559 feat:quit call get_sectors	2024-02-09 06:59:39 +01:00
Jorge Penadés	30069ded15	fix: refs #6806 fix date filter	2024-02-08 16:01:34 +01:00
Guillermo Bonet	18a27e032f	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-08 13:55:00 +00:00
Robert Ferrús	53a367f4b3	feat: refs #6371 cleanTablesFix	2024-02-08 13:04:06 +01:00
Guillermo Bonet	cd613c770c	Merge branch 'dev' into 6184-saveCmr	2024-02-08 11:25:24 +00:00
Guillermo Bonet	8e8ee39302	Merge pull request 'refactor: refs #6609 sectorType description to code' (!2008) from 6609-sectorType into dev ... Reviewed-on: #2008 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-02-08 11:19:38 +00:00
Guillermo Bonet	6a94a48a9d	refactor: refs #6609 sectorType description to code	2024-02-08 12:18:37 +01:00
Guillermo Bonet	a2bb3c476c	Merge branch '6609-sectorType' of https://gitea.verdnatura.es/verdnatura/salix into 6609-sectorType	2024-02-08 12:08:20 +01:00
Guillermo Bonet	3f400f92e5	refactor: refs #6609 sectorType description to code	2024-02-08 12:08:19 +01:00
Guillermo Bonet	2676cb840c	Merge branch 'dev' into 6609-sectorType	2024-02-08 11:05:05 +00:00
Guillermo Bonet	2e009b6f25	refactor: refs #6609 sectorType description to code	2024-02-08 12:04:34 +01:00
Ivan Mas	2b987d2461	Merge pull request 'refs #6443 migrate vn2008.cc_to_iban to util.accountNumberToIban' (!2006) from 6443-MigrateVn2008.cc_to_ibanToUtil into dev ... Reviewed-on: #2006 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-08 10:48:42 +00:00
Ivan Mas	3dfc85db42	Merge branch 'dev' into 6443-MigrateVn2008.cc_to_ibanToUtil	2024-02-08 10:46:37 +00:00
Guillermo Bonet	974228eedd	refactor: refs #5586 Optimized SQL negativeBases	2024-02-08 11:37:15 +01:00
Javi Gallego	3e8fbce34d	feat: #6392 testeado	2024-02-08 11:08:03 +01:00
Ivan Mas	dee7019824	refs #6443 migrate vn2008.cc_to_iban to util.accountNumberToIban	2024-02-08 10:50:56 +01:00
Guillermo Bonet	f6c9f799c5	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-08 07:25:00 +00:00
Jorge Penadés	06757640a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6272-updateFiscalData	2024-02-08 08:15:39 +01:00
Guillermo Bonet	21d047c21f	Merge branch 'dev' into 6184-saveCmr	2024-02-08 06:06:03 +00:00
Juan Ferrer	c4907d1a33	ci: refs#6706 Jenkinsfile fixes	2024-02-07 13:56:21 +01:00
Juan Ferrer	eda85eda76	ci: refs#6706 Jenkinsfile fixes	2024-02-07 13:24:50 +01:00
Juan Ferrer	bdfbb8f6f7	build: refs#6706 gulp install fixed, myt updated	2024-02-07 12:54:37 +01:00
Guillermo Bonet	ffa9212861	fix: refs #6184 Requested changes	2024-02-07 10:29:42 +01:00
Jorge Penadés	aff8ee28ea	fix: refs #6272 back & create test	2024-02-07 10:16:47 +01:00
Alex Moreno	87864593b2	Merge branch 'dev' into 6184-saveCmr	2024-02-07 06:17:35 +00:00
Guillermo Bonet	c1789433f8	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-07 07:10:11 +01:00
Juan Ferrer	46dee65e68	ci: refs#6706 Myt updated	2024-02-06 22:22:25 +01:00
Juan Ferrer	a67a347a9e	ci: refs#6706 CI fixes	2024-02-06 21:51:15 +01:00
Javier Segarra	a8a5ddd889	Merge pull request '#5834 - billingDataAutoFillBic' (!1821) from 5834-billingDataAutoFillBic into dev ... Reviewed-on: #1821	2024-02-06 16:36:35 +00:00
Javier Segarra	4d6e631fca	Merge branch 'dev' into 5834-billingDataAutoFillBic	2024-02-06 17:33:27 +01:00
Javi Gallego	153e002cb8	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-06 15:54:06 +01:00
Javi Gallego	6a738627e7	feat: #6392 adaptado a los nuevos nombres	2024-02-06 15:42:03 +01:00
Ivan Mas	4592429b3d	Merge pull request '6444-MigrateVn2008.intrastat_netoFunctionToVn' (!1972) from 6444-MigrateVn2008.intrastat_netoFunctionToVn into dev ... Reviewed-on: #1972 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-06 13:21:23 +00:00
Guillermo Bonet	1358324f81	Merge branch 'dev' into 6444-MigrateVn2008.intrastat_netoFunctionToVn	2024-02-06 13:18:42 +00:00
Guillermo Bonet	c3174c0c38	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-06 13:02:30 +00:00
Juan Ferrer	f909c648a7	ci: refs#6706 Jenkinsfile fixes	2024-02-06 12:21:06 +01:00
Juan Ferrer	9c2ec2b8dd	ci: refs#6706 Jenkinsfile fixes	2024-02-06 12:17:45 +01:00
Juan Ferrer	4c123247d8	ci: refs#6706 Jenkinsfile fixes	2024-02-06 12:16:49 +01:00
Juan Ferrer	4067108258	ci: refs#6706 Jenkinsfile fixes	2024-02-06 12:14:00 +01:00
Guillermo Bonet	f4feb6e8b7	Merge branch 'dev' into 6184-saveCmr	2024-02-06 12:13:48 +01:00
Guillermo Bonet	2cab007f57	fix: refs #6184 Requested changes	2024-02-06 12:12:45 +01:00
Juan Ferrer	5c48d8c6b9	ci: refs#6706 Jenkinsfile fixes	2024-02-06 12:12:09 +01:00
Juan Ferrer	19080e348a	ci: refs#6706 Jenkinsfile print properties	2024-02-06 12:11:03 +01:00
Juan Ferrer	28168130ae	ci: refs#6706 Jenkinsfile fixes	2024-02-06 11:40:13 +01:00
Ivan Mas	55b9155189	Merge branch 'dev' into 6444-MigrateVn2008.intrastat_netoFunctionToVn	2024-02-06 10:39:38 +00:00
Juan Ferrer	4af454edd4	ci: refs#6706 Jenkinsfile debug	2024-02-06 11:38:30 +01:00
Ivan Mas	80314d86cf	Merge branch 'dev' into 6444-MigrateVn2008.intrastat_netoFunctionToVn	2024-02-06 10:36:42 +00:00
Juan Ferrer	e581247954	ci: refs#6706 Jenkinsfile load properties from config	2024-02-06 11:27:14 +01:00
Juan Ferrer	50af5154f4	ci: refs#6706 Jenkinsfile load environemnt	2024-02-06 10:54:32 +01:00
Juan Ferrer	bf0ee052f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-06 10:38:13 +01:00
Juan Ferrer	f8155539c6	ci: refs#6706 Jenkinsfile fixes	2024-02-06 10:38:11 +01:00
Carlos Satorres	78232866c9	Merge pull request 'refs #6757 fix back, fix upperCase, fix e2e back' (!1985) from 6757-supplierMayus into dev ... Reviewed-on: #1985 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-06 09:31:04 +00:00
Alex Moreno	409bf9649f	Merge branch 'dev' into 6757-supplierMayus	2024-02-06 09:29:43 +00:00
Ivan Mas	a2fcf2df23	Merge branch 'dev' into 6444-MigrateVn2008.intrastat_netoFunctionToVn	2024-02-06 09:25:34 +00:00
Juan Ferrer	ee122430e2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-06 10:20:06 +01:00
Juan Ferrer	b3e658f9aa	ci: refs#6706 Jenkinsfile fixes	2024-02-06 10:20:04 +01:00
Juanjo Breso	863b37384f	Merge pull request 'feat: refs#5167 Update' (!1976) from 5167-kk-warehouseAlias-y-warehouseJoined into dev ... Reviewed-on: #1976 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-06 09:16:15 +00:00
Juan Ferrer	edb445b080	Merge branch 'dev' into 6444-MigrateVn2008.intrastat_netoFunctionToVn	2024-02-06 09:11:54 +00:00
Carlos Satorres	318f74072e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6757-supplierMayus	2024-02-06 10:09:11 +01:00
Juanjo Breso	6b5e1ecc01	Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined	2024-02-06 09:07:43 +00:00
Juanjo Breso	a949c25860	feat refs #5167 changes required	2024-02-06 10:09:39 +01:00
Carlos Satorres	6002c6cd7a	refs #6757 fix trad	2024-02-06 10:07:39 +01:00
Juanjo Breso	7ebb9cb429	feat: refs #5167 change required	2024-02-06 09:55:47 +01:00
Ivan Mas	3c140266f4	Merge pull request 'refs #6665 delete unused views' (!1999) from refs-#6665-Clean-Views-vn2008-(1/9) into dev ... Reviewed-on: #1999 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-06 08:54:13 +00:00
Ivan Mas	c3912dd098	Merge branch 'dev' into refs-#6665-Clean-Views-vn2008-(1/9)	2024-02-06 08:51:57 +00:00
Juanjo Breso	c4eea81723	Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined	2024-02-06 08:43:30 +00:00
Javi Gallego	19ab90a03c	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-06 09:24:19 +01:00
Guillermo Bonet	8c13ebc5fc	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-06 08:23:18 +00:00
Ivan Mas	0d0896758c	Merge pull request 'refs #6445 remove red function and modify precedures' (!1998) from 6445-Remove-Vn2008.red-Function into dev ... Reviewed-on: #1998 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-06 08:07:55 +00:00
Ivan Mas	5729ba90d1	Merge branch 'dev' into 6445-Remove-Vn2008.red-Function	2024-02-06 08:04:50 +00:00
Jorge Penadés	67f29b2d1a	Merge pull request '#4466 InvoiceIn Rectification' (!1902) from 4466-invoiceInRectificated into dev ... Reviewed-on: #1902 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-06 07:49:19 +00:00
Jorge Penadés	fd4b246bd6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-06 08:41:30 +01:00
Ivan Mas	438af34d73	refs #6444 cambio vUnits por vStems	2024-02-06 08:40:06 +01:00
Guillermo Bonet	a72acbb08f	fix: refs# 6642 Bug apply version	2024-02-06 08:21:34 +01:00
Guillermo Bonet	f67b5fabe6	Merge branch 'test' into dev	2024-02-06 08:18:39 +01:00
Alex Moreno	f7a93a7ccb	Merge branch 'dev' into 4466-invoiceInRectificated	2024-02-06 07:06:16 +00:00
Juanjo Breso	9f6807204d	feat: refs #5167 changes required	2024-02-06 08:05:30 +01:00
Guillermo Bonet	92abc3fb78	Merge branch 'dev' into 6184-saveCmr	2024-02-06 07:05:27 +00:00
Guillermo Bonet	f2946e4168	fix: refs #6184 Requested changes	2024-02-06 08:04:19 +01:00
Juanjo Breso	b480df069d	Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined	2024-02-06 06:50:40 +00:00
Javi Gallego	ebf80a4eb9	Merge pull request 'feat: #6749 se mira la vida para buscar dias en el pasado' (!1978) from 6749-disponible-sin-dar-vida into dev ... Reviewed-on: #1978 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-02-06 06:32:08 +00:00
Javi Gallego	22349eb36b	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-06 07:26:48 +01:00
Javi Gallego	990ab82461	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-06 07:26:35 +01:00
Javi Gallego	147721642b	Merge branch 'dev' into 6749-disponible-sin-dar-vida	2024-02-06 06:22:21 +00:00
Guillermo Bonet	d6ae1fd1f8	Merge branch 'dev' into 6184-saveCmr	2024-02-06 06:39:51 +01:00
Guillermo Bonet	ea4f4e1636	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-05 13:11:26 +00:00
Javi Gallego	0b12576d2f	Merge pull request '#6742-incoterm-error' (!1989) from 6742-incoterm-error into dev ... Reviewed-on: #1989 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-05 12:54:29 +00:00
Javi Gallego	980f2e61b1	Merge branch 'dev' into 6742-incoterm-error	2024-02-05 12:52:55 +00:00
Ivan Mas	6fb198f579	refs #6665 revoke permissions	2024-02-05 13:09:35 +01:00
Juan Ferrer	33c96df0b1	ci: refs#6706 Dockerfile fixes	2024-02-05 12:28:45 +01:00
Ivan Mas	9247a802bd	refs #6665 delete unused views	2024-02-05 12:21:11 +01:00
Javi Gallego	5c9589ba7b	Merge branch 'dev' into 6742-incoterm-error	2024-02-05 11:13:37 +00:00
Jorge Penadés	7a66abce6c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-05 12:00:05 +01:00
Jorge Penadés	a0c5b1fff6	feat: refs # test corrective & clone	2024-02-05 11:59:51 +01:00
Juan Ferrer	cfcfa489b4	ci: refs#6706 Jenkinsfile & deps fixes	2024-02-05 11:38:16 +01:00
Juan Ferrer	0ae1d6c546	Merge pull request 'build: refs #6706 Migration to pnpm' (!1990) from 6706-optimizeHooks into dev ... Reviewed-on: #1990 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-05 10:29:47 +00:00
Juan Ferrer	43c245b45b	Merge branch 'dev' into 6706-optimizeHooks	2024-02-05 10:27:53 +00:00
Jorge Penadés	b5ad85dbb5	Merge pull request '#6703 fix test back' (!1997) from 6703-fixTestBack into dev ... Reviewed-on: #1997 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-05 09:12:52 +00:00
Jorge Penadés	cd73e5adfe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-05 09:37:43 +01:00
Jorge Penadés	99fbb95669	fix: refs #6703 test back	2024-02-05 09:35:20 +01:00
Jorge Penadés	05478b43f2	fix: refs #4466 test back	2024-02-05 09:30:29 +01:00
Jorge Penadés	13021180e1	Merge pull request '#6557 replace getSubordinates for WorkerGetHierach' (!1952) from 6557-useWorkerGetHierarch into dev ... Reviewed-on: #1952 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-05 08:10:44 +00:00
Guillermo Bonet	80aaaf3fc5	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-05 08:02:04 +00:00
Guillermo Bonet	d28cacfbad	refactor: refs #6778 Migrated views of vn2008 to vn	2024-02-05 09:02:31 +01:00
Jorge Penadés	9ee01e2bc2	Merge pull request '#6703 refactor saleRefund' (!1954) from 6703-refactorSaleRefund into dev ... Reviewed-on: #1954 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-05 07:51:17 +00:00
Jorge Penadés	17680b2cc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-05 08:49:48 +01:00
Jorge Penadés	86d839ad45	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-02-05 08:48:22 +01:00
Jorge Penadés	ef5401aa46	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-02-05 08:44:23 +01:00
Carlos Satorres	810df2ab95	Merge pull request 'refs #6270 makeInvoice' (!1963) from 6270-electronicInvoiceBack into dev ... Reviewed-on: #1963 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-05 07:44:17 +00:00
Jorge Penadés	0c356938fc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-05 08:43:56 +01:00
Juanjo Breso	4a73bd0133	Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined	2024-02-05 07:40:38 +00:00
Alex Moreno	fdd4947401	Merge branch 'dev' into 6742-incoterm-error	2024-02-05 07:38:32 +00:00
Ivan Mas	1a869766b9	refs #6444 change code accord to conventions	2024-02-05 08:32:45 +01:00
Carlos Satorres	c16be228e3	Merge branch 'dev' into 6270-electronicInvoiceBack	2024-02-05 07:28:13 +00:00
Jorge Penadés	567359ad6a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-05 08:27:42 +01:00
Jorge Penadés	ebd51c4d23	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-02-05 08:24:44 +01:00
Jorge Penadés	4164fd8250	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-05 08:22:42 +01:00
Juanjo Breso	f4591aae85	feat: refs #5167 Restaurar zoneEstimatedDelivery	2024-02-05 08:07:12 +01:00
David Domenech	045dfa2aa1	Merge pull request 'test' (!1995) from test into dev ... Reviewed-on: #1995 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-05 07:00:34 +00:00
Juanjo Breso	592e5c877f	Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined	2024-02-05 06:49:51 +00:00
Juanjo Breso	f5108a911f	Merge pull request 'feat: refs #6686 Eliminar vistas vn2008' (!1967) from 6686-Limpieza-vistas-esquema-vn2008-part3 into dev ... Reviewed-on: #1967 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-05 06:45:29 +00:00
Juanjo Breso	2ff7700088	Merge branch 'dev' into 6686-Limpieza-vistas-esquema-vn2008-part3	2024-02-05 06:35:43 +00:00
Javier Segarra	22f9d7d7a2	Merge branch 'dev' into 5834-billingDataAutoFillBic	2024-02-05 07:24:54 +01:00
Josep Domingo	3bf4fb3c98	Merge pull request 'refs #6689 feat: delete view vn2008' (!1992) from 6689-deleteViewsVn2008-6 into dev ... Reviewed-on: #1992 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-02-05 06:22:20 +00:00
Josep Domingo	e704f2eaf7	feat: refs #6689 Deleted view vn2008	2024-02-05 07:11:50 +01:00
Josep Domingo	4b0b4797ad	Merge branch 'dev' into 6689-deleteViewsVn2008-6	2024-02-05 06:00:02 +00:00
Juan Ferrer	fd7e16522f	ci: refs#6706 Jenkinsfile fixes	2024-02-05 00:10:05 +01:00
Juan Ferrer	f2071d39ec	ci: refs#6706 Jenkinsfile tuning & parallel back test (unstable, disabled)	2024-02-04 23:58:26 +01:00
Juan Ferrer	766008ce1a	ci: refs#6706 Jenkinsfile tuning	2024-02-04 21:17:47 +01:00
Juan Ferrer	9cda07bc5a	ci: refs#6706 Jenkinsfile tuning	2024-02-04 21:09:49 +01:00
Juan Ferrer	d78c8aef40	ci: refs#6706 Jenkinsfile tuning	2024-02-04 21:05:40 +01:00
Juan Ferrer	0669a3db28	ci: refs#6706 Jenkinsfile fixes	2024-02-04 21:02:22 +01:00
Juan Ferrer	1c538d58c2	ci: refs#6706 Jenkinsfile refactor	2024-02-04 21:00:03 +01:00
Javier Segarra	6e62a9b826	Merge branch 'dev' into 6386_imageWithNoFormat	2024-02-04 15:45:15 +00:00
Juan Ferrer	2994a303b9	ci: refs#6706 Use pnpm in Jenkins & Docker	2024-02-02 23:41:19 +01:00
Juan Ferrer	9b3112df2a	Merge branch 'dev' into 6706-optimizeHooks	2024-02-02 23:08:54 +01:00
Juan Ferrer	c3aeaf4da7	fix: refs #6371 Versions fixed	2024-02-02 23:07:29 +01:00
Jorge Penadés	fde749de57	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-02 15:56:20 +01:00
Jorge Penadés	2a6dc0c478	fix: refs #4466 spaces	2024-02-02 15:56:05 +01:00
Ivan Mas	0bd4602568	refs #6445 remove red function and modify precedures	2024-02-02 15:50:16 +01:00
Javier Segarra	9448b40533	refs #6386 feat: add extension when return file	2024-02-02 14:53:48 +01:00
Juanjo Breso	0b3f77bb37	Merge branch 'dev' into 6686-Limpieza-vistas-esquema-vn2008-part3	2024-02-02 13:38:30 +00:00
Juanjo Breso	518d057cf3	refs #6686 feat: Delete views vn2008	2024-02-02 14:31:23 +01:00
Carlos Satorres	3c642fb838	Merge branch 'dev' into 6689-deleteViewsVn2008-6	2024-02-02 13:29:08 +00:00
Juan Ferrer	1d0fd0ad4f	fix: refs #6706 Jenkinsfile fixes	2024-02-02 14:27:36 +01:00
Josep Domingo	1ffbb30d77	refs #6689 feat: delete view vn2008	2024-02-02 14:05:27 +01:00
Jorge Penadés	743f317b20	fix: refs #4466 test & sql	2024-02-02 14:02:16 +01:00
Guillermo Bonet	42bf3db629	fix: refs #6371 Fixed version x2	2024-02-02 13:35:27 +01:00
Guillermo Bonet	2fca40b324	fix: refs #6371 Fixed version	2024-02-02 13:32:25 +01:00
Robert Ferrús	d9b6093738	Merge pull request '6371-limpiezaTablasVn2008Part1' (!1964) from 6371-limpiezaTablasVn2008Part1 into dev ... Reviewed-on: #1964 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-02 12:13:52 +00:00
Robert Ferrús	6f5b03195b	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-02-02 12:08:09 +00:00
Guillermo Bonet	bca15cc796	fix: refs #5483 Fix version	2024-02-02 13:03:59 +01:00
Pablo Natek	986d3532ed	Merge pull request '4515-addBuyCheck' (!1974) from 4515-addBuyCheck into dev ... Reviewed-on: #1974	2024-02-02 11:59:27 +00:00
Javi Gallego	232f46be90	Merge branch 'dev' into 4515-addBuyCheck	2024-02-02 11:58:05 +00:00
Guillermo Bonet	770584cdad	Merge pull request 'refactor: refs #6780 Changed dependences from vn2008 to vn' (!1987) from 6780-changeViewDependencesVn2008 into dev ... Reviewed-on: #1987 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-02 11:44:58 +00:00
Guillermo Bonet	eec36300ad	refactor: refs #6184 Minor changes	2024-02-02 12:25:48 +01:00
Guillermo Bonet	1d596b63a0	Merge branch 'dev' into 6184-saveCmr	2024-02-02 12:24:28 +01:00
Guillermo Bonet	7aea165fb7	Merge branch 'dev' into 6780-changeViewDependencesVn2008	2024-02-02 11:17:32 +00:00
Pablo Natek	58daf4754b	Merge branch 'dev' into 4515-addBuyCheck	2024-02-02 11:08:06 +00:00
Guillermo Bonet	7f73cba89c	Merge branch '6780-changeViewDependencesVn2008' of https://gitea.verdnatura.es/verdnatura/salix into 6780-changeViewDependencesVn2008	2024-02-02 11:57:59 +01:00
Guillermo Bonet	11b0d787e5	refactor: refs #6780 Revoke grants	2024-02-02 11:57:58 +01:00
Jorge Penadés	c9b28d10bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-02 11:27:19 +01:00
Pablo Natek	2a29d68677	Merge pull request 'incluye fecha de ayer' (!1965) from 6752-edi.ekt_scan-improved into dev ... Reviewed-on: #1965 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-02 09:42:17 +00:00
Pablo Natek	1155c8d309	Merge branch 'dev' into 4515-addBuyCheck	2024-02-02 09:39:27 +00:00
Guillermo Bonet	35f047d4b9	Merge branch 'dev' into 6780-changeViewDependencesVn2008	2024-02-02 09:04:59 +00:00
Carlos Satorres	855b590918	Merge branch 'dev' into 6270-electronicInvoiceBack	2024-02-02 08:56:46 +00:00
Juan Ferrer	af536412bf	Merge branch '6706-optimizeHooks' of https://gitea.verdnatura.es/verdnatura/salix into 6706-optimizeHooks	2024-02-02 09:50:22 +01:00
Juan Ferrer	4eb53614bc	build: refs #6706 Migration to pnPM	2024-02-02 09:49:39 +01:00
Jorge Penadés	ab9ceaf100	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-02-02 09:38:31 +01:00
Jorge Penadés	fb0b0450c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-02 09:37:25 +01:00
Sergio De la torre	5bc67333dc	Merge pull request '5802_setState' (!1969) from 5802_setState into dev ... Reviewed-on: #1969 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-02 07:59:27 +00:00
Alex Moreno	9ac0ffb85a	Merge branch 'dev' into 6270-electronicInvoiceBack	2024-02-02 07:30:59 +00:00
Jorge Penadés	7d01449518	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-02 08:11:48 +01:00
Jorge Penadés	a20effc42c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-02-02 08:11:23 +01:00
Javi Gallego	fd98348a4d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6742-incoterm-error	2024-02-02 08:06:06 +01:00
Javi Gallego	6f4c0f655d	feat: #6392 migrado de database	2024-02-02 08:05:17 +01:00
Juan Ferrer	04976bb6ad	Merge pull request 'build: refs #6706 hook test' (!1988) from 6706-optimizeHooks into dev ... Reviewed-on: #1988	2024-02-01 22:40:38 +00:00
Juan Ferrer	93982bf160	Merge branch 'dev' into 6706-optimizeHooks	2024-02-01 22:37:11 +00:00
Juan Ferrer	c35bbc3c9d	build: refs #6706 Jenkinsfile fixes	2024-02-01 23:19:06 +01:00
Juan Ferrer	d7b15d3221	build: refs #6706 Jenkinsfile fixes	2024-02-01 22:23:58 +01:00
Juan Ferrer	eb32b6daa2	build: refs #6706 Jenkinsfile fixes	2024-02-01 22:19:00 +01:00
Juan Ferrer	6a27b752e2	build: refs #6706 Jenkinsfile test	2024-02-01 22:13:36 +01:00
Juan Ferrer	3356691124	build: refs #6706 Jenkinsfile test	2024-02-01 22:12:01 +01:00
Juan Ferrer	76785b99b1	build: refs #6706 Jenkinsfile test	2024-02-01 22:06:30 +01:00
Juan Ferrer	2180045848	build: refs #6706 Jenkinsfile test	2024-02-01 22:04:49 +01:00
Juan Ferrer	056ddbd9ae	build: refs #6706 Jenkinsfile test	2024-02-01 21:49:42 +01:00
Juan Ferrer	aba88c812e	build: refs #6706 Jenkinsfile globals	2024-02-01 21:35:28 +01:00
Juan Ferrer	837b9e6dea	Merge branch 'dev' into 6752-edi.ekt_scan-improved	2024-02-01 20:04:17 +00:00
Carlos Satorres	e59ab6fd97	Merge pull request 'refs #6397 emailValidation' (!1941) from 6397-emailValidation into dev ... Reviewed-on: #1941 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-01 17:45:53 +00:00
Carlos Satorres	c56073c123	Merge branch 'dev' into 6397-emailValidation	2024-02-01 17:35:33 +00:00
Sergio De la torre	92169adac7	Merge branch 'dev' into 5802_setState	2024-02-01 16:17:25 +00:00
Javi Gallego	d020086255	Merge pull request '6567-cambiar-articulos' (!1966) from 6567-cambiar-articulos into dev ... Reviewed-on: #1966 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-01 14:47:28 +00:00
Javi Gallego	9a084d225c	Merge branch 'dev' into 6567-cambiar-articulos	2024-02-01 14:34:10 +00:00
Alex Moreno	0852d21ee6	refs #6783 deploy: init version	2024-02-01 14:23:51 +01:00
Alex Moreno	39f0e8b431	refs #6783 deploy: init version	2024-02-01 14:22:22 +01:00
Juan Ferrer	603d8e3d92	build: refs #6706 hook test	2024-02-01 14:07:42 +01:00
Juan Ferrer	a9ddc2d954	Merge branch 'dev' into 6706-optimizeHooks	2024-02-01 14:07:08 +01:00
Ivan Mas	7b1a0e1957	refs #6444 change code according to sql conventions	2024-02-01 13:02:03 +01:00
Robert Ferrús	ff2328fd25	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-02-01 11:56:10 +00:00
Carlos Satorres	6576bab305	Merge branch 'dev' into 6397-emailValidation	2024-02-01 11:48:48 +00:00
Carlos Satorres	e56e5905c2	Merge branch 'dev' into 6757-supplierMayus	2024-02-01 11:22:47 +00:00
Carlos Satorres	91c3c8f04d	Merge branch 'dev' into 6270-electronicInvoiceBack	2024-02-01 10:51:11 +00:00
Carlos Satorres	a7a9276584	Merge branch 'dev' into 6757-supplierMayus	2024-02-01 10:50:58 +00:00
Alex Moreno	36e8840e6e	Merge branch 'dev' into 6757-supplierMayus	2024-02-01 09:28:59 +00:00
Guillermo Bonet	2ec7a43292	refactor: refs #6780 Changed dependences from vn2008 to vn	2024-02-01 09:49:44 +01:00
Guillermo Bonet	138cb7627d	Merge branch 'dev' into 6780-changeViewDependencesVn2008	2024-02-01 08:49:11 +00:00
Juan Ferrer	b091e2467c	build: refs #6706 hook test	2024-02-01 09:36:22 +01:00
Jorge Penadés	bb91035b77	refs #6703 try	2024-02-01 08:52:40 +01:00
Jorge Penadés	cfe7fa0790	refs #6703 try	2024-02-01 08:52:05 +01:00
Guillermo Bonet	3fa49a259c	Merge branch 'dev' into 6184-saveCmr	2024-02-01 07:42:22 +00:00
Jorge Penadés	a2e076e94f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-01 08:36:45 +01:00
Jorge Penadés	f6f6fc575d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-02-01 08:35:54 +01:00
Jorge Penadés	3e9dd8b3a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-02-01 08:34:20 +01:00
Jorge Penadés	51e33887a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-01 08:32:53 +01:00
Robert Ferrús	805a7f65e7	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-02-01 07:20:07 +00:00
Jorge Penadés	4490dc7bee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-02-01 08:15:15 +01:00
Jorge Penadés	2c9c2df362	Merge branch '6703-refactorSaleRefund' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-01 08:14:56 +01:00
Jorge Penadés	af4af43d9f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-01 08:14:50 +01:00
Guillermo Bonet	b045584658	Merge branch 'dev' into 6184-saveCmr	2024-02-01 07:11:33 +00:00
Alex Moreno	467879bdd6	Merge branch 'dev' into 6703-refactorSaleRefund	2024-02-01 06:46:25 +00:00
Guillermo Bonet	548526964e	Merge branch 'dev' into 6184-saveCmr	2024-02-01 06:23:25 +00:00
Robert Ferrús	66d576f48e	Merge branch '6371-limpiezaTablasVn2008Part1' of https://gitea.verdnatura.es/verdnatura/salix into 6371-limpiezaTablasVn2008Part1	2024-02-01 07:08:27 +01:00
Robert Ferrús	2db7b608ad	feat: refs #6371	2024-02-01 07:08:25 +01:00
Robert Ferrús	07f04acdd8	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-02-01 06:04:49 +00:00
Carlos Satorres	aa993e7386	refs #6757 fix back, fix upperCase, fix e2e back	2024-01-31 17:01:47 +01:00
Carlos Satorres	3a9c5c90d4	Merge branch 'dev' into 6270-electronicInvoiceBack	2024-01-31 15:46:07 +00:00
Carlos Satorres	cbdb089562	Merge branch 'dev' into 6397-emailValidation	2024-01-31 15:44:57 +00:00
Pablo Natek	650f85c737	Merge branch 'dev' into 4515-addBuyCheck	2024-01-31 13:57:44 +00:00
Pablo Natek	3182bfa46c	refs #4515	2024-01-31 14:58:08 +01:00
Robert Ferrús	4b1d6c4762	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-01-31 13:05:06 +00:00
Jorge Penadés	7b14763f45	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-01-31 13:12:47 +01:00
Jorge Penadés	e88abe7b7c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-01-31 13:11:37 +01:00
Sergio De la torre	8a978a2539	refs #6669 fix:ticket_isOutClosureZone	2024-01-31 12:54:52 +01:00
Sergio De la torre	65a30224f5	Merge branch 'dev' into 5802_setState	2024-01-31 11:33:09 +00:00
Pablo Natek	b8b2e1c507	Merge branch 'dev' into 6752-edi.ekt_scan-improved	2024-01-31 11:07:45 +00:00
Carlos Satorres	bbf50995c7	Merge branch 'dev' into 6270-electronicInvoiceBack	2024-01-31 10:21:06 +00:00
Robert Ferrús	57c5c510ff	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-01-31 10:05:46 +00:00
Javier Segarra	b4bb9a4849	refs #5834 feat: new validation	2024-01-31 10:46:16 +01:00
Jorge Penadés	be3e7bb8df	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-01-31 10:01:21 +01:00
Jorge Penadés	6f306ad18c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-01-31 09:59:57 +01:00
Jorge Penadés	e6eac54709	fix: refs #6703 tests & front	2024-01-31 09:59:32 +01:00
Juanjo Breso	18772c04f6	feat: refs #5167 update	2024-01-31 09:38:57 +01:00
Sergio De la torre	0d438e7f4c	Merge branch 'dev' into 5802_setState	2024-01-31 08:18:57 +00:00
Guillermo Bonet	a47276c86a	Merge branch 'dev' into 6184-saveCmr	2024-01-31 08:17:47 +00:00
Jorge Penadés	c136395d1e	fix: refs #6703 fix conflicts	2024-01-31 09:16:38 +01:00
Jorge Penadés	d43976192a	fix: refs #6703 fix conflicts	2024-01-31 09:16:26 +01:00
Javi Gallego	a5e5a0d45d	feat: #6749 se mira la vida para buscar dias en el pasado	2024-01-31 09:03:08 +01:00
Juanjo Breso	aba0d97106	feat: refs#5167 Update	2024-01-31 09:00:43 +01:00
Jorge Penadés	9e12bdf4e8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-01-31 08:49:28 +01:00
Alex Moreno	141c3d6f6e	Merge branch 'dev' into 6270-electronicInvoiceBack	2024-01-31 07:38:53 +00:00
Pablo Natek	3d2d406113	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4515-addBuyCheck	2024-01-31 07:42:23 +01:00
Sergio De la torre	4bf08ea147	refs #5890 feat:reserves	2024-01-31 07:23:46 +01:00
Pablo Natek	6a29e97fc6	Merge branch 'dev' into 6752-edi.ekt_scan-improved	2024-01-31 06:16:09 +00:00
Robert Ferrús	826c8ff682	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-01-31 06:04:30 +00:00
Juan Ferrer	bd1ac5f41e	build: refs #6706 hook test	2024-01-30 23:25:42 +01:00
Juan Ferrer	2222926488	build: refs #6706 hook test	2024-01-30 23:13:40 +01:00
Juan Ferrer	825ee76797	build: refs #6706 hook test	2024-01-30 23:08:00 +01:00
Juan Ferrer	f6607f6533	build: refs #6706 hook test	2024-01-30 22:37:43 +01:00
Carlos Satorres	a6ea4ed048	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6270-electronicInvoiceBack	2024-01-30 16:42:11 +01:00
Carlos Satorres	5d2f3d1a4b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6270-electronicInvoiceBack	2024-01-30 16:42:00 +01:00
Jorge Penadés	5690da0a18	fix: refs #6776 add userId	2024-01-30 16:05:56 +01:00
Carlos Satorres	509d5cea14	refs #6270 fix back	2024-01-30 15:54:03 +01:00
Pablo Natek	7e7ab3e8b6	fix(triggers): refs #4515 fix error	2024-01-30 15:07:13 +01:00
Javier Segarra	7ebdf59d97	Merge branch 'dev' into 5834-billingDataAutoFillBic	2024-01-30 14:06:27 +00:00
Robert Ferrús	bd990cf105	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-01-30 13:57:20 +00:00
Jorge Penadés	afa34c6296	feat: refs #6776 makeMulti	2024-01-30 14:00:08 +01:00
Ivan Mas	da2a2b5f09	refs #6444 Remove vn2008.intrastat_neto function	2024-01-30 13:33:54 +01:00
Sergio De la torre	a46c3c4d95	refs #5802 feat:ticket_setState	2024-01-30 13:31:17 +01:00
Sergio De la torre	27f6621447	refs #5802 feat:ticket_setState	2024-01-30 13:29:49 +01:00
Alex Moreno	c226c3f2e3	Merge branch 'dev' into 6752-edi.ekt_scan-improved	2024-01-30 12:07:13 +00:00
Juanjo Breso	a6c0bf8766	Merge branch 'dev' into 6686-Limpieza-vistas-esquema-vn2008-part3	2024-01-30 12:00:22 +00:00
Pako Natek	1124722b25	nuevo commit de prueba	2024-01-30 12:45:17 +01:00
Carlos Satorres	edfb90813a	Merge branch 'dev' into 6397-emailValidation	2024-01-30 10:48:06 +00:00
Javi Gallego	3d6797d3ba	feat: #6567 sin fixtures	2024-01-30 11:06:14 +01:00
Javi Gallego	582359f058	feat: #6567 restaura permisos	2024-01-30 11:04:51 +01:00
Javi Gallego	4eb5efa2c9	feat: #6567 con varchar	2024-01-30 10:52:33 +01:00
Juanjo Breso	50c1531083	feat: refs#Eliminar vistas vn2008	2024-01-30 10:31:29 +01:00
Guillermo Bonet	ae7fb12b53	Merge branch 'dev' into 6184-saveCmr	2024-01-30 09:25:29 +00:00
Robert Ferrús	fe48e27cce	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-01-30 09:15:14 +00:00
Pako Natek	7cf46fc6cd	incluye fecha de ayer	2024-01-30 10:12:27 +01:00
Javi Gallego	f0d4ae604b	feat: #6567 sale_replaceItem adaptado a code	2024-01-30 10:03:21 +01:00
Guillermo Bonet	8f52efd5dd	Merge branch '6184-saveCmr' of https://gitea.verdnatura.es/verdnatura/salix into 6184-saveCmr	2024-01-30 09:50:54 +01:00
Guillermo Bonet	d39d54a514	fix: #6184 Requested changes	2024-01-30 09:50:53 +01:00
Ivan Mas	ed0f942a57	refs #6444 create vn.intrastat_estimateNet.sql	2024-01-30 09:45:37 +01:00
Guillermo Bonet	1e56e741e2	fix: #6184 Requested changes	2024-01-30 09:44:10 +01:00
Guillermo Bonet	34f7345315	Merge branch 'dev' into 6184-saveCmr	2024-01-30 08:44:04 +00:00
Robert Ferrús	22fa1d4c3f	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-01-30 09:23:16 +01:00
Guillermo Bonet	13b8964e3d	Merge branch 'dev' into 6184-saveCmr	2024-01-30 07:27:34 +00:00
Sergio De la torre	0f3ffcfa61	fix: refs #6184 Upload sign	2024-01-30 08:11:33 +01:00
Robert Ferrús	3a9eb100a1	feat: refs #6371 table vn2008 to vn	2024-01-30 08:06:36 +01:00
Robert Ferrús	05163bd5a7	feat: refs #6371 table vn2008 to vn	2024-01-30 07:48:29 +01:00
Guillermo Bonet	1fe6818a0f	fix: #6184 Minor changes	2024-01-30 07:42:58 +01:00
Guillermo Bonet	65268487b9	fix: #6184 Now creates only one dms in saveSign	2024-01-30 07:32:26 +01:00
Carlos Satorres	9b8c58ba7d	refs #6270 makeInvoice	2024-01-29 16:00:24 +01:00
Carlos Satorres	94cc3ad80e	Merge branch 'dev' into 6397-emailValidation	2024-01-29 14:47:52 +00:00
Carlos Satorres	f14c239391	Merge branch 'dev' into 6397-emailValidation	2024-01-29 14:10:17 +00:00
Guillermo Bonet	ed43b6be2d	Merge branch 'dev' into 6184-saveCmr	2024-01-29 14:38:14 +01:00
Carlos Satorres	04f1a03d4d	refs #6397 fix back	2024-01-29 14:08:43 +01:00
Robert Ferrús	eb208edacc	feat: refs #6371 pasar vn2008 a vn part1	2024-01-29 12:35:49 +01:00
Guillermo Bonet	65756f98ad	fix: #6184 Minor changes	2024-01-29 08:25:00 +01:00
Guillermo Bonet	990e8ee249	Merge branch '6184-saveCmr' of https://gitea.verdnatura.es/verdnatura/salix into 6184-saveCmr	2024-01-29 08:14:34 +01:00
Guillermo Bonet	7c80a7bdda	fix: #6184 Minor changes	2024-01-29 08:14:33 +01:00
Jorge Penadés	4fc780967f	fix: refs #6703 tests	2024-01-26 15:32:50 +01:00
Guillermo Bonet	49a08a96da	Merge branch 'dev' into 6184-saveCmr	2024-01-26 11:56:43 +00:00
Guillermo Bonet	567e480e3b	feat: #6184 Minor changes	2024-01-26 12:40:42 +01:00
Jorge Penadés	ab3fdf4fe4	fix: refs #6703 remove console log	2024-01-26 12:33:04 +01:00
Guillermo Bonet	25fa154f60	feat: #6184 Minor changes	2024-01-26 12:25:02 +01:00
Jorge Penadés	e33861a80d	fix: refs #6703 filter	2024-01-26 12:15:53 +01:00
Guillermo Bonet	d5a145ba1b	feat: #6184 Minor changes	2024-01-26 10:44:04 +01:00
Guillermo Bonet	dec795d902	feat: #6184 Minor changes	2024-01-26 10:14:47 +01:00
Guillermo Bonet	5828fa9657	feat: #6184 Refactor saveSign	2024-01-26 10:05:24 +01:00
Jorge Penadés	53f37bb0eb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-01-26 09:32:08 +01:00
Jorge Penadés	e5d466b697	fix: refs #6703 drop & replace sale refund by clone	2024-01-26 08:30:43 +01:00
Jorge Penadés	ed77347fe1	fix: #6557 replace procedure	2024-01-25 15:41:55 +01:00
Guillermo Bonet	9005975f1c	feat: #6184 Modified email cmr	2024-01-25 13:56:47 +01:00
Guillermo Bonet	c7be1b57b1	Merge branch '6184-saveCmr' of https://gitea.verdnatura.es/verdnatura/salix into 6184-saveCmr	2024-01-23 14:13:41 +01:00
Guillermo Bonet	a676607e29	feat: #6184 Added email cmr	2024-01-23 14:13:40 +01:00
Javi Gallego	540c76005e	fix: #6742 calcula hasIncoterm a partir de la serie	2024-01-23 12:30:04 +01:00
Guillermo Bonet	12bfb8ca77	feat: #6184 Added tests and process.env.IS_SPEC_RUNNING	2024-01-23 11:05:39 +01:00
Guillermo Bonet	43bfb3cfde	Merge branch 'dev' into 6184-saveCmr	2024-01-23 10:05:21 +00:00
Carlos Satorres	cf03982d0c	refs #6397 trad tback	2024-01-22 10:20:10 +01:00
Guillermo Bonet	6701f70a33	Merge branch 'dev' into 6184-saveCmr	2024-01-22 09:07:31 +00:00
Carlos Satorres	73e1b52348	refs #6397 refactor	2024-01-19 14:53:56 +01:00
Carlos Satorres	391f418883	refs #6397 fix test back	2024-01-19 14:18:17 +01:00
Carlos Satorres	e9c1f125a5	refs #6397 test back	2024-01-18 11:43:05 +01:00
Carlos Satorres	7cb7c7dace	refs #6397 back validation	2024-01-18 10:57:17 +01:00
Guillermo Bonet	9faf889833	Merge branch 'dev' into 6184-saveCmr	2024-01-18 09:55:04 +00:00
Guillermo Bonet	ce5a2ada62	feat: #6184 Requested changes	2024-01-18 07:46:58 +01:00
Carlos Satorres	23b8703afc	refs #6397 emailValidation	2024-01-17 15:00:31 +01:00
Guillermo Bonet	a486b7f2d4	feat: #6184 Minor change	2024-01-17 14:42:38 +01:00
Guillermo Bonet	85a0f8b323	feat: #6184 Minor change	2024-01-17 14:30:58 +01:00
Guillermo Bonet	1a52e58eaa	feat: #6184 Created generateCmrPdf	2024-01-17 14:18:31 +01:00
Guillermo Bonet	45fd96cee6	feat: #6184 Modified uploadFile	2024-01-17 13:07:26 +01:00
Guillermo Bonet	f1b84ee7a0	Merge branch 'dev' into 6184-saveCmr	2024-01-17 10:44:00 +01:00
Javier Segarra	fe4c529bfe	refs #5834 perf: remove front code	2024-01-12 13:05:00 +01:00
Javier Segarra	3ace078705	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5834-billingDataAutoFillBic	2024-01-12 12:53:49 +01:00
Jorge Penadés	1f77559519	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-01-03 12:53:12 +01:00
Jorge Penadés	4e951263c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-01-03 11:55:37 +01:00
Alex Moreno	b087f84629	Merge branch 'dev' into 4466-invoiceInRectificated	2024-01-02 07:52:47 +00:00
Jorge Penadés	567879d64e	corrective back created: refs #4466	2023-12-28 15:55:11 +01:00
Jorge Penadés	a89d1e883a	create rectification: refs #4466	2023-12-26 14:36:58 +01:00
Guillermo Bonet	4003e161ce	Merge branch 'dev' into 6184-saveCmr	2023-11-13 09:44:06 +00:00
Guillermo Bonet	64ca72b1f4	refactor refs #6184 Changed downloadCmrsZip	2023-11-13 09:57:25 +01:00
Guillermo Bonet	2792efa9cd	perf: refs #6184 Requested changes	2023-11-13 08:36:05 +01:00
Guillermo Bonet	05a7498219	Merge branch 'dev' into 6184-saveCmr	2023-11-09 13:14:21 +00:00
Guillermo Bonet	0771548ef1	refs #6184 Requested changes	2023-11-09 14:14:09 +01:00
Jorge Penadés	0536486b8c	ref #5834 fix locale	2023-11-03 09:16:59 +01:00
Jorge Penadés	2cdebcd69f	check bank entity refs 5834	2023-11-03 09:15:41 +01:00
Jorge Penadés	ce9fafdcab	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5834-billingDataAutoFillBic	2023-11-03 09:14:00 +01:00
Guillermo Bonet	c79f706cdc	Merge branch 'dev' into 6184-saveCmr	2023-10-11 12:23:39 +00:00
Guillermo Bonet	3e70cb07e0	refs #6184 Changes	2023-10-11 14:20:35 +02:00
Guillermo Bonet	c0089b1fa0	refs #6184 Added cmrFk in ticket model	2023-10-11 12:20:30 +02:00
Guillermo Bonet	d9339af87e	refs #6184 Insert in ticketCmr	2023-10-11 11:46:56 +02:00
Guillermo Bonet	3e522b08b6	refs #6184 Added saveCmr	2023-10-11 11:43:21 +02:00
Jorge Penadés	7283945cf2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5834-billingDataAutoFillBic	2023-07-26 13:39:42 +02:00
Jorge Penadés	ed6d286ad9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5834-billingDataAutoFillBic	2023-07-26 10:13:36 +02:00
Jorge Penadés	616a28500a	refs #5834 icon added	2023-07-25 09:40:22 +02:00