4162 Commits

Author	SHA1	Message	Date
Pako Natek	55d15dbca2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6021-floranet	2024-02-15 13:50:15 +01:00
David Domenech	03b5ed064d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008	2024-02-15 13:48:21 +01:00
Guillermo Bonet	3950f287c9	Merge branch 'dev' into 6721-método-de-pago-al-volver-a-activar-trabajadores	2024-02-15 12:24:26 +00:00
Guillermo Bonet	4b568bc41e	Merge branch 'dev' into 6775-itemProposalAdd	2024-02-15 13:19:58 +01:00
Pako Natek	0eaeb2e805	nueva rama	2024-02-15 13:13:22 +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
Juan Ferrer	cc24ecdc7d	build(dump): refs #6859	2024-02-15 11:28:46 +01:00
Guillermo Bonet	f63abc1a6e	fix: refs #6859 zoneEstimatedDelivery	2024-02-15 11:07:47 +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
Alex Moreno	6685a20114	build: refs #6859 myt pull db	2024-02-15 10:04:15 +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
Javier Segarra	234ea26fe2	Merge branch 'test' into 2687_fix_travel_cloneWithEntries	2024-02-15 07:07:44 +00:00
Alex Moreno	fddbf6451b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-15 07:52:08 +01:00
Guillermo Bonet	46a1ad35b5	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-15 06:50:03 +00:00
Javier Segarra	d9756a0f3f	refs #2687 feat: comments	2024-02-15 07:49:57 +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
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
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	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
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
David Domenech	0c7ca79ae0	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-14 10:03:49 +00:00
David Domenech	fd785ee429	refs #6372	2024-02-14 11:01:37 +01:00
Javier Segarra	d1b24125f4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 2687_fix_travel_cloneWithEntries	2024-02-14 09:33:34 +01:00
Javier Segarra	fb1d11af17	refs #2687 feat: comments	2024-02-14 09:32:44 +01:00
Javier Segarra	b9a624d9cd	refs #2687 feat: create util.procedures	2024-02-14 09:30:31 +01: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	8542f1fae5	feat: refs #6728 revision triggers test	2024-02-14 08:34:02 +01: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
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
Josep Domingo	35df439f14	refs#6721 MetodoPagoActivarTrabajadores	2024-02-13 13:19:26 +01:00
Guillermo Bonet	92261ebe0d	fix: refs #5586 Tests fix	2024-02-13 13:09:12 +01:00
Guillermo Bonet	42de1a7e51	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-13 12:29:46 +01: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
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
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
Javier Segarra	37dd3c00c5	updates	2024-02-13 09:11:39 +01:00
Josep Domingo	3b35e4dae8	refs#6685 RestoreViewCredit	2024-02-13 08:57:49 +01:00
Javier Segarra	24984e8aca	Revert "refs #5858 feat: comments" ... This reverts commit 05d685c86b.	2024-02-13 08:32:04 +01:00
Alex Moreno	06fe4957d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-13 08:13:58 +01: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	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
Javier Segarra	242d675d28	Merge branch '5858-zone_Collisions' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-12 15:13:27 +01:00
Javier Segarra	955828c63e	refs #5858 feat: comments	2024-02-12 15:13:18 +01:00
Alex Moreno	5f60f2a00e	refs #5509 feat(EntryDms): add fixtures	2024-02-12 15:04:49 +01:00
Robert Ferrús	3c7fda87c8	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix	2024-02-12 12:59:24 +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
Javier Segarra	05d685c86b	refs #5858 feat: comments	2024-02-12 13:17:47 +01:00
Javier Segarra	e8c783ca68	refs #5858 feat: comments	2024-02-12 13:14:41 +01:00
David Domenech	a5529f0e0a	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-12 11:29:40 +00:00
David Domenech	37a47edfdc	refs #6372	2024-02-12 12:25:58 +01:00
Javier Segarra	0a398fdd6c	refs #5858 feat: comments	2024-02-12 11:37:08 +01: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
David Domenech	e1567dfb9e	refs #6372	2024-02-12 11:20:12 +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
Javier Segarra	7f1e3c66e2	refs #5858 feat: define event	2024-02-12 10:35:12 +01:00
Guillermo Bonet	23bf9b2750	refactor: refs #6501 Minor change	2024-02-12 10:28:25 +01:00
Javier Segarra	cff59d197d	refs #5858 feat: use active event when trigger	2024-02-12 10:28:07 +01:00
Javier Segarra	337190ef6d	refs #5858 feat: use notification system	2024-02-12 10:27:46 +01:00
Guillermo Bonet	f89ae0aad9	refactor: refs #6501 Minor change	2024-02-12 10:18:31 +01:00
Javier Segarra	4799151565	refs #5858 feat: fixtures.before.sql	2024-02-12 10:12:17 +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
Javier Segarra	a756c3bc3a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-12 08:51:58 +01: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
Javier Segarra	380e0ef651	refs #2687 fix: clone Travel as user action	2024-02-12 08:44:54 +01:00
Ivan Mas	b06f80e091	refs #6446 Delete function nz from db	2024-02-12 08:11:49 +01:00
David Domenech	b712b65d76	refs #6372	2024-02-12 07:44:40 +01:00
David Domenech	6044c160f8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008	2024-02-12 07:21:40 +01:00
Sergio De la torre	1f99450ecb	Merge branch 'dev' into 6651_itemShelving_get	2024-02-12 05:57:02 +00:00
Guillermo Bonet	c8b156771d	feat: refs #6395 Added buyerFk in buy	2024-02-09 14:00:16 +01:00
Ivan Mas	362d825202	fix: refs #6443 #6444 #6445 ChangeRevokeToGrant	2024-02-09 13:38:09 +01:00
Jorge Penadés	4aeb88229d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-09 13:07:42 +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
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	c2360ca154	refs #6559 feat:quit call get_sectors	2024-02-09 06:59:39 +01:00
Guillermo Bonet	18a27e032f	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-08 13:55:00 +00:00
Jorge Penadés	d1ea1aafff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-08 13:12:48 +01: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	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
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
Jorge Penadés	2940c68516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-08 08:36:05 +01:00
Pablo Natek	d2d28889b6	merge(master): refs #6403 merge master fix conflicts	2024-02-07 16:55:09 +01:00
Pablo Natek	6c9215bb51	feat(mrw): refs #6403 big commit	2024-02-07 16:52:43 +01:00
Jorge Penadés	aff8ee28ea	fix: refs #6272 back & create test	2024-02-07 10:16:47 +01:00
Alex Moreno	e6735f9ea7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-07 08:35:54 +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
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
Guillermo Bonet	c3174c0c38	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-06 13:02:30 +00:00
Guillermo Bonet	f4feb6e8b7	Merge branch 'dev' into 6184-saveCmr	2024-02-06 12:13:48 +01:00
Ivan Mas	80314d86cf	Merge branch 'dev' into 6444-MigrateVn2008.intrastat_netoFunctionToVn	2024-02-06 10:36:42 +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	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	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	5729ba90d1	Merge branch 'dev' into 6445-Remove-Vn2008.red-Function	2024-02-06 08:04:50 +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
Guillermo Bonet	8ccaacbc07	fix: refs# 6642 Bug apply version	2024-02-06 08:15:25 +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
Juanjo Breso	b480df069d	Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined	2024-02-06 06:50:40 +00:00
David Domenech	b7bb1b9784	refs #6372 feat: vn2008 to vn	2024-02-06 07:37:33 +01:00
David Domenech	0aed49d603	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008	2024-02-06 07:29:42 +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
Ivan Mas	6fb198f579	refs #6665 revoke permissions	2024-02-05 13:09:35 +01:00
Javi Gallego	c9785e76da	fix: hotfix puppeteer updated to 21.11.0	2024-02-05 12:56:23 +01:00
Alex Moreno	691853df49	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-05 12:55:16 +01:00
Ivan Mas	9247a802bd	refs #6665 delete unused views	2024-02-05 12:21:11 +01: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	17680b2cc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-05 08:49:48 +01:00
Juanjo Breso	4a73bd0133	Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined	2024-02-05 07:40:38 +00:00
Ivan Mas	1a869766b9	refs #6444 change code accord to conventions	2024-02-05 08:32:45 +01: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	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	2ff7700088	Merge branch 'dev' into 6686-Limpieza-vistas-esquema-vn2008-part3	2024-02-05 06:35:43 +00:00
David Domenech	d2fec7beee	refs #6642	2024-02-05 07:30:04 +01: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	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
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
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	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
Javi Gallego	232f46be90	Merge branch 'dev' into 4515-addBuyCheck	2024-02-02 11:58:05 +00: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
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
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
Alex Moreno	d5e6750998	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-02 09:36:41 +01:00
Jorge Penadés	75f6f89506	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-02 09:36:30 +01: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	9f9d953b86	fix: refs #6276 resolve conflicts	2024-02-02 08:11:00 +01:00
Javi Gallego	6f4c0f655d	feat: #6392 migrado de database	2024-02-02 08:05:17 +01:00
Juan Ferrer	837b9e6dea	Merge branch 'dev' into 6752-edi.ekt_scan-improved	2024-02-01 20:04:17 +00:00
Sergio De la torre	92169adac7	Merge branch 'dev' into 5802_setState	2024-02-01 16:17:25 +00:00
Javi Gallego	9a084d225c	Merge branch 'dev' into 6567-cambiar-articulos	2024-02-01 14:34:10 +00:00
Jorge Penadés	bda23a2139	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-01 14:33:51 +01:00
Ivan Mas	7b1a0e1957	refs #6444 change code according to sql conventions	2024-02-01 13:02:03 +01:00
Jorge Penadés	ec7a88c6dd	fix: refs #6703 tests, backs & fixtures	2024-02-01 12:56:11 +01:00
Robert Ferrús	ff2328fd25	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-02-01 11:56:10 +00:00
Carlos Satorres	e56e5905c2	Merge branch 'dev' into 6757-supplierMayus	2024-02-01 11:22:47 +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
Robert Ferrús	512c1bdcc0	Merge branch 'dev' into 6688-deleteView2008Part5	2024-02-01 07:54:25 +00:00
Jorge Penadés	e23bd0489d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-01 08:43:15 +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	51e33887a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-01 08:32:53 +01:00
Guillermo Bonet	5d35519431	Merge branch 'dev' into 6692-viewClean9	2024-02-01 07:29:55 +00:00
Robert Ferrús	805a7f65e7	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-02-01 07:20:07 +00: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
Jorge Penadés	c4161eec97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-01 08:14:37 +01:00
Guillermo Bonet	0b5395af2b	Merge branch 'dev' into 6692-viewClean9	2024-02-01 07:11:44 +00:00
Guillermo Bonet	386204926f	Merge branch 'dev' into 6690-viewClean7	2024-02-01 07:11:42 +00:00
Guillermo Bonet	b045584658	Merge branch 'dev' into 6184-saveCmr	2024-02-01 07:11:33 +00:00
Alex Moreno	d338a04a27	Merge branch 'dev' into 6235-addDeviceWorkerTimeControl	2024-02-01 06:35:51 +00:00
Guillermo Bonet	548526964e	Merge branch 'dev' into 6184-saveCmr	2024-02-01 06:23:25 +00:00
Robert Ferrús	d3af5d6664	feat: refs #6688 delete view vn2008 part5	2024-02-01 07:14:02 +01:00
Robert Ferrús	2db7b608ad	feat: refs #6371	2024-02-01 07:08:25 +01:00
Carlos Satorres	aa993e7386	refs #6757 fix back, fix upperCase, fix e2e back	2024-01-31 17:01:47 +01: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
David Domenech	bad00167fa	refs #6372 feat: vn2008 to vn	2024-01-31 14:50:56 +01:00
David Domenech	a81a42c2e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008	2024-01-31 14:43:16 +01:00
Jorge Penadés	8f5a5d9cba	fix: refs #6703 tests & backs	2024-01-31 13:11:15 +01:00
Sergio De la torre	65a30224f5	Merge branch 'dev' into 5802_setState	2024-01-31 11:33:09 +00:00
Guillermo Bonet	6ebf5f135a	refactor: refs #6235 Deleted views and dependences	2024-01-31 12:14:24 +01:00
Pablo Natek	b8b2e1c507	Merge branch 'dev' into 6752-edi.ekt_scan-improved	2024-01-31 11:07:45 +00:00
Guillermo Bonet	e0d15e572c	Merge branch 'dev' into 6235-addDeviceWorkerTimeControl	2024-01-31 10:13:57 +00:00
Robert Ferrús	8616b33c33	feat: refs #6691 delete view vn2008 part8	2024-01-31 11:12:16 +01:00
Robert Ferrús	57c5c510ff	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-01-31 10:05:46 +00:00
Guillermo Bonet	2677bf953d	Merge branch 'dev' into 6690-viewClean7	2024-01-31 09:39:49 +00:00
Guillermo Bonet	a42e20bd5f	refactor: refs #6690 Deleted views and dependences	2024-01-31 10:35:50 +01:00
Jorge Penadés	2c1b8bd9db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-31 10:02:58 +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
Juanjo Breso	18772c04f6	feat: refs #5167 update	2024-01-31 09:38:57 +01: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
Guillermo Bonet	dd17b2c05d	feat: refs #6235 Added device in clockIn	2024-01-31 09:04:30 +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
Sergio De la torre	f88cef6745	refs #6186 feat:deprecated packingShelve	2024-01-31 08:45:52 +01:00
Sergio De la torre	4bf08ea147	refs #5890 feat:reserves	2024-01-31 07:23:46 +01:00
Pablo Natek	7e7ab3e8b6	fix(triggers): refs #4515 fix error	2024-01-30 15:07:13 +01:00
Jorge Penadés	e17fc91415	fix: refs #6276 fix acl, addSaleByCode & tests	2024-01-30 14:58:11 +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
Pako Natek	1124722b25	nuevo commit de prueba	2024-01-30 12:45:17 +01:00
Jorge Penadés	88dfdb157f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-30 11:25:17 +01: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
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
Ivan Mas	ed0f942a57	refs #6444 create vn.intrastat_estimateNet.sql	2024-01-30 09:45:37 +01:00
Guillermo Bonet	34f7345315	Merge branch 'dev' into 6184-saveCmr	2024-01-30 08:44:04 +00:00
Guillermo Bonet	1e56e741e2	fix: #6184 Requested changes	2024-01-30 09:44:10 +01: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
Robert Ferrús	3a9eb100a1	feat: refs #6371 table vn2008 to vn	2024-01-30 08:06:36 +01:00
Jorge Penadés	3190e14112	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6761-fixE2e	2024-01-30 08:01:54 +01:00
Robert Ferrús	05163bd5a7	feat: refs #6371 table vn2008 to vn	2024-01-30 07:48:29 +01:00
Guillermo Bonet	7a6d2ce984	Merge branch 'dev' into 6725-deletedFkLogs	2024-01-30 06:01:31 +00:00
Jorge Penadés	a3442d4887	fix: refs #6276 fixtures	2024-01-29 15:47:46 +01:00
Alex Moreno	f4dc596e97	refs 5509 feat: add triggers, downloadFile	2024-01-29 15:13:56 +01:00
Guillermo Bonet	ed43b6be2d	Merge branch 'dev' into 6184-saveCmr	2024-01-29 14:38:14 +01:00
Guillermo Bonet	8484afe2ea	refactor: #6725 Deleted originFk from log tables	2024-01-29 14:29:10 +01:00
Javier Segarra	7880f41d1c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify	2024-01-29 14:11:08 +01:00
Javier Segarra	5396b402a5	refs #6174 feat: acl	2024-01-29 14:10:30 +01:00
Juan Ferrer	194262a93e	fix: refs #6085 ACL canEditAlias checked, migrated to remote hooks	2024-01-29 13:48:02 +01:00
Robert Ferrús	eb208edacc	feat: refs #6371 pasar vn2008 a vn part1	2024-01-29 12:35:49 +01:00
Guillermo Bonet	2268ef377f	feat: #6625 Changed version to myt	2024-01-29 12:32:50 +01:00
Alex Moreno	cf0e74c457	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-01-29 11:37:53 +01:00
Jorge Penadés	293bbd3da3	fix: refs #6276 merge database	2024-01-29 09:31:12 +01:00
David Domenech	abbda268f5	refs #6372 feat: vn2008 to vn	2024-01-29 09:18:11 +01:00
David Domenech	8ea3c98a13	refs #6372 feat: vn2008 to vn	2024-01-29 09:12:29 +01:00
Jorge Penadés	72e5050d93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-29 08:37:55 +01:00
Alex Moreno	149c2b0293	refs #5483 fix: zoneEstimatedDelivery in salix	2024-01-29 07:39:39 +01:00
Juan Ferrer	ce0684e6ff	fix: refs #5483 myt updated, jenkins tests and fixtures fixes	2024-01-28 12:40:13 +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
Juan Ferrer	81639726b2	feat: refs #5483 final merge	2024-01-26 00:09:24 +01:00
Juan Ferrer	1ad1e53970	feat: refs #5483 update db files	2024-01-25 17:33:54 +01:00
Juan Ferrer	a5cd4a671c	Merge branch 'dev' into 5483-unifyDb	2024-01-25 17:31:19 +01:00
Pablo Natek	2e1b55448a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb	2024-01-25 15:04:32 +01:00
Pablo Natek	3848503853	fix(test): refs #6743 exportDb	2024-01-25 14:58:48 +01:00
Jorge Penadés	e6335548ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-25 12:23:08 +01:00
Alex Moreno	d305de2438	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-25 09:00:48 +01:00
Pablo Natek	36fc55180a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb	2024-01-25 08:30:28 +01:00
Pablo Natek	01c21baa65	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb	2024-01-25 08:25:08 +01:00
Jorge Penadés	01340408c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-25 08:14:02 +01:00
Alex Moreno	ece0c926dd	refs #6745 fix: duplicate fixtures	2024-01-24 14:52:49 +01:00
Alex Moreno	1c0f8acb87	refs #5871 fix: awb	2024-01-24 13:37:29 +01:00
Robert Ferrús	2ee48a53e2	refs #6222 fix(ticket): step-two	2024-01-24 09:59:27 +01:00
Pablo Natek	065dd0581d	feat(spec): refs #6403 add test	2024-01-24 09:06:05 +01:00
Alex Moreno	701b039e97	refs #6743 feat: import db	2024-01-24 08:23:17 +01:00
Javier Segarra	cddd8f7d94	refs #2687 perf: improve comments	2024-01-23 16:36:53 +01:00
Jorge Penadés	ae89d59bde	feat: refs #6276 WIP test sectorCollection_getSales	2024-01-23 15:58:09 +01:00
Jorge Penadés	08dd37e9e4	feat: refs #6276 test sectorCollection_getSales	2024-01-23 12:13:23 +01:00
Javier Segarra	b5d883cdbe	refs #2687 feat: add grant privileges for guest	2024-01-23 11:53:12 +01:00
Javier Segarra	056dddd212	refs #2687 perf: generate comments	2024-01-23 11:22:59 +01:00
Javier Segarra	fe714aef22	refs #2687 perf: change variable description	2024-01-23 11:20:27 +01:00
Guillermo Bonet	12bfb8ca77	feat: #6184 Added tests and process.env.IS_SPEC_RUNNING	2024-01-23 11:05:39 +01:00
Jorge Penadés	dcf6232c14	feat: refs #6276 test sale_getFromSectorCollection	2024-01-23 08:39:30 +01:00
Javier Segarra	c1bc2c94a6	refs #2687 perf: generate comments	2024-01-23 08:33:15 +01:00
Javier Segarra	39453492a0	refs #2687 feat update db/change version	2024-01-22 10:22:21 +01:00
Javier Segarra	95398485dc	Merge branch 'dev' into 2687_travel_cloneWithEntries	2024-01-22 09:01:28 +00:00
Jorge Penadés	89d18e29f0	feat: refs #6276 test saleTrackingReplace (updateTracking)	2024-01-22 07:49:21 +01:00
Jorge Penadés	5c0425b942	feat: refs #6276 test machineWorker_update	2024-01-19 09:52:49 +01:00
Alex Moreno	7ea1fbfb26	refs #5509 feat: entryDms funcionality	2024-01-18 15:09:52 +01:00
Alex Moreno	2415e22258	refs #6222 fix: apply sql	2024-01-18 14:25:48 +01:00
Jorge Penadés	19edd7868e	feat: refs #6276 test getVersion	2024-01-18 14:18:21 +01:00
Jorge Penadés	d41d57143f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-18 13:53:26 +01:00
Alex Moreno	0a98cd7b23	refs #6718 deploy: init version 24.06	2024-01-18 10:43:58 +01:00
Alex Moreno	dfee2b0ce4	refs #6718 fix: loggable and sql	2024-01-18 10:39:12 +01:00
Alex Moreno	ef2b156b55	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-18 08:07:47 +01:00
Pablo Natek	854447f7c1	feat: refs #6403 mrw cancelShipment	2024-01-18 07:36:21 +01:00
Robert Ferrús	0f6718850f	Merge branch '6222-test-saleCcomponentUpdate' of https://gitea.verdnatura.es/verdnatura/salix into 6222-test-saleCcomponentUpdate	2024-01-17 14:24:10 +01:00
Robert Ferrús	41aa5ff2f7	refs #6222	2024-01-17 14:24:07 +01:00
Alex Moreno	3c778216a4	Merge branch 'test' into 6222-test-saleCcomponentUpdate	2024-01-17 13:19:18 +00:00
Jorge Penadés	1fbb84ae9f	fix: refs #6276 itemShelving_return	2024-01-17 12:58:57 +01:00
Jorge Penadés	90b1e8d664	fix: refs #6276 backend tests	2024-01-17 10:18:13 +01:00
Guillermo Bonet	2f67056dbf	Merge branch 'test' into dev	2024-01-17 09:44:32 +01:00
Jorge Penadés	53a10dda58	feat: refs #6276 machineWorke_update	2024-01-17 08:17:55 +01:00
Jorge Penadés	07e9b737c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-17 07:50:21 +01:00
Pablo Natek	7e3660aece	feat(cancelShipment): refs #6403 mrwintegration	2024-01-16 15:04:06 +01:00
Jorge Penadés	4f7240b496	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-16 14:50:55 +01:00
Alex Moreno	858912021b	Delete db/changes/240201/00-saleComponent.sql	2024-01-16 13:46:24 +00:00
Alex Moreno	aac3e17d3c	Merge branch 'test' into 6222-test-saleCcomponentUpdate	2024-01-16 13:40:37 +00:00
Alex Moreno	9283173898	refs #6222 fix: correct sql folder	2024-01-16 14:40:50 +01:00
Alex Moreno	9452aacb49	Merge branch 'dev' into 6230-basicItem	2024-01-16 13:25:28 +00:00
Guillermo Bonet	ed8210d5da	feat: refs #4734 Requested changes	2024-01-16 14:16:11 +01:00
Guillermo Bonet	5bbeda4014	feat: refs #4734 Added viaexpress interdia	2024-01-16 13:05:16 +01:00
Carlos Satorres	8095b02835	refs #5525 move version	2024-01-16 12:48:40 +01:00
Carlos Satorres	7b9480f006	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2024-01-16 12:48:13 +01:00
Carlos Satorres	ce2bfc7cf1	refs #5525 insert	2024-01-16 12:46:53 +01:00
Carlos Satorres	3ebeebc159	refs #6230 remove basic-data columns	2024-01-16 11:47:45 +01:00
Pablo Natek	73c0ca5382	feat(mrwXml): refs #6403 render and transmEnvio integrated	2024-01-15 15:00:36 +01:00
Jorge Penadés	54192c54ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-15 13:56:32 +01:00
Juan Ferrer	74a4e486aa	refs #6661 Propagate changes from vn-database	2024-01-15 13:12:15 +01:00
Juan Ferrer	b7edbbe12f	feat: refs #5483 Copy vn-database project	2024-01-15 12:31:03 +01:00
Guillermo Bonet	4ead2345c4	Merge branch '6634-collectionLabelPrevia' of https://gitea.verdnatura.es/verdnatura/salix into 6634-collectionLabelPrevia	2024-01-15 10:03:06 +01:00
Guillermo Bonet	a900e0fff6	feat: refs #6634 Minor change	2024-01-15 10:03:05 +01:00
Guillermo Bonet	1cd9b85ddf	Merge branch 'dev' into 6634-collectionLabelPrevia	2024-01-15 09:00:08 +00:00
Guillermo Bonet	be1a94c283	feat: refs #6634 Modified collection-label	2024-01-15 09:59:32 +01:00
Alex Moreno	199656afb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-12 12:41:52 +01:00
Jorge Penadés	2a6b509a78	fix: refs #6656 change acls	2024-01-12 09:54:18 +01:00
Alex Moreno	14fff571b5	Merge branch 'dev' into 6353-ratingCatalog	2024-01-12 08:52:51 +00:00
Carlos Satorres	d0df880c32	Merge branch 'dev' into 6322-futureTicketImporte	2024-01-12 07:47:23 +00:00
Jorge Penadés	ddcecb8f22	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-11 16:52:54 +01:00
Javi Gallego	c98baf21bf	Merge branch 'dev' into 3979-abonarTicketsSinAlmacen	2024-01-11 12:17:59 +00:00
Jorge Penadés	c61f5a67b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-11 09:28:24 +01:00
Alex Moreno	9b15551013	refs #6675 fix: correct sql folder	2024-01-11 09:00:45 +01:00
Alex Moreno	a92297da73	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-01-11 08:14:56 +01:00
Alex Moreno	edde5819e3	refs #6660 feat: update mariadb version 10.7.7→10.11.6	2024-01-10 15:39:35 +01:00
Carlos Satorres	980ca81bfc	refs #6353 fixtures catalog rating	2024-01-10 09:38:20 +01:00
Carlos Satorres	16d7a20798	Merge branch 'dev' into 6291-comprobarDNI	2024-01-09 13:49:31 +00:00
Guillermo Bonet	81ffc122fc	Merge branch 'test' into dev	2024-01-09 14:09:47 +01:00
Carlos Satorres	676d95563b	refs #6322 importe	2024-01-09 12:53:58 +01:00
Robert Ferrús	ea5483e847	refs #6222 refactor: sale_calculateComponent	2024-01-09 10:50:37 +01:00
Carlos Satorres	a22de3ab25	Merge branch 'dev' into 6291-comprobarDNI	2024-01-09 08:46:01 +00:00
Sergio De la torre	445703c6e2	6275-hotFix version not applied	2024-01-09 09:14:48 +01:00
Jorge Penadés	ab1dc7af55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-08 16:21:46 +01:00
Carlos Satorres	782772bffc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI	2024-01-08 09:54:50 +01:00
Carlos Satorres	c72311860b	refs #647 remove e2e	2024-01-08 09:06:22 +01:00
Javi Gallego	406cf7335b	Merge branch 'dev' into 3979-abonarTicketsSinAlmacen	2024-01-05 07:12:12 +00:00
Jorge Penadés	8a5da43503	refactor: sectorCollection_getSale refs #6276	2024-01-04 16:00:25 +01:00
Pablo Natek	2e5ae062cf	Merge branch 'dev' into 6259-ticketSmsJoinClientSms	2024-01-04 14:24:24 +00:00
Jorge Penadés	7a64b57a2a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-04 15:07:33 +01:00
Javi Gallego	767c6a6ac8	test: refs #3979 fixtures arregladas para que los abonos sean negativos	2024-01-04 15:01:56 +01:00
Carlos Satorres	3b14c7cd23	refs #6456 fix tback, models	2024-01-04 09:51:04 +01:00
Javier Segarra	f7d83b15bd	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-04 08:08:46 +00:00
Jorge Penadés	7d0c11e937	Merge branch '6276-createNewWarehouse' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-04 08:51:46 +01:00
Jorge Penadés	6d0e1cc47c	refactor: fix conficts refs #6276	2024-01-04 08:51:18 +01:00
Carlos Satorres	15d6c9a65b	Merge branch '6456-refactor-ticketState' of https://gitea.verdnatura.es/verdnatura/salix into 6456-refactor-ticketState	2024-01-04 08:39:07 +01:00
Alex Moreno	2a65ad6b31	refs #6635 build: new version	2024-01-04 08:22:01 +01:00
Alex Moreno	23b544c1ec	refs #6635 fix: add translation	2024-01-04 08:19:48 +01:00
Pablo Natek	847623f9c6	Merge branch 'dev' into 6259-ticketSmsJoinClientSms	2024-01-03 18:28:46 +00:00
Javier Segarra	4d7f0329ee	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-03 12:46:26 +00:00
David Domenech	d29fd5c65a	refs #6456	2024-01-03 13:35:36 +01:00
Sergio De la torre	141b549e5b	Merge branch '6276-createNewWarehouse' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-03 12:50:56 +01:00
Sergio De la torre	0b5ffcc81c	refs #6276:modify back silex→salix	2024-01-03 12:50:53 +01:00
Alex Moreno	ba26237998	refs #5914 refactor: getTaxBases	2024-01-03 12:19:28 +01:00
Jorge Penadés	bce8feb552	refs #6276 add maxHours	2024-01-03 10:41:44 +01:00
Jorge Penadés	b086da1936	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2024-01-03 08:57:46 +01:00
Carlos Satorres	12165ab382	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail	2024-01-03 08:31:07 +01:00
Alex Moreno	1e3a7e5f91	refs #5914 refactor: invoiceTickets	2024-01-02 13:17:10 +01:00
Javier Segarra	9165b921ca	refs #2687 perf: change db/changes folder	2024-01-02 13:00:37 +01:00
Javier Segarra	295124e0af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2687_travel_cloneWithEntries	2024-01-02 12:59:50 +01:00
Sergio De la torre	365e05d560	refs #6276:mdify back silex→salix	2024-01-02 12:21:25 +01:00
Jorge Penadés	767894b128	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-02 09:41:47 +01:00
Jorge Penadés	801037da64	fix changes: refs #6274	2024-01-02 08:47:12 +01:00
Alex Moreno	dd02a932ef	Merge branch 'test' into 5914-hotFix-transferInvoice	2024-01-02 06:40:18 +00:00
Carlos Satorres	c77715d865	refs #6291 validation original	2023-12-26 15:03:10 +01:00
Pablo Natek	323c7adcdd	Merge branch 'dev' into 6259-ticketSmsJoinClientSms	2023-12-26 07:20:58 +00:00
Pablo Natek	5a1c4ddea0	refactor(ticketSms): refs #6259 ticketSmsToClientSms	2023-12-26 08:20:13 +01:00
Jorge Penadés	2e1715a968	refactor renewToken & replace ACL: refs #6274	2023-12-22 15:19:45 +01:00
Javier Segarra	8c3d940987	Merge branch 'dev' into 5858-zone_Collisions	2023-12-22 10:53:38 +00:00
Jorge Penadés	89fda361bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-22 11:04:43 +01:00
Javier Segarra	4d2cf87f49	Merge branch 'dev' into 5666-loggable_to_mixin	2023-12-22 09:37:53 +00:00
Javier Segarra	8d08adca21	Merge branch 'dev' into 5666-loggable_to_mixin	2023-12-22 09:36:02 +00:00
Javier Segarra	ec1befcfb0	Merge branch 'dev' into 6434-signIn_issue	2023-12-22 09:25:57 +00:00
Javier Segarra	613327491b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2023-12-22 09:26:16 +01:00
Jorge Penadés	e1888bd154	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-22 08:35:50 +01:00
Pablo Natek	35750bc93f	merge(dev): refs #6259 merge dev	2023-12-21 18:46:12 +01:00
Pablo Natek	27a369bef4	refactor(ticketSms): refs #6259 merge ticksms to clientsms	2023-12-21 18:34:22 +01:00
Javier Segarra	6b37f23349	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-21 13:06:52 +01:00
Javier Segarra	100936d40b	Merge branch 'dev' into 5858-zone_Collisions	2023-12-21 12:05:27 +00:00
Carlos Satorres	73d1c1698b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI	2023-12-21 12:38:58 +01:00
Alex Moreno	9951e911ae	refs #5925 feat(docuware_upload): use userConfig.tabletFk	2023-12-21 10:39:46 +01:00
Alex Moreno	d30dcd7d70	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5925-docuwareTablet	2023-12-21 09:22:49 +01:00
Javier Segarra	daef9ee59a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signIn_issue	2023-12-21 09:01:02 +01:00
Jorge Penadés	f384616d69	move changes: refs #6274	2023-12-21 08:57:46 +01:00
Jorge Penadés	f5cc2cd75b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-21 08:38:33 +01:00
Alex Moreno	38279b0786	refs #6594 deploy: init version 24.02	2023-12-21 08:37:30 +01:00
Alex Moreno	7b0c5fe0a0	refs #5739 fix: sql	2023-12-21 08:33:50 +01:00
Alex Moreno	f2dcbe214a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-12-21 07:44:41 +01:00
Jorge Penadés	542b09073e	changes moved: refs #6274	2023-12-20 14:02:05 +01:00
Jorge Penadés	5d75592627	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-20 12:19:10 +01:00
Javier Segarra	c3b91e1719	Merge branch 'dev' into 6434-signIn_issue	2023-12-20 09:25:15 +00:00
Juan Ferrer	10bfafdd3c	Merge branch 'dev' into 6264-renewToken	2023-12-20 09:05:53 +00:00
David Domenech	5936a129da	refs #6398	2023-12-19 12:58:20 +01:00
Carlos Satorres	18e87a05c4	refs #5525 st and nd	2023-12-19 10:07:17 +01:00
David Domenech	d60f2a7f88	fix: refs #6398 Changed alias of views	2023-12-19 09:43:09 +01:00
Javier Segarra	5151cdca48	Merge branch 'dev' into 6434-signIn_issue	2023-12-19 07:06:36 +00:00
Javier Segarra	72e9b69d7e	Merge branch 'dev' into 5858-zone_Collisions	2023-12-19 07:04:41 +00:00
Javier Segarra	dbc3fc8007	refs #5858 perf: remove bad comments	2023-12-19 08:02:38 +01:00
Javier Segarra	a31b689ae2	refs #5858 perf: update db/changes	2023-12-19 07:54:49 +01:00
Javier Segarra	5b6112720f	refs #5858 feat: new fixture	2023-12-19 07:54:29 +01:00
Javier Segarra	15936ddc55	refs #5858 other: rename files	2023-12-19 07:53:47 +01:00
Carlos Satorres	22a9ffc163	refs #6291 dni	2023-12-18 12:33:04 +01:00
Alex Moreno	59f2e3d0e6	refs #5914 fix: remove unnecessary	2023-12-15 08:54:41 +01:00
Alex Moreno	c755b1e6fa	refs #5914 fix: correct sql version	2023-12-15 08:50:22 +01:00
Javier Segarra	f10cada19f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2687_travel_cloneWithEntries	2023-12-15 07:35:04 +01:00
Javier Segarra	b5b58faee4	refs #2687 perf: remove comments	2023-12-15 07:34:37 +01:00
Javier Segarra	d9ffdaf855	refs #2687 test: use tx.rollback()	2023-12-14 16:00:29 +01:00
Alex Moreno	21a1dbeae7	refs #5914 fix: ticket canBeInvoiced and optimized invoiceTickets	2023-12-14 15:56:49 +01:00
Alex Moreno	1ce1af82fe	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2023-12-14 15:55:21 +01:00
Alex Moreno	d7454cdb19	refs #6576 fix: correct version	2023-12-14 11:41:59 +01:00
Jorge Penadés	1f2d475f05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-14 08:41:45 +01:00
Javier Segarra	485968037b	Merge branch 'dev' into 6264-renewToken	2023-12-14 06:22:17 +00:00
Sergio De la torre	af83519ee6	Merge branch 'dev' into 6275-silex-to-salix	2023-12-13 15:12:39 +00:00
Jorge Penadés	36a9b0eee4	refs #6276 collectionAddItem	2023-12-13 16:00:07 +01:00
Javier Segarra	1e89ed6cdc	Merge branch 'dev' into 6264-renewToken	2023-12-13 14:39:10 +00:00
Javier Segarra	8a66391cd5	Merge branch 'dev' into 6434-signIn_issue	2023-12-13 12:31:53 +00:00
David Domenech	9bcd0a3c98	Merge branch 'dev' into 6125-roleCreditLimitFix	2023-12-13 11:29:46 +00:00
Javier Segarra	6af99b7669	refs #6434 feat: delete records whe !owner	2023-12-13 12:07:41 +01:00
David Domenech	d4fa1e9aca	refs #6398	2023-12-13 12:04:07 +01:00
Javier Segarra	5b3645a641	refs #6434 fix: bad merge	2023-12-13 11:59:00 +01:00
Javier Segarra	d69b59b63e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signIn_issue	2023-12-13 11:54:28 +01:00
Jorge Penadés	8d61473d4f	refs #6276 fixtures & itemBarcode_delete	2023-12-13 11:43:19 +01:00
Carlos Satorres	556b403a5b	refs #5525 letter debtor st	2023-12-13 11:29:50 +01:00
David Domenech	2f61b648f7	refs #6398	2023-12-13 09:49:03 +01:00
Jorge Penadés	a4c3d78e31	refs #6276 drop fixtures & fix getSale	2023-12-13 09:45:01 +01:00
David Domenech	ee6ad55e66	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk	2023-12-13 09:43:20 +01:00
Pablo Natek	69dd34665f	refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit	2023-12-13 08:50:17 +01:00
Jorge Penadés	01fa0b1d36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-13 08:35:11 +01:00
Javier Segarra	074bb2b980	Merge branch 'dev' into 5666-loggable_to_mixin	2023-12-13 06:30:14 +00:00
Javier Segarra	d44cdcbd13	Merge branch 'dev' into 6264-renewToken	2023-12-13 06:14:55 +00:00
Sergio De la torre	e22201c840	Merge branch 'dev' into 6275-silex-to-salix	2023-12-12 14:50:25 +00:00
Carlos Satorres	412cac7e94	refs #5925 models table docuware	2023-12-12 14:42:36 +01:00
Jorge Penadés	3109f7722e	refs #6276 saleTracking_mark	2023-12-12 13:24:18 +01:00
Alex Moreno	ea39f8b3be	remove duplicate	2023-12-12 12:25:51 +01:00
Javier Segarra	8bd9becb74	refs #2687 feat: remove procedure argument	2023-12-12 07:34:20 +01:00
Javier Segarra	64fbbd5dda	refs #2687 feat: new transaction procedure utils	2023-12-11 14:53:55 +01:00
Javier Segarra	a8dfe8f3bf	refs #2687 feat: modify vn.travel_cloneWithEntries	2023-12-11 14:53:29 +01:00
Jorge Penadés	8acd03f115	refs #6276 saleTrackingReplace	2023-12-11 13:01:34 +01:00
Carlos Satorres	584f3264ed	refs #6085 refactor sql trad	2023-12-11 08:54:58 +01:00
Jorge Penadés	e27bf2ef8b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-11 08:29:35 +01:00
Carlos Satorres	866ad7a9f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail	2023-12-11 08:20:19 +01:00
Alex Moreno	ec66386b44	refs #5914 fix: correct sql folder	2023-12-11 07:49:44 +01:00
Alex Moreno	f874faa921	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2023-12-11 07:47:55 +01:00
Jorge Penadés	b88d61e864	Merge commit '6fb4e8677' into 6274-loginWorkerTimeControl	2023-12-07 14:53:33 +01:00
Jorge Penadés	6fb4e86777	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into HEAD	2023-12-07 14:47:31 +01:00
Sergio De la torre	61ed53bd1d	REFS #6275 feat:Silex_to_Salix	2023-12-07 10:37:06 +01:00
Carlos Satorres	920b38c929	refs #5525 move sql	2023-12-07 09:49:15 +01:00
Javi Gallego	58ba1c10d0	ci: dev-test	2023-12-07 08:01:16 +01:00
Carlos Satorres	102ea1ee65	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2023-12-07 07:35:18 +01:00
Javi Gallego	7ff8ec93ff	Merge pull request 'test' (!1879) from test into dev ... Reviewed-on: #1879	2023-12-06 07:54:13 +00:00
Jorge Penadés	b50a6add0d	refs #6274 merge renewToken	2023-12-05 15:57:42 +01:00
Jorge Penadés	bb186bafe0	Merge branch '6264-renewToken' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-05 14:12:00 +01:00
Javier Segarra	a7c48b6ddc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-05 13:02:34 +01:00
Jorge Penadés	25006a938b	refs #6274 refactor clockIn	2023-12-05 11:53:27 +01:00
Jorge Penadés	419ab41816	refs #6276 Acl addTimeEntry	2023-12-05 09:55:22 +01:00
Sergio De la torre	3692021b12	Merge branch 'dev' into 6275-silex-to-salix	2023-12-05 07:26:22 +00:00
Sergio De la torre	318f7e3c0d	REFS #6275 feat:Silex_to_Salix	2023-12-05 08:20:55 +01:00
Javier Segarra	7a63e527a5	refs #5666 perf: remove comments	2023-12-05 07:50:52 +01:00
Javier Segarra	2fe631f078	refs #5666 feat: change models permissions	2023-12-05 07:15:22 +01:00
Jorge Penadés	8cb97e2477	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-04 15:09:44 +01:00
Javier Segarra	a8b0a7a5b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-12-04 14:46:21 +01:00
Carlos Satorres	6d486fbec9	refs #6085 trad, remove front, back test	2023-12-01 13:58:45 +01:00
Pablo Natek	303b6f5240	fix(expencefk): refs #6398 expenceFk to expenseFk	2023-12-01 13:48:56 +01:00
Jorge Penadés	30b63f577f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-01 09:49:49 +01:00
Jorge Penadés	d5f09c2f75	refs #6276 saleTrackingDel	2023-12-01 09:44:49 +01:00
Javier Segarra	db06620d7c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2023-12-01 09:39:47 +01:00
Javier Segarra	60fbb1d56e	refs #5858 feat: update procedure zoneIncluded_getCollisions	2023-12-01 09:39:21 +01:00
Alex Moreno	e634a5e213	refs #5914 feat: create getTaxBases and use in negatives and positives procedures	2023-11-30 15:15:40 +01:00
David Domenech	eb0766bafd	Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk	2023-11-30 14:08:47 +00:00
David Domenech	8ab981907d	refactor(ticketTracking.userFk): refs #6398 workerFk to userFk	2023-11-30 14:25:00 +01:00
Pablo Natek	c457b5c4d2	Merge branch 'test' into 3271-zoneGetFilterdFix	2023-11-30 12:39:26 +00:00
Alex Moreno	ee7dd66ce9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-30 12:49:42 +01:00
Alex Moreno	35e74a7635	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-30 12:48:27 +01:00
Alex Moreno	ab69dcd4fe	refs #6524 fix: fixtures and feat: new changelog format	2023-11-30 12:32:41 +01:00
Javier Segarra	16001099b6	refs #5666 feat: update ACLs for role and vnRole	2023-11-30 12:15:48 +01:00
Pablo Natek	3f22f48df7	fix(getFiltered): refs #3271 fix to event filter	2023-11-30 12:13:12 +01:00
Jorge Penadés	25a0ffcfde	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-30 09:49:50 +01:00
Javier Segarra	7611acb8f2	refs #6434 perf rename version folder for sql file	2023-11-30 08:34:10 +01:00
Javier Segarra	80f8037f58	refs #6434 perf remove version folder for sql file	2023-11-30 08:23:14 +01:00
Javier Segarra	6b354a20ad	refs #6434 perf: add sql table description	2023-11-30 08:13:28 +01:00
Javier Segarra	138d11b7b0	refs #6434 perf new version folder for sql file	2023-11-30 08:10:32 +01:00
Javier Segarra	97d7f8356f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-11-30 07:08:23 +01:00
Javier Segarra	46774b2e73	refs #6434 perf: new field in SignInLog table	2023-11-29 19:35:37 +00:00
Jorge Penadés	27d223cbab	refs #6276 machineWorker_add	2023-11-29 16:25:15 +01:00
Javi Gallego	d246b5f9a8	Merge branch 'dev' into 5652-fixtures-fix	2023-11-29 15:26:51 +01:00
Jorge Penadés	877c679273	refs #6276 getVersion	2023-11-29 13:22:44 +01:00
Javier Segarra	c40dc134f8	refs #5858 feat: sql files for new version	2023-11-29 12:15:38 +01:00
Jorge Penadés	133fe1065a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-29 09:44:09 +01:00
Jorge Penadés	c609f6f47f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-11-29 09:27:50 +01:00
Alex Moreno	2e22984e77	refs #6197 fix: add salix role in fixtures	2023-11-29 09:13:54 +01:00
Jorge Penadés	48dd068190	refs #6274 upperCase Model	2023-11-29 08:37:56 +01:00
Carlos Satorres	0186c2c806	refs #6085 aclMail back	2023-11-29 07:33:49 +01:00
Jorge Penadés	29fb36010c	refs #6274 back methods created	2023-11-28 14:48:03 +01:00
Javier Segarra	63533459b0	refs #6434 feat: improve signIn method	2023-11-28 13:22:17 +01:00
Javi Gallego	2fa56cce4b	fix: refs #5652 arreglo fixtures	2023-11-28 09:22:00 +01:00
Javier Segarra	901a44cc62	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-11-27 09:48:31 +01:00
Alex Moreno	824ca1d70a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2023-11-27 07:42:50 +01:00
Guillermo Bonet	2be1639e9f	refactor: refs #3222 Expence to expense	2023-11-24 12:42:25 +01:00
Javier Segarra	4383ebd7f1	refs #5858 feat: email notification	2023-11-24 12:30:44 +01:00
Javier Segarra	5d156e81ca	refs #5858 perf: move files to current version folder	2023-11-23 15:18:09 +01:00
Jorge Penadés	f862ed7d8a	refs #6274 refactor updateInTime	2023-11-23 13:19:59 +01:00
Jorge Penadés	cf3b5efee9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-23 12:36:19 +01:00
Javi Gallego	f44424dbcf	test: refs #6028 test	2023-11-23 09:44:47 +01:00
Javi Gallego	5b289ec083	Merge branch 'dev' into 6028_route_getRouteByWorker	2023-11-23 09:21:44 +01:00
Alex Moreno	217aa1ac77	refs #6491 deploy(2350) init version	2023-11-23 08:35:08 +01:00
Javier Segarra	57b8b69ae9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2023-11-23 07:49:42 +01:00
Javi Gallego	e856de0cfd	feat: refs #6028 test	2023-11-22 15:54:38 +01:00
Jorge Penadés	a60a30128c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-22 15:40:11 +01:00
Jorge Penadés	fac6aab26c	refs #6276 machineWorker_update	2023-11-22 14:25:19 +01:00
Javier Segarra	b453abdb3a	refs #5858 feat: new event in vn	2023-11-22 12:48:43 +01:00
Javi Gallego	e146c0ea46	Merge branch 'dev' into 6028_route_getRouteByWorker	2023-11-22 12:42:20 +01:00
Guillermo Bonet	d52c82fb19	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-22 11:36:07 +00:00
Jorge Penadés	40bbad04c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-22 10:16:12 +01:00
Javier Segarra	f4a9e7b74e	ref #5858 feat: create table zoneIncludedCheck	2023-11-22 09:31:09 +01:00
Javier Segarra	f00b264daa	ref #5858 feat: dispatchers_after[Insert|Update|Delete]	2023-11-22 09:27:08 +01:00
Javier Segarra	50cb7964d9	ref #5858 feat: drp zone_getCollisions procedure	2023-11-22 09:24:45 +01:00
Javier Segarra	1d95c17a0b	refs #5858 feat: remove row from bs.nightTask	2023-11-22 09:23:59 +01:00
Jorge Penadés	251578146e	refs #6276 several methods created	2023-11-21 12:32:36 +01:00
Jorge Penadés	67fa60ae81	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-21 12:27:13 +01:00
Guillermo Bonet	b3d1c72adc	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-21 09:13:41 +00:00
Alex Moreno	e909c2bc26	Merge branch 'dev' into 6454-dbDump	2023-11-21 09:13:17 +00:00
Jorge Penadés	34e5409533	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay	2023-11-21 08:19:11 +01:00
Alex Moreno	ee1a0c15ee	refs #6454 feat: dump db	2023-11-20 15:09:55 +01:00
Guillermo Bonet	5fdf18825c	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-20 13:14:51 +00:00
Alex Moreno	e25ca914a0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-20 10:13:02 +01:00
Guillermo Bonet	b2b12adb3d	Merge branch '4502-zoneEstimatedDelivery' of https://gitea.verdnatura.es/verdnatura/salix into 4502-zoneEstimatedDelivery	2023-11-20 09:47:58 +01:00
Guillermo Bonet	61b2d4c5fd	refactor: refs #4502 zoneEstimatedDelivery	2023-11-20 09:47:57 +01:00
Alex Moreno	0ddfb28327	refs #5914 fix: transferInvoice	2023-11-20 07:56:15 +01:00
Alex Moreno	7951b874a6	Merge branch 'dev' into 6264-renewToken	2023-11-20 06:39:50 +00:00
Juan Ferrer	1937560118	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-16 23:07:30 +01:00
Juan Ferrer	4f5242e3ae	fix: refs #6432 account sync fixes	2023-11-16 23:07:26 +01:00
Javier Segarra	a73453e9ed	refs #6434 feat: remove old sql file	2023-11-16 11:56:59 +01:00
Alex Moreno	b8d256e4e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-11-16 09:58:51 +01:00
Alex Moreno	f677382f96	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-16 09:29:53 +01:00
Javier Segarra	67f5be474d	refs #6434 perf: rename db/changes current folder	2023-11-16 09:21:22 +01:00
Javier Segarra	e4f7790843	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER	2023-11-16 09:15:01 +01:00
Javier Segarra	144b26cf4c	refs #6434 perf: signInLog table id column AI	2023-11-16 08:47:08 +01:00
Javier Segarra	d032b3a527	refs #6434 perf: add description to signInLog table	2023-11-16 08:42:17 +01:00
Javier Segarra	e73836cbdb	refs #6434 feat: remove primary key constraint	2023-11-16 08:31:01 +01:00
Javier Segarra	c6b5d7f5a4	refs #6434 feat: rename id key by token	2023-11-16 08:30:01 +01:00
Javier Segarra	e0f6d08a1e	refs #6434 feat: create signInLog table	2023-11-15 13:49:41 +01:00
Javi Gallego	a4328e607e	Merge branch 'dev' into 6207-incoterm-solo-en-serie-world	2023-11-15 10:11:05 +01:00
Javier Segarra	4d677ccc89	refs #6434 perf: rename folder db/changes version	2023-11-15 10:02:48 +01:00
Javier Segarra	4061241650	refs #6434 feat: create signInLog table	2023-11-15 09:37:03 +01:00
Alex Moreno	2a67048594	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-14 15:54:47 +01:00