8976 Commits

Author	SHA1	Message	Date
Javier Segarra	6214da2c42	feat(salix): refs #6930 Undo rollback salix-back	2024-04-17 09:52:53 +02:00
Guillermo Bonet	9f9662924d	Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!2306) from 6968-groupingModeRefactor into dev ... Reviewed-on: #2306 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-17 06:48:43 +00:00
Sergio De la torre	ae88a8a281	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery	2024-04-17 07:44:08 +02:00
Guillermo Bonet	36bf770ed4	Merge pull request 'feat: refs #7173 Bloquear facturas recibidas contabilizadas' (!2258) from 7173-Restricción-eliminar/modificar-vn.invoiceIn into dev ... Reviewed-on: #2258 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-17 05:17:36 +00:00
Guillermo Bonet	d92d373db4	Merge branch 'dev' into 6968-groupingModeRefactor	2024-04-17 05:15:37 +00:00
Guillermo Bonet	56dc0ddb68	Merge branch 'test' into dev	2024-04-16 12:32:53 +02:00
Guillermo Bonet	9ea1ac2a56	Merge branch 'master' into test	2024-04-16 12:32:27 +02:00
Guillermo Bonet	7a557be09a	feat: refs #6968 Changed groupingMode to enum	2024-04-16 11:07:57 +02:00
Guillermo Bonet	d88957d157	Merge branch 'dev' into 7173-Restricción-eliminar/modificar-vn.invoiceIn	2024-04-16 06:45:04 +00:00
Guillermo Bonet	91d5f51e73	Merge branch '7173-Restricción-eliminar/modificar-vn.invoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 7173-Restricción-eliminar/modificar-vn.invoiceIn	2024-04-16 08:44:51 +02:00
Guillermo Bonet	93abfdd8a1	feat: refs #7173 Added restrictions in invoiceIn structure	2024-04-16 08:44:50 +02:00
Sergio De la torre	d24de61213	refs #6921 feat: addFromDelivery	2024-04-16 08:29:39 +02:00
Pablo Natek	0418540ef9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-16 07:39:13 +02:00
Jorge Penadés	3c9ac9634b	fix: refs #6938 front tests	2024-04-15 15:02:45 +02:00
Jorge Penadés	3e1218463c	fix: refs #6938 filters & scope	2024-04-15 14:44:18 +02:00
Guillermo Bonet	339c349ed0	feat: refs #6724 Added admon acl to vn-check	2024-04-15 14:00:54 +02:00
Guillermo Bonet	5c524ecc7d	rollback: refs #6724 entry.js	2024-04-15 13:13:40 +02:00
Guillermo Bonet	78bd561122	Merge branch 'dev' into 6724-permisos-vn.entry.isBooked	2024-04-15 11:11:55 +00:00
Sergio De la torre	4cb79956a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery	2024-04-15 13:03:47 +02:00
Jorge Penadés	d7b06fe637	fix: refs #6938 scope	2024-04-15 12:47:27 +02:00
Jorge Penadés	200cbd8d74	fix: refs #6938 acls & scope	2024-04-15 11:03:57 +02:00
Jorge Penadés	0219fa105e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6938-hideWorkerPhone	2024-04-15 10:22:44 +02:00
Jorge Penadés	a68b8431c5	feat: refs #6938 add scope & acls	2024-04-15 10:21:59 +02:00
jcasado	dc8a6d1274	Merge branch 'dev' into 6641-checkboxMyTeam	2024-04-15 10:11:36 +02:00
Alex Moreno	b4862a8ce9	hotFix(claimBegginingModel): enable claimIsEditable and &&	2024-04-12 11:35:21 +02:00
Pablo Natek	726b1ddc07	Merge branch 'dev' into 6005-backupLabeler	2024-04-12 05:14:29 +00:00
Guillermo Bonet	2226922366	Merge branch 'master' into test	2024-04-11 14:52:16 +02:00
Guillermo Bonet	4449441cbf	Merge pull request 'hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod' (!2279) from ticket168996-hotfix into master ... Reviewed-on: #2279 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-11 12:42:44 +00:00
Alex Moreno	99d80d4d30	hotFix(closeAll): continue loop	2024-04-11 13:51:33 +02:00
Alex Moreno	3635a4b6d0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-11 07:46:16 +02:00
Ivan Mas	83befbd120	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-04-10 15:21:42 +00:00
jcasado	0cf1ced747	remove focus	2024-04-10 13:17:43 +02:00
jcasado	7d925bac87	refs #6641 fix PR changes	2024-04-10 13:16:41 +02:00
Pablo Natek	c581deef66	refactor: refs #6005 refactor spec	2024-04-10 13:09:31 +02:00
Sergio De la torre	9c373d9ef3	refs #6921 feat: getTicketsObservations	2024-04-10 12:02:25 +02:00
Guillermo Bonet	1fe783cf0e	hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod	2024-04-10 12:00:52 +02:00
Alex Moreno	51e7045e8b	hotFix(workerTimeControl): getWeekNumber	2024-04-10 09:44:09 +02:00
Ivan Mas	eedf30a2dd	refs #6732 salix dependencies and undo changes Proveedores	2024-04-09 17:31:34 +02:00
Pablo Natek	ed517399dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-04-09 15:04:04 +02:00
Pablo Natek	ac9732606c	remove(focus): refs #6005 from spec	2024-04-09 14:55:29 +02:00
Ivan Mas	f02c4354ba	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-04-09 14:45:29 +02:00
Ivan Mas	521033edd2	Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal	2024-04-09 11:54:41 +00:00
Pablo Natek	da037c5235	refactor: refs #6005 delay on productionConfig	2024-04-09 13:34:33 +02:00
Guillermo Bonet	0e2e68488d	Merge branch 'test' into dev	2024-04-09 13:08:54 +02:00
Alex Moreno	c69a4e1c98	Merge pull request 'refactor(workerDms): adapat to lilium' (!2269) from 6551-workerDms_refactor into dev ... Reviewed-on: #2269 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-09 08:21:20 +00:00
Guillermo Bonet	c42e00f11e	Merge branch 'dev' into 6636-pickup	2024-04-09 07:43:51 +00:00
Pablo Natek	7cb40f5d89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-04-09 09:42:39 +02:00
Pablo Natek	638b715ee5	fix: refs #6005 move logic to hook	2024-04-09 09:30:28 +02:00
Alex Moreno	500244dbed	fix id	2024-04-09 07:51:57 +02:00
Sergio De la torre	75293fbb9a	refs #6276 hotFix:itemShelving_add	2024-04-09 07:38:28 +02:00
Alex Moreno	0ecc09fcc4	Merge branch 'dev' into 6551-workerDms_refactor	2024-04-08 12:50:05 +00:00
Alex Moreno	9134216332	refactor(workerDms): adapat to lilium	2024-04-08 14:46:35 +02:00
jcasado	a30c0ee675	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-08 14:39:00 +02:00
jcasado	84997eacd5	refs: 6697 remove claim quantity	2024-04-08 14:38:54 +02:00
jcasado	26c74a3e71	refs #6641 fix test	2024-04-08 13:03:15 +02:00
Guillermo Bonet	e27279e20e	Merge branch 'dev' into 6636-pickup	2024-04-08 05:18:36 +00:00
Alex Moreno	93000aaecf	Merge branch 'dev' into 6549-ticket_close	2024-04-05 12:20:09 +00:00
Guillermo Bonet	16a6e3d8a6	feat: refs #6636 Requested change	2024-04-05 08:18:38 +02:00
Pablo Natek	4b4aaa9e10	feat: refs #6005 move logic from report to hook	2024-04-05 08:04:53 +02:00
Guillermo Bonet	0cd4013f5e	Merge branch 'test' into dev	2024-04-05 07:51:19 +02:00
Guillermo Bonet	1656c8db63	Merge branch '6636-pickup' of https://gitea.verdnatura.es/verdnatura/salix into 6636-pickup	2024-04-05 07:42:04 +02:00
Guillermo Bonet	23db6a41be	feat: refs #6636 Minor change	2024-04-05 07:42:03 +02:00
Guillermo Bonet	ac658fb6af	Merge branch 'dev' into 6636-pickup	2024-04-05 05:29:26 +00:00
Carlos Andrés	fe0afe30bf	fix: closeTicket idem salix Refs: #6549	2024-04-04 17:50:39 +02:00
Sergio De la torre	2ed5237568	Merge branch 'dev' into 6964_itemOlder	2024-04-04 13:45:20 +00:00
jcasado	84e6e7f7bf	refs #6641 test fixtures	2024-04-04 14:53:26 +02:00
Carlos Andrés	9fcad457a7	fix: closeTicket idem salix Refs: #6549	2024-04-04 14:46:51 +02:00
jcasado	1c6d913926	refs #6641 addFilterCollegues	2024-04-04 14:28:39 +02:00
Guillermo Bonet	fcb4fe92e8	Merge branch 'dev' into 6636-pickup	2024-04-04 12:14:23 +00:00
Guillermo Bonet	f44e19cae3	feat: refs #6636 Modified updateClaim, model and tests	2024-04-04 14:15:20 +02:00
jcasado	5acef1fcc0	refs #6641 add button my team	2024-04-04 13:53:23 +02:00
Alex Moreno	20e4ab1d2c	Merge pull request 'hotFix: handle mail error' (!2253) from hotFix_handleMailErrors into master ... Reviewed-on: #2253 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-04-04 11:35:09 +00:00
Alex Moreno	dd9c7283c3	hotFix: handle mail error	2024-04-04 13:32:39 +02:00
Guillermo Bonet	29eee4e8a7	Merge branch 'test' into dev	2024-04-04 11:30:03 +02:00
Sergio De la torre	9423a2d043	refs #3520 hotFix: hasUncheckedTickets	2024-04-04 10:38:55 +02:00
Guillermo Bonet	c685000b47	hotfix: refs #6930 Rollback tokenMultimedia	2024-04-04 10:13:56 +02:00
Jon Elias	3e044a8efe	fix: refs #7152 add supplier storage	2024-04-04 08:16:37 +02:00
Pablo Natek	2efd1945f8	feat: refs #4988 add agency	2024-04-04 07:27:27 +02:00
Alex Moreno	ff2e00c51c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-04-03 16:24:45 +02:00
Alex Moreno	59ead0c2e5	debug(closure): add log	2024-04-03 15:29:56 +02:00
Javier Casado	3968d88a8d	Merge branch 'master' into hotfix_languageClaimNotification	2024-04-03 11:37:15 +00:00
jcasado	09f023090e	hotfix claimStateLanguage	2024-04-03 13:33:56 +02:00
Jorge Penadés	a62e189e47	feat: refs #6724 hook added	2024-03-28 16:10:52 +01:00
Sergio De la torre	b62905c5ef	Merge branch 'dev' into 6964_itemOlder	2024-03-28 10:08:56 +00:00
Alex Moreno	a376003da6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-28 10:10:22 +01:00
Alex Moreno	ed46ad03d2	refs #7152 warmFix	2024-03-28 09:33:57 +01:00
Carlos Satorres	9f438751d3	Merge branch 'dev' into 6074-KkearisBlocked	2024-03-28 08:13:37 +00:00
Alex Moreno	f1931fce69	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-28 08:19:26 +01:00
Alex Moreno	c47989c6fe	Merge pull request '3520_wareshouse_back' (!2218) from 3520_wareshouse_back into dev ... Reviewed-on: #2218 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 07:16:56 +00:00
Alex Moreno	0b764ebc1b	Merge pull request '#6514 - gestDocSupplier' (!2209) from 6514-gestDocSupplier into dev ... Reviewed-on: #2209 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 07:12:51 +00:00
Sergio De la torre	4ca3e8f650	Merge branch 'dev' into 3520_wareshouse_back	2024-03-28 07:12:24 +00:00
Sergio De la torre	8e6416d59c	refs #3520 feat:uncheckedTicket	2024-03-28 08:08:32 +01:00
Alex Moreno	6853454d30	Merge pull request '#7002 update direction if device exists' (!2206) from 7002-fixUpdateTimeEntry into dev ... Reviewed-on: #2206 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 07:04:17 +00:00
Alex Moreno	8cccc78b88	Merge branch 'dev' into 6532-deleteMermas	2024-03-28 06:42:39 +00:00
Javier Segarra	d30cac971f	refs #6930 updates	2024-03-28 07:22:28 +01:00
Sergio De la torre	7634d82d8b	refs #6964 feat:hasItemOlder	2024-03-28 07:15:30 +01:00
Carlos Satorres	f4915fbe2e	Merge branch 'dev' into 6074-KkearisBlocked	2024-03-27 16:50:03 +00:00
Jorge Penadés	e7a29119d0	feat: refs #7002 add test	2024-03-27 13:38:04 +01:00
Jorge Penadés	227d123247	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7002-fixUpdateTimeEntry	2024-03-27 12:24:19 +01:00
Sergio De la torre	483345666e	refs #3520 feat:back WarehouseFk	2024-03-27 11:01:32 +01:00
Jon Elias	562dd4034f	feat: #7130 added "served" field to RouteList table(Salix).	2024-03-27 07:58:35 +01:00
Sergio De la torre	9240732c00	refs #6964 feat:advice for olderItem	2024-03-27 07:49:51 +01:00
Sergio De la torre	2cf572baf8	refs #3520 hasUncheckedTicket	2024-03-27 07:48:16 +01:00
Sergio De la torre	a983f25c57	refs #3520 hasUncheckedTicket	2024-03-27 07:47:36 +01:00
Sergio De la torre	39b1e9ff7b	refs #3520 hasUncheckedTicket	2024-03-27 07:26:11 +01:00
Sergio De la torre	eaf3749440	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3520_wareshouse_back	2024-03-27 07:11:16 +01:00
Sergio De la torre	ff8522cfd1	refs #6964 feat:advice for olderItem	2024-03-27 07:09:18 +01:00
Sergio De la torre	43b042a616	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-27 07:08:47 +01:00
Javier Segarra	38c5209c33	refs #6930 fix more endpoints	2024-03-26 15:01:28 +01:00
Jorge Penadés	6ded14b593	feat: refs #7002 update direction if it was not manual	2024-03-26 14:25:25 +01:00
Sergio De la torre	b805a5de0a	refs #3520 feat:uncheckedTicket	2024-03-26 12:40:44 +01:00
Robert Ferrús	3e2e0ccadb	Merge branch 'master' into 7141-sale_replaceItem	2024-03-26 11:00:44 +00:00
Sergio De la torre	caf99a9738	refs #3520 feat:uncheckedTicket	2024-03-26 11:06:14 +01:00
Sergio De la torre	678eb2928f	refs #6964 feat:hasItemOlder	2024-03-26 10:30:17 +01:00
Sergio De la torre	c265896224	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-26 10:24:27 +01:00
Sergio De la torre	dc5f588c8e	refs #3520 feat: backWarehouse in Salix	2024-03-26 10:13:57 +01:00
Jon Elias	a5082d04f9	refs: #6514 fixed error	2024-03-26 08:52:11 +01:00
Jon Elias	0f4e1acf09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6514-gestDocSupplier	2024-03-26 08:37:51 +01:00
Alex Moreno	2212899400	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-26 08:35:38 +01:00
Jon Elias	04e42cd3c8	feat: #6514 created supplierDms functionality	2024-03-26 08:29:07 +01:00
Alex Moreno	dce0155c00	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-26 08:18:47 +01:00
Sergio De la torre	1840117b3b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-25 16:08:11 +01:00
Robert Ferrús	dd977fab83	fix: refs #7141 catalog_calculate	2024-03-25 14:56:12 +01:00
Jorge Penadés	eb2b0d41de	feat: refs #7002 update direction if device exists	2024-03-25 13:33:39 +01:00
Sergio De la torre	0f5c5efcaa	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6276-newWarehouse-salix	2024-03-25 13:04:02 +01:00
Sergio De la torre	386bc1c934	refs #6276 hotFix: setUserError and return	2024-03-25 13:00:55 +01:00
Jorge Penadés	308a449b94	Merge branch 'master' into 6085-hotFix-addOwnedAlias	2024-03-25 07:48:08 +00:00
Sergio De la torre	a40234ba9b	refs #6964 feat:hasItemOlder	2024-03-25 08:20:08 +01:00
Sergio De la torre	22f78dbb91	refs #6964 feat:hasItemOlder	2024-03-25 07:54:51 +01:00
Jorge Penadés	0867f4d501	fix: refs #6951 var names & procedure name	2024-03-22 16:01:22 +01:00
Jorge Penadés	e8d1967e11	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-22 15:14:12 +01:00
Sergio De la torre	c4fcb2cd12	refs #6964 feat:advice for olderItem	2024-03-22 13:04:16 +01:00
Sergio De la torre	61b649fdc5	refs #6964 feat:advice for olderItem	2024-03-22 11:47:12 +01:00
Sergio De la torre	976c5b7ba8	refs #6964 feat:advice for olderItem	2024-03-22 11:42:19 +01:00
Sergio De la torre	027aa86662	refs #6964 feat:advice for olderItem	2024-03-22 10:08:20 +01:00
Sergio De la torre	9e5e49c28f	refs #6276 feat:newWarehouse	2024-03-22 06:56:27 +01:00
Carlos Satorres	ca0d269ee2	refs #6074 remove isBlocked	2024-03-21 15:02:09 +01:00
Jorge Penadés	d8aad86c92	feat: refs #6085 add acl authenticated	2024-03-21 13:42:02 +01:00
Sergio De la torre	2a976664ec	refs #6276 feat:newWarehouse	2024-03-21 12:05:34 +01:00
Sergio De la torre	5135bee2d2	refs #6276 feat:newWarehouse	2024-03-21 12:02:57 +01:00
Sergio De la torre	d8da317339	Merge branch 'dev' into 6964_itemOlder	2024-03-21 10:10:57 +00:00
Sergio De la torre	1d37d3d8bf	refs #6276 feat:newWarehouse	2024-03-21 10:33:49 +01:00
Sergio De la torre	3fbf32bd52	refs #6276 feat:newWarehouse	2024-03-21 10:32:36 +01:00
Pablo Natek	130fb68d27	Merge pull request 'feat: refs #6302 delete after add to turn' (!2187) from 6302-delete-ticket-after-add-to-turn into dev ... Reviewed-on: #2187 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-21 09:28:39 +00:00
Ivan Mas	db71e69317	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-03-21 09:21:32 +00:00
Sergio De la torre	9eee26cbe9	refs #6276 feat:newWarehouse	2024-03-21 10:18:54 +01:00
Alex Moreno	b087c35a36	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-21 08:01:05 +01:00
Pablo Natek	da8fbb5a92	fix: refs #6302 spec	2024-03-20 21:14:01 +01:00
Pablo Natek	f7b458d368	feat: refs #6302 delete after add to turn	2024-03-20 20:54:24 +01:00
Alex Moreno	adddcc96aa	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-20 15:01:17 +01:00