6611 Commits

Author	SHA1	Message	Date
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
Sergio De la torre	cab2b7c93c	Merge pull request 'feat: refs #6845 userInterface' (!3161) from 6845-UserInterface into dev ... Reviewed-on: #3161 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-06 14:56:13 +00:00
Sergio De la torre	3b87cf0c69	Merge pull request 'feat: refs #7266 buyFkForPrint' (!3159) from 7266-ItemShelvingBuy into dev ... Reviewed-on: #3159 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-06 14:55:55 +00:00
Sergio De la torre	c113d83797	feat: refs #6845 userInterface	2024-11-05 16:42:51 +01:00
Alex Moreno	85ded59cb3	refactor: refs #6920 add correct role	2024-11-04 13:46:54 +01:00
Sergio De la torre	37548e5e64	feat: refs #7266 buyFkForPrint	2024-11-04 08:59:10 +01:00
Sergio De la torre	4c0dec19d4	feat: refs #7266 buyFkForPrint	2024-11-04 07:48:28 +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
Robert Ferrús	f699f64caa	Merge branch 'dev' into 8071-travelWeeklyClone	2024-10-29 06:45:57 +00:00
Sergio De la torre	a8cc417fb4	Merge branch 'dev' into 7922-scanOrder	2024-10-29 06:32:32 +00:00
Robert Ferrús	8ab6bc39cc	Merge branch 'dev' into 8071-travelWeeklyClone	2024-10-29 06:31:21 +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 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
Robert Ferrús	f05b6a46b0	feat: refs #8071 quitar esquema	2024-10-28 14:36:10 +01:00
Robert Ferrús	994b562823	Merge branch 'dev' into 8071-travelWeeklyClone	2024-10-28 13:34:54 +00: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 Andrés	61026d2d34	feat: refs #8087 Traspasar redadas a travels	2024-10-28 14:02:27 +01: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	4d96b1df68	Merge branch '7266-itemLabels' of https://gitea.verdnatura.es/verdnatura/salix into 7266-itemLabels	2024-10-24 07:31:30 +02:00
Guillermo Bonet	4c529da620	feat: refs #7266 Requested changes and query optimization	2024-10-24 07:31:26 +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
Guillermo Bonet	9eaa5a7585	Merge branch 'master' into 8119-itemCampaignQuantity	2024-10-23 10:38:00 +00:00
Sergio De la torre	3da08e3a23	feat: refs #8020 machineWorkerDeprecated	2024-10-23 11:33:45 +02:00
Guillermo Bonet	3cde6b6bc6	feat: refs #8119 Requested changes	2024-10-23 08:30:21 +02:00
Guillermo Bonet	31c89538bc	feat: refs #8119 Requested changes	2024-10-23 08:27:07 +02:00
Guillermo Bonet	37050361c2	feat: refs #8119 Requested changes	2024-10-23 08:26:36 +02:00
Guillermo Bonet	baec188ff5	feat: refs #8119 Requested changes	2024-10-23 08:23:28 +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
Alex Moreno	f47043cae4	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-22 15:07:24 +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
Jorge Penadés	e2b57d695e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-myTeamFilter	2024-10-22 12:25:43 +02:00
Jorge Penadés	ee0c0996f6	feat: refs #7524 add e2e	2024-10-22 12:16:26 +02:00
Guillermo Bonet	0af58b20be	feat: refs #7266 Item label QR finished	2024-10-22 12:02:04 +02:00