1498 Commits

Author	SHA1	Message	Date
Jorge Penadés	25b05637a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-addDefaultChannel	2024-11-14 11:17:11 +01:00
Jorge Penadés	c8ab5d4344	fix: refs #6818 add defaultChannel	2024-11-14 11:16:45 +01:00
Guillermo Bonet	8449a6c6d3	feat: refs #7244 Requested changes	2024-11-14 09:42:59 +01:00
Guillermo Bonet	5f50d84213	feat: refs #7244 Requested changes	2024-11-14 09:42:49 +01:00
Guillermo Bonet	cba1abad68	feat: refs #8057 Added data updates	2024-11-14 09:27:38 +01:00
Guillermo Bonet	d4b0da50d0	feat: refs #8057 Added data updates	2024-11-14 09:00:19 +01:00
Guillermo Bonet	b7655b4f92	feat: refs #8057 Added geoFk columns	2024-11-14 08:24:42 +01:00
Guillermo Bonet	97e53b2ef8	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-14 06:57:26 +00:00
Ivan Mas	e1b0fc298c	feat: refs #8143 deprecate recoverPass and sync from account.user	2024-11-13 20:26:54 +01:00
Ivan Mas	21693cfd71	feat: refs #7994 new version script fix	2024-11-13 14:33:52 +01:00
Guillermo Bonet	72e067ff81	fix: refs #7244 Added collection ACL	2024-11-13 12:53:18 +01:00
Guillermo Bonet	782563f67d	Merge branch 'test' into dev	2024-11-13 12:19:42 +01:00
Guillermo Bonet	5a134668da	refactor: refs #7920 itemShelvingLog	2024-11-13 12:04:47 +01:00
Guillermo Bonet	9d5ef3eeb0	Merge branch 'dev' into 7920-itemShelving	2024-11-13 10:16:57 +00:00
Robert Ferrús	9b079a8bb2	Merge branch 'master' into 8169-itemTextureTag	2024-11-13 09:45:23 +00:00
Guillermo Bonet	172b4d8e05	Merge branch 'test' into dev	2024-11-13 09:40:30 +01:00
Jorge Penadés	f52041eeff	Merge branch 'dev' into 6818-saySimpleIntegration	2024-11-13 08:22:40 +00:00
Guillermo Bonet	c2381f0feb	refactor: refs #7920 Main change	2024-11-13 07:42:58 +01:00
Ivan Mas	4add10f3dd	feat: refs #7994 remove comment script	2024-11-12 17:52:51 +01:00
Carlos Andrés	b8f2e0b906	feat: refs#8087 Redadas en travel	2024-11-12 16:50:46 +01:00
Carlos Andrés	358ed2513d	feat: refs#8087 Redadas en travel	2024-11-12 16:26:30 +01:00
Carlos Andrés	69d6e4a104	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8087-nuevosCamposTravel	2024-11-12 16:24:05 +01:00
Guillermo Bonet	6427a90c44	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-12 12:25:11 +00:00
Guillermo Bonet	a67ea6b15f	Merge pull request 'refactor: refs #7715 Deleted hasNewLabelMrwMethod column' (!3184) from 7715-byeMrwOld into dev ... Reviewed-on: #3184 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-12 12:09:54 +00:00
Robert Ferrús	d925a5d7fa	Merge branch 'master' into 8169-itemTextureTag	2024-11-12 11:55:50 +00:00
Guillermo Bonet	dd3a854ec5	Merge pull request 'feat: refs #8080 Added column comment' (!3185) from 8080-duaComment into dev ... Reviewed-on: #3185 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-11-12 10:48:17 +00:00
Guillermo Bonet	aec4d0b1a4	Merge branch 'test' into dev	2024-11-12 11:28:32 +01:00
Guillermo Bonet	f989b72fab	feat: refs #8080 Added column comment	2024-11-12 10:18:00 +01:00
Guillermo Bonet	a921e51023	refactor: refs #7715 Deleted hasNewLabelMrwMethod column	2024-11-12 09:51:48 +01:00
Jorge Penadés	0f5ca107f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-saySimpleIntegration	2024-11-12 09:45:19 +01:00
Javi Gallego	ea45d1da0a	Merge branch 'dev' into 7821-entryIsBooked	2024-11-12 09:30:40 +01:00
Pablo Natek	63425d31ae	fix: refs #7404 restore stockBuyed old proc	2024-11-12 08:51:03 +01:00
Robert Ferrús	55fced363e	Merge branch 'master' into 8169-itemTextureTag	2024-11-12 07:42:58 +00:00
Guillermo Bonet	90e7ab1ec1	refactor: refs #7950 Created cmr model	2024-11-12 08:25:23 +01:00
Guillermo Bonet	5bbcf5005f	Merge branch 'test' into dev	2024-11-12 08:04:30 +01:00
Guillermo Bonet	3158644032	fix: refs #7994 commented alter	2024-11-12 07:59:07 +01:00
Jorge Penadés	186312702d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-saySimpleIntegration	2024-11-11 16:41:37 +01:00
Carlos Andrés	cf102699d5	feat: refs#8087 Redadas en travel	2024-11-11 14:19:11 +01:00
Alex Moreno	f7a29cd9c7	feat(Supplier): refs #6828 add companySize	2024-11-11 10:32:17 +01:00
Robert Ferrús	94ed23ca07	feat: refs #8169 modifica role	2024-11-11 07:51:26 +01:00
Jorge Penadés	6ef1f950d1	feat: refs #6818 add config table	2024-11-08 17:47:10 +01:00
Jorge Penadés	9b28cf9130	feat: refs #6818 add records	2024-11-08 12:51:09 +01:00
Carlos Satorres	73efb8f1a8	Merge branch 'dev' into 7529-workerPIT	2024-11-08 11:17:48 +00:00
Carlos Satorres	fa108e2af0	fix: refs #7529 fix sql	2024-11-08 11:56:17 +01:00
Jorge Penadés	6927f4b28d	feat: refs #6818 saysimple integration	2024-11-08 11:51:00 +01:00
Javi Gallego	dd7c967624	Merge branch 'test' into dev	2024-11-07 14:49:26 +01:00
Javi Gallego	d95e455ccf	fix: refs #7935 sin modificar autonomy	2024-11-07 14:48:31 +01:00
Carlos Satorres	c5afde3334	Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-11-07 12:48:05 +01:00
Guillermo Bonet	6c40934f74	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-29 09:57:06 +01:00
Guillermo Bonet	17412c5b84	feat: refs #7266 Version	2024-10-29 09:57:04 +01:00
Carlos Satorres	ca6d8a67cb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-10-29 08:32:44 +01:00
Sergio De la torre	a8cc417fb4	Merge branch 'dev' into 7922-scanOrder	2024-10-29 06:32:32 +00:00
Guillermo Bonet	2f0fa56040	feat: refs #7266 Version	2024-10-29 07:19:51 +01:00
Guillermo Bonet	6afb8fbeb5	Merge pull request 'feat: refs #7266 Added details and improvements in item label reports' (!3154) from 7266-itemQrBarcodeLabel into dev ... Reviewed-on: #3154 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-29 06:04:15 +00:00
Carlos Satorres	55a409c680	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-10-29 06:13:12 +01:00
Carlos Andrés	66a5708efb	Merge pull request 'feat: refs #8087 Traspasar redadas a travels' (!3147) from 8087-nuevoCampoTravel into dev ... Reviewed-on: #3147 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-28 14:41:01 +00:00
Guillermo Bonet	bfc446ab79	feat: refs #7266 Requested changes and improvements	2024-10-28 14:56:01 +01:00
Javi Gallego	a432133c18	Merge branch 'dev' into 7821-entryIsBooked	2024-10-28 14:46:31 +01:00
Carlos Andrés	bffb13f94a	feat: refs #8087 Traspasar redadas a travels	2024-10-28 14:24:44 +01:00
Carlos Andrés	511c848342	feat: refs #8087 Traspasar redadas a travels	2024-10-28 14:22:08 +01:00
Carlos Satorres	248ae64872	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-10-28 13:31:37 +01:00
Robert Ferrús	6031b1fe3f	feat: refs #8169 create table itemTextureTag	2024-10-28 12:17:56 +01:00
Javi Gallego	fa9451ea38	feat: refs #7821 isBooked with grants	2024-10-25 16:15:13 +02:00
Carlos Andrés	fb0764bc1f	feat: refs #8087 Traspasar redadas a travels	2024-10-25 14:34:51 +02:00
Guillermo Bonet	14d6eb722e	feat: refs #7006 Requested changes	2024-10-25 14:24:26 +02:00
Guillermo Bonet	80764b6495	feat: refs #7006 itemTypeLog	2024-10-25 14:17:57 +02:00
Guillermo Bonet	956e89475e	Merge branch 'dev' into 7006-itemTypeLog	2024-10-25 11:06:55 +00:00
Sergio De la torre	11e13fdb20	feat: refs #7922 refs #792 scanOrder	2024-10-25 06:40:06 +02:00
Carlos Andrés	1bf900f81b	feat: refs #8087 Traspasar redadas a travels	2024-10-24 12:33:47 +02:00
Guillermo Bonet	8569bec34a	feat: refs #7266 Minor change	2024-10-24 12:18:09 +02:00
Guillermo Bonet	4c9682e107	Merge branch 'dev' into 7266-itemLabels	2024-10-24 05:16:16 +00:00
Sergio De la torre	5a8f43d0ea	Merge pull request 'feat: refs #8020 machineWorkerDeprecated' (!3141) from 8020-mahineWorkerDeprecated into dev ... Reviewed-on: #3141 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-23 12:14:36 +00:00
Guillermo Bonet	db4b540958	Merge branch 'test' into dev	2024-10-23 12:44:55 +02:00
Guillermo Bonet	fc56dbc5fb	Merge branch 'master' into test	2024-10-23 12:44:35 +02:00
Sergio De la torre	3da08e3a23	feat: refs #8020 machineWorkerDeprecated	2024-10-23 11:33:45 +02:00
Javi Gallego	2f5f4ecc7c	Merge pull request 'feat: refs #7943 quitar lectura en metodos comunes' (!3136) from 7943-permisosWorker into dev ... Reviewed-on: #3136 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-23 05:53:03 +00:00
Guillermo Bonet	fe3e7342bc	fix: refs #7935 version	2024-10-23 07:14:07 +02:00
Guillermo Bonet	6227ef0821	Merge branch '8119-itemCampaignQuantity' of https://gitea.verdnatura.es/verdnatura/salix into 8119-itemCampaignQuantity	2024-10-22 15:00:17 +02:00
Guillermo Bonet	1afb33c306	feat: refs #8119 Requested changes	2024-10-22 15:00:16 +02:00
Guillermo Bonet	c3f8da52c6	feat: refs #7266 Item label barcode	2024-10-22 13:43:54 +02:00
Guillermo Bonet	b4d2c69b37	Merge branch 'master' into 8119-itemCampaignQuantity	2024-10-22 06:42:02 +00:00
Guillermo Bonet	5162c2037b	feat: refs #8119 Requested changes	2024-10-22 08:41:46 +02:00
Javi Gallego	2b05e8c48e	feat: refs #7943 quitar lectura en metodos comunes	2024-10-21 13:29:33 +02:00
Guillermo Bonet	5d55fb287d	Merge branch 'test' into dev	2024-10-21 09:25:39 +02:00
Guillermo Bonet	dead904c19	Merge branch 'master' into test	2024-10-21 09:25:29 +02:00
Javi Gallego	be9f711cc1	Merge pull request 'feat: refs #7348 hasDailyInvoice from client' (!3110) from 7348-autonomyDailyInvoice into dev ... Reviewed-on: #3110 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 06:31:17 +00:00
Carlos Satorres	903d85a243	fix: refs #7529 fix back	2024-10-18 14:06:39 +02:00
Carlos Satorres	0a726a8fe7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-10-18 11:16:06 +02:00
Carlos Satorres	50a2f6081e	Merge branch 'dev' into 7986-workerMoto	2024-10-18 07:20:06 +00:00
Ivan Mas	f4b041c9b1	Merge branch 'dev' into 7865-deleteClientGestdocFkTPV	2024-10-18 06:20:38 +00:00
Guillermo Bonet	7e604f1a19	feat: refs #8119 Requested changes	2024-10-18 07:44:28 +02:00
Guillermo Bonet	4bd28c62b9	feat: refs #8119 Requested changes	2024-10-18 07:35:36 +02:00
Alex Moreno	d93653372a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-18 07:12:18 +02:00
Alex Moreno	08e22db950	Merge pull request 'master' (!3125) from master into test ... Reviewed-on: #3125 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-18 05:09:32 +00:00
Ivan Mas	7dc35458e8	refactor: refs #7865 delete client.gestdocFk from TPV	2024-10-17 17:05:08 +02:00
Robert Ferrús	0e2dcbce0c	Merge branch 'master' into 8108-itemTags	2024-10-17 11:31:52 +00:00
Robert Ferrús	faecbbb373	feat: refs #8108 saltos de linea	2024-10-17 13:08:58 +02:00
Guillermo Bonet	2bd98b7fb6	feat: refs #8119 Minor change	2024-10-17 10:29:35 +02:00
Guillermo Bonet	a8525c5ba8	Merge branch 'master' into 8119-itemCampaignQuantity	2024-10-17 08:08:48 +00:00
Guillermo Bonet	999cb2dbb4	feat: refs #8119 itemCampaignQuantity	2024-10-17 10:08:27 +02:00